diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py index 002371f5bdc20e24564b5d266887f5bfd3fd13e2..90e31a84f0c63339eb2c064add5f1ce36dab3943 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py @@ -275,7 +275,6 @@ def PixelHitDiscCnfgAlgCfg(flags, name="PixelHitDiscCnfgAlg", **kwargs): acc.merge(addFolders(flags, "/PIXEL/HitDiscCnfg", "PIXEL", className="AthenaAttributeList")) elif flags.Input.isMC and flags.GeoModel.Run in [LHCPeriod.Run2, LHCPeriod.Run3]: acc.merge(addFoldersSplitOnline(flags,"PIXEL","/PIXEL/HitDiscCnfg","/PIXEL/HitDiscCnfg", className="AthenaAttributeList")) - kwargs.setdefault("PixelModuleData", "PixelModuleData") kwargs.setdefault("ReadKey", "/PIXEL/HitDiscCnfg") kwargs.setdefault("WriteKey", "PixelHitDiscCnfgData") acc.addCondAlgo(CompFactory.PixelHitDiscCnfgAlg(name, **kwargs)) diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx index 7d65ced2bc7144e20a8b4a9f4a1eb5f86f38fa3f..3d8846980765894338e7192a782268795a875480 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ #include "PixelHitDiscCnfgAlg.h" @@ -8,9 +8,6 @@ #include "CoralBase/Blob.h" #include <cstdint> -#include <istream> -#include <map> -#include <string> PixelHitDiscCnfgAlg::PixelHitDiscCnfgAlg(const std::string& name, ISvcLocator* pSvcLocator): ::AthReentrantAlgorithm(name, pSvcLocator) @@ -20,7 +17,6 @@ PixelHitDiscCnfgAlg::PixelHitDiscCnfgAlg(const std::string& name, ISvcLocator* p StatusCode PixelHitDiscCnfgAlg::initialize() { ATH_MSG_DEBUG("PixelHitDiscCnfgAlg::initialize()"); - ATH_CHECK(m_moduleDataKey.initialize()); ATH_CHECK(m_readKey.initialize()); ATH_CHECK(m_writeKey.initialize()); @@ -96,11 +92,9 @@ StatusCode PixelHitDiscCnfgAlg::execute(const EventContext& ctx) const { } } // Take average. - SG::ReadCondHandle<PixelModuleData> moduleDataHandle(m_moduleDataKey, ctx); - const PixelModuleData *moduleData = *moduleDataHandle; - - double aveHitPL = moduleData->getFEI4HitDiscConfig(0, 0); - double aveHit3D = moduleData->getFEI4HitDiscConfig(0, 0); + //FEI4EndcapHitDiscConfig = 2, FEI4BarrelHitDiscConfig = 2 + double aveHitPL = 2.; + double aveHit3D = 2.; if (nhitPL) { aveHitPL = hitPL/(1.0*nhitPL); } diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h index 38fba10a07563b7e00fb64227b3a18b9b98909ea..aedca9a81643aa0b215145688b3a0105eada9eb1 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h @@ -1,11 +1,11 @@ /* - Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ /** * @file PixelConditionsAlgorithms/PixelHitDiscCnfgAlg.h * @author Soshi Tsuno <Soshi.Tsuno@cern.ch> * @date November, 2019 - * @brief Store FEI4 HitDiscCofig parameter in PixelHitDiscCnfgData. + * @brief Store FEI4 HitDiscConfig parameter in PixelHitDiscCnfgData. */ #ifndef PIXELHITDISCCNFGALG_H @@ -14,13 +14,11 @@ #include "AthenaBaseComps/AthReentrantAlgorithm.h" #include "StoreGate/ReadCondHandleKey.h" -#include "AthenaPoolUtilities/AthenaAttributeList.h" #include "StoreGate/WriteCondHandleKey.h" #include "PixelConditionsData/PixelModuleData.h" #include "PixelConditionsData/PixelHitDiscCnfgData.h" -#include "Gaudi/Property.h" class PixelHitDiscCnfgAlg : public AthReentrantAlgorithm { public: @@ -31,8 +29,6 @@ class PixelHitDiscCnfgAlg : public AthReentrantAlgorithm { virtual StatusCode execute(const EventContext& ctx) const override; private: - SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey - {this, "PixelModuleData", "PixelModuleData", "Pixel module data"}; SG::ReadCondHandleKey<AthenaAttributeList> m_readKey {this, "ReadKey", "/PIXEL/HitDiscCnfg", "Input HitDiscCnfg folder"};