TrigT1CaloCalibTools: Make tools private.

Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx

@@ -16,7 +16,7 @@ namespace LVL1 {
   L1CaloOfflineTriggerTowerTools::L1CaloOfflineTriggerTowerTools( const std::string& name ) :
     asg::AsgTool( name ),
     m_l1CaloTTIdTools("LVL1::L1CaloTTIdTools/L1CaloTTIdTools"),
-    m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"),
+    m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers", this),
     m_scidtool ("CaloSuperCellIDTool"),
     m_scaleCorrKey(""),
     m_cablingKey(""),

Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 //  ***************************************************************************
 //  *   Author: John Morris (john.morris@cern.ch)                             *
@@ -19,7 +19,7 @@ namespace LVL1{
   
   L1CaloxAODOfflineTriggerTowerTools::L1CaloxAODOfflineTriggerTowerTools( const std::string& name ) :
     asg::AsgTool( name ),
-    m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"),
+    m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers", this),
     m_l1CaloTTIdTools("LVL1::L1CaloTTIdTools/L1CaloTTIdTools"),
     m_rxMapTool("LVL1::L1CaloFcal23Cells2RxMappingTool/L1CaloFcal23Cells2RxMappingTool"),
     m_caloMgr(nullptr),

Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloHVCorrectionsForDB.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef L1CALOHVCORRECTIONSFORDB_H
@@ -20,7 +20,6 @@ class L1CaloHVCorrectionsContainer;
 
 namespace LVL1{
   class IL1TriggerTowerTool;
-  class IL1CaloCells2TriggerTowers;
   class IL1CaloOfflineTriggerTowerTools;
 }
 
@@ -45,7 +44,6 @@ class L1CaloHVCorrectionsForDB : public AthAlgorithm
     std::string m_caloCellContainerName;
 
     ToolHandle<LVL1::IL1TriggerTowerTool> m_ttTool;
-    ToolHandle<LVL1::IL1CaloCells2TriggerTowers> m_cells2tt;
     ToolHandle<LVL1::IL1CaloOfflineTriggerTowerTools> m_jmTools;
     SG::ReadCondHandleKey<ILArHVScaleCorr> m_scaleCorrKey
     { this, "LArHVScaleCorr", "LArHVScaleCorrRecomputed", "" };

Trigger/TrigT1/TrigT1CaloCalibUtils/TrigT1CaloCalibUtils/L1CaloRampMaker.h

 // -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef L1CALORAMPMAKER_H
 #define L1CALORAMPMAKER_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "StoreGate/ReadHandleKey.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 
 #include "TrigT1CaloEvent/TriggerTowerCollection.h"
 #include "TrigT1CaloCalibConditions/L1CaloPprConditionsContainerRun2.h"
 #include "TrigT1CaloCalibConditions/L1CaloPprDisabledChannelContainer.h"
+#include "CaloEvent/CaloCellContainer.h"
 
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
 
@@ -97,6 +99,9 @@ class L1CaloRampMaker : public AthAlgorithm
       bool disabledChannel;
     };
     std::map<uint32_t, DBInfo> m_tempDBInfo;
+
+    SG::ReadHandleKey<CaloCellContainer> m_caloCellsKey
+      { this, "CaloCellsKey", "AllCalo", "CaloCellContainer key" };
 };
 
 #endif //L1CALORAMPMAKER_H

Trigger/TrigT1/TrigT1CaloCalibUtils/src/L1CaloHVCorrectionsForDB.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloCalibUtils/L1CaloHVCorrectionsForDB.h"
@@ -21,8 +21,7 @@ L1CaloHVCorrectionsForDB::L1CaloHVCorrectionsForDB(const std::string& name, ISvc
     m_triggerTowerCollectionName("TriggerTowers"),
     m_caloCellContainerName("AllCalo"),
     m_ttTool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
-    m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"),
-    m_jmTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools"),
+    m_jmTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools", this),
     m_rxLayersContainer(0),
     m_hvCorrectionsContainer(0),
     m_firstEvent(true)
@@ -38,7 +37,6 @@ L1CaloHVCorrectionsForDB::~L1CaloHVCorrectionsForDB()
 StatusCode L1CaloHVCorrectionsForDB::initialize()
 {
     ATH_CHECK( m_ttTool.retrieve() );
-    ATH_CHECK( m_cells2tt.retrieve() );
     ATH_CHECK( m_jmTools.retrieve() );
 
     ATH_CHECK( m_scaleCorrKey.initialize() );
@@ -74,11 +72,7 @@ StatusCode L1CaloHVCorrectionsForDB::execute()
         }
 
         // init trigger tower to cell mapping - needed each event?
-        if(!m_cells2tt->initCaloCellsTriggerTowers(*caloCellContainer)) {
-            msg(MSG::ERROR) << "Can not initialize L1CaloCells2TriggerTowers with CaloCellContainer '"
-                  << m_caloCellContainerName << "." << endmsg;
-            return StatusCode::FAILURE;
-        }
+        m_jmTools->caloCells(caloCellContainer);
         
         const LVL1::TriggerTower *tt;
         TriggerTowerCollection::const_iterator p_itTT = triggerTowerCollection->begin();

Trigger/TrigT1/TrigT1CaloCalibUtils/src/L1CaloPprMonitoring.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloCalibUtils/L1CaloPprMonitoring.h"
@@ -34,7 +34,7 @@ L1CaloPprMonitoring::L1CaloPprMonitoring(const std::string& name, ISvcLocator* p
     m_pedestalPlotManager(0),
     m_pedestalCorrectionPlotManager(0),
     m_etCorrelationPlotManager(0),
-    m_offlineTowerTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools"),
+    m_offlineTowerTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools", this),
     m_towerTools("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
     m_dbPpmDeadChannelsFolder("/TRIGGER/L1Calo/V1/Calibration/PpmDeadChannels"),
     m_dbPpmDisabledTowersFolder("/TRIGGER/L1Calo/V1/Conditions/DisabledTowers"),

Trigger/TrigT1/TrigT1CaloCalibUtils/src/L1CaloRampMaker.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigT1CaloCalibUtils/L1CaloRampMaker.h"
@@ -59,8 +59,8 @@ L1CaloRampMaker::L1CaloRampMaker(const std::string& name, ISvcLocator* pSvcLocat
     m_fadcSaturationCut(963),
     m_tileSaturationCut(150.),
     m_ttTool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
-    m_xAODTTTools("LVL1::L1CaloxAODOfflineTriggerTowerTools/L1CaloxAODOfflineTriggerTowerTools"),
-    m_jmTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools"),
+    m_xAODTTTools("LVL1::L1CaloxAODOfflineTriggerTowerTools/L1CaloxAODOfflineTriggerTowerTools", this),
+    m_jmTools("LVL1::L1CaloOfflineTriggerTowerTools/L1CaloOfflineTriggerTowerTools", this),
     m_condSvc("L1CaloCondSvc", name),
     m_nEvent(1),
     m_firstEvent(true),
@@ -153,6 +153,10 @@ StatusCode L1CaloRampMaker::execute()
     // init trigger tower to cell mapping
     CHECK(m_xAODTTTools->initCaloCells());
 
+    SG::ReadHandle<CaloCellContainer> caloCells (m_caloCellsKey);
+    m_jmTools->caloCells(caloCells.cptr());
+    
+
     // CHECK(m_condSvc->retrieve(m_pprLutContainer, m_pprLutContainerFolderMap));
     // CHECK(m_condSvc->retrieve(m_pprDisabledChannelContainer, m_pprDisabledChannelContainerFolderMap));