Merge branch 'master-trigt1-calomgr' into 'master'

TrigT1CaloFexPerf: switched to reading Calo Super Cell manager from Cond Store

See merge request !58929

Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.cxx

+/*
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
 #include "GTowerMappingDataCondAlg.h"
 #include "TMath.h"
 #include "TVector2.h"
@@ -89,4 +93,4 @@ namespace LVL1
       helper.setArea(gFEX::towerArea(helper.Eta()));
     return StatusCode::SUCCESS;
   }
-} // namespace LVL1
+} // namespace LVL1
\ No newline at end of file

Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.cxx

+/*
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
 #include "JGTowerMappingDataCondAlgBase.h"
 #include "AthenaKernel/IOVInfiniteRange.h"
 #include "StoreGate/WriteCondHandle.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "TMath.h"
 #include "TVector2.h"
@@ -22,6 +25,7 @@ namespace LVL1
   StatusCode JGTowerMappingDataCondAlgBase::initialize()
   {
     ATH_CHECK(m_outputKey.initialize());
+    ATH_CHECK(m_caloSuperCellMgrKey.initialize());
     ATH_CHECK(detStore()->retrieve(m_ccid));
     ATH_CHECK(detStore()->retrieve(m_scid));
     return StatusCode::SUCCESS;
@@ -37,8 +41,8 @@ namespace LVL1
       return StatusCode::SUCCESS;
     }
     const JGTowerBase_ID *jgTowerID = getJGTowerID();
-    const CaloSuperCellDetDescrManager *scDetMgr{nullptr};
-    ATH_CHECK(detStore()->retrieve(scDetMgr));
+    SG::ReadCondHandle<CaloSuperCellDetDescrManager> caloSuperCellMgrHandle{m_caloSuperCellMgrKey,ctx};
+    const CaloSuperCellDetDescrManager *scDetMgr = *caloSuperCellMgrHandle;
     // JGTowerMappingData is typedef of std::vector<JGTowerHelper>
     auto data = std::make_unique<JGTowerMappingData>();
 

Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.h

@@ -7,6 +7,7 @@
 
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/ReadCondHandleKey.h"
 #include "TrigT1CaloFexPerf/JGTowerMappingData.h"
 #include "CaloIdentifier/CaloCell_SuperCell_ID.h"
 #include "CaloIdentifier/CaloCell_ID.h"
@@ -27,6 +28,8 @@ namespace LVL1
   private:
     SG::WriteCondHandleKey<JGTowerMappingData> m_outputKey{
         this, "MappingData", ""};
+    SG::ReadCondHandleKey<CaloSuperCellDetDescrManager> m_caloSuperCellMgrKey{
+      this,"CaloSuperCellDetDescrManager","CaloSuperCellDetDescrManager","SG key of the resulting CaloSuperCellDetDescrManager"};
     Gaudi::Property<bool> m_mapTileCells{this, "MapTileCells", false};
 
   protected:

Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.cxx

+/*
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
 #include "JTowerMappingDataCondAlg.h"
 #include "TH1F.h"
 #include "TFile.h"
@@ -95,4 +99,4 @@ namespace LVL1
       data.at(idx).setArea(m_towerAreas.at(idx));
     return StatusCode::SUCCESS;
   }
-} // namespace LVL1
+} // namespace LVL1
\ No newline at end of file

Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.cxx

-/**
- * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
- */
+/*
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "SCEmulation.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
 #include "StoreGate/ReadCondHandle.h"
 #include "PathResolver/PathResolver.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_SuperCell_ID.h"
 #include <memory>
 #include <TFile.h>
@@ -96,7 +95,7 @@ namespace LVL1
     ATH_CHECK(m_caloBCIDAverageKey.initialize(m_useBCID));
     ATH_CHECK(m_caloNoiseSigmaDiffKey.initialize(m_useNoise));
 
-    ATH_CHECK(detStore()->retrieve(m_scellMgr));
+    ATH_CHECK(m_caloSuperCellMgrKey.initialize()); 
     ATH_CHECK(detStore()->retrieve(m_caloIdMgr));
 
     std::unique_ptr<TFile> timingFile(TFile::Open(PathResolver::find_calib_file(m_cellTimingFile).c_str()));
@@ -240,6 +239,9 @@ namespace LVL1
       caloNoiseSigmaDiff = handle.cptr();
     }
 
+    SG::ReadCondHandle<CaloSuperCellDetDescrManager> caloSuperCellMgrHandle{m_caloSuperCellMgrKey,ctx};
+    const CaloSuperCellDetDescrManager* scellMgr = *caloSuperCellMgrHandle;
+
     auto evtInfo = SG::makeHandle(m_evtInfoKey, ctx);
     if (!evtInfo.isValid())
     {
@@ -365,7 +367,7 @@ namespace LVL1
 
     for (std::size_t idx = 0; idx < energies.size(); ++idx)
     {
-      const CaloDetDescrElement *dde = m_scellMgr->get_element(idx);
+      const CaloDetDescrElement *dde = scellMgr->get_element(idx);
       if (!dde)
       {
         ATH_MSG_WARNING("Invalid DDE for hash index " << idx);
@@ -416,4 +418,4 @@ namespace LVL1
   {
     return getIndex(m_etBins.at(sample), et);
   }
-} // namespace LVL1
+} // namespace LVL1
\ No newline at end of file

Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.h

-/**
- * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
- */
+/*
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef TRIGT1CALOFEXPERF_SCEMULATION_H
 #define TRIGT1CALOFEXPERF_SCEMULATION_H
@@ -41,6 +41,9 @@ namespace LVL1
         this, "CaloBCIDAverage", "CaloBCIDAverage"};
     SG::ReadCondHandleKey<CaloNoiseSigmaDiff> m_caloNoiseSigmaDiffKey{
         this, "CaloNoiseSigmaDiff", "CaloNoiseSigmaDiff"};
+    /// Super cell manager key
+    SG::ReadCondHandleKey<CaloSuperCellDetDescrManager> m_caloSuperCellMgrKey{
+      this,"CaloSuperCellDetDescrManager","CaloSuperCellDetDescrManager","SG key of the resulting CaloSuperCellDetDescrManager"};
     SG::WriteHandleKey<CaloCellContainer> m_outputSuperCellsKey;
 
     /// Offline<->supercell mapping tool
@@ -61,8 +64,6 @@ namespace LVL1
     // Map keys are sampling, eta bin, phi bin
     std::map<std::tuple<CaloSampling::CaloSample, std::size_t, std::size_t>, std::map<float, float>> m_timingSamples;
 
-    /// Super cell manager
-    const CaloSuperCellDetDescrManager *m_scellMgr{nullptr};
     /// Calo ID helpers
     const CaloIdManager *m_caloIdMgr{nullptr};
 
@@ -72,4 +73,4 @@ namespace LVL1
   }; //> end class SCEmulation
 } // namespace LVL1
 
-#endif //> !TRIGT1CALOFEXPERF_SCEMULATION_H
+#endif //> !TRIGT1CALOFEXPERF_SCEMULATION_H
\ No newline at end of file