Calorimeter/CaloCondPhysAlgs/CaloCondPhysAlgs/LArHVMapTool.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef LARHVMAPTOOL_H
-#define LARHVMAPTOOL_H
-
-#include "GaudiKernel/ToolHandle.h"
-#include "StoreGate/DataHandle.h"
-#include "AthenaBaseComps/AthAlgTool.h"
-
-#include "LArCabling/LArHVCablingTool.h"
-#include "CxxUtils/checker_macros.h"
-
-class CaloDetDescrManager;
-class Identifier;
-class CaloIdManager;
-class LArEM_ID;
-class LArHEC_ID;
-class LArFCAL_ID;
-//class LArHVCablingTool;
-
-static const InterfaceID IID_LArHVMapTool("LArHVMapTool", 1 ,0);
-
-class ATLAS_NOT_THREAD_SAFE LArHVMapTool: public AthAlgTool
-{
-
-     public:
-          LArHVMapTool(const std::string& type, const std::string& name,
-                       const IInterface* parent);
-
-          virtual ~LArHVMapTool(){}
-
-          static const InterfaceID& interfaceID() { return IID_LArHVMapTool; }
-
-          virtual StatusCode initialize();
-          virtual StatusCode execute();
-          virtual StatusCode finalize(){return StatusCode::SUCCESS;}
-
-
-          std::vector<int> GetHVLines ATLAS_NOT_THREAD_SAFE(const Identifier& id);
-
-     private:
-
-          const DataHandle<CaloIdManager> m_caloIdMgr;
-          const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
-          const LArEM_ID* m_larem_id;
-          const LArHEC_ID* m_larhec_id;
-          const LArFCAL_ID* m_larfcal_id;
-
-          ToolHandle<LArHVCablingTool> m_hvCablingTool;
-};
-
-#endif

Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py

@@ -107,10 +107,6 @@ theRescaler.HVvalues = [ 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992,
 
 topSequence += theRescaler
 
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import LArHVMapTool
-theLArHV=LArHVMapTool("LArHVMapTool")
-ToolSvc += theLArHV
-
 #--------------------------------------------------------------
 #--- Dummy event loop parameters
 #--------------------------------------------------------------

Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.cxx

@@ -34,7 +34,34 @@
 #include "CoolKernel/types.h"
 #include "CoolKernel/Record.h"
 #include "CoralBase/AttributeListSpecification.h"
-#include "CaloCondPhysAlgs/LArHVMapTool.h"
+
+#include "CxxUtils/checker_macros.h"
+
+
+struct ATLAS_NOT_THREAD_SAFE CaloCellCalcEnergyCorr::HVData
+{
+  HVData (const LArHVManager& manager);
+  EMBHVManager::EMBHVData m_hvdata_EMB;
+  EMBPresamplerHVManager::EMBPresamplerHVData m_hvdata_EMBPS;
+  EMECHVManager::EMECHVData m_hvdata_EMEC_IN;
+  EMECHVManager::EMECHVData m_hvdata_EMEC_OUT;
+  EMECPresamplerHVManager::EMECPresamplerHVData m_hvdata_EMECPS;
+  HECHVManager::HECHVData m_hvdata_HEC;
+  FCALHVManager::FCALHVData m_hvdata_FCAL;
+};
+
+
+CaloCellCalcEnergyCorr::HVData::HVData (const LArHVManager& manager)
+  : m_hvdata_EMB (manager.getEMBHVManager().getData()),
+    m_hvdata_EMBPS (manager.getEMBPresamplerHVManager().getData()),
+    m_hvdata_EMEC_IN (manager.getEMECHVManager(EMECHVModule::IOType::INNER).getData()),
+    m_hvdata_EMEC_OUT (manager.getEMECHVManager(EMECHVModule::IOType::OUTER).getData()),
+    m_hvdata_EMECPS (manager.getEMECPresamplerHVManager().getData()),
+    m_hvdata_HEC (manager.getHECHVManager().getData()),
+    m_hvdata_FCAL (manager.getFCALHVManager().getData())
+{
+}
+
 
 CaloCellCalcEnergyCorr::CaloCellCalcEnergyCorr( const std::string& name, 
 						ISvcLocator* pSvcLocator ) : 
@@ -95,7 +122,7 @@ StatusCode CaloCellCalcEnergyCorr::execute()
   return StatusCode::SUCCESS;
 }
 
-StatusCode CaloCellCalcEnergyCorr::stop()
+StatusCode CaloCellCalcEnergyCorr::stop ATLAS_NOT_THREAD_SAFE ()
 {  
 
   const CaloCell_ID*    calocell_id;	
@@ -145,6 +172,10 @@ StatusCode CaloCellCalcEnergyCorr::stop()
 
   CHECK(detStore()->record(attrList,m_folder));
 
+  const LArHVManager* manager = nullptr;
+  CHECK( detStore()->retrieve (manager) );
+  HVData hvdata (*manager);
+
   std::vector<float> setVec(1,1);
   unsigned nSet=0;
   unsigned nSetHV=0;
@@ -159,8 +190,7 @@ StatusCode CaloCellCalcEnergyCorr::stop()
         // check if we have also HVLine for this cell
         if(!m_hvlines.empty() && m_hvlines[0]>0) {
            Identifier offId=calocell_id->cell_id(h);
-           std::vector<int> hvlineId = GetHVLines(offId);
-           //std::cout<<offId.getString()<<" : ";
+           std::vector<int> hvlineId = GetHVLines(hvdata, offId);
            int nfound=0;
            float hvval=-1;
            std::vector<int>::const_iterator poshv;
@@ -176,7 +206,6 @@ StatusCode CaloCellCalcEnergyCorr::stop()
            }
         }
     }
-    //std::cout << h << " " << value << std::endl;
     setVec[0]=value;
     flt->setData(h,0,setVec);
   }//end loop over hash
@@ -188,7 +217,8 @@ StatusCode CaloCellCalcEnergyCorr::stop()
 }
 
 
-std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
+std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const HVData& hvdata,
+                                                    const Identifier& id) {
   std::set<int> hv;
 
   // LAr EMB
@@ -200,7 +230,7 @@ std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
       unsigned int nelec = cell->getNumElectrodes();
       for (unsigned int i=0;i<nelec;i++) {
         const EMBHVElectrode& electrode = cell->getElectrode(i);
-        for (unsigned int igap=0;igap<2;igap++) hv.insert(electrode.hvLineNo(igap));
+        for (unsigned int igap=0;igap<2;igap++) hv.insert(hvdata.m_hvdata_EMB.hvLineNo (electrode, igap));
       }
     } else { // LAr EMEC
       const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
@@ -209,7 +239,13 @@ std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
       unsigned int nelec = cell->getNumElectrodes();
       for (unsigned int i=0;i<nelec;i++) {
         const EMECHVElectrode& electrode = cell->getElectrode(i);
-        for (unsigned int igap=0;igap<2;igap++) hv.insert(electrode.hvLineNo(igap));
+        const EMECHVManager::EMECHVData& hvdata_EMEC =
+          electrode.getModule().getWheelIndex() == EMECHVModule::INNER ?
+            hvdata.m_hvdata_EMEC_IN :
+            hvdata.m_hvdata_EMEC_OUT ;
+        for (unsigned int igap=0;igap<2;igap++) {
+          hv.insert(hvdata_EMEC.hvLineNo (electrode, igap));
+        }
       }
     }
   } else if (m_larhec_id->is_lar_hec(id)) { // LAr HEC
@@ -219,7 +255,7 @@ std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
     unsigned int nsubgaps = cell->getNumSubgaps();
     for (unsigned int igap=0;igap<nsubgaps;igap++) {
       const HECHVSubgap& subgap = cell->getSubgap(igap);
-      hv.insert(subgap.hvLineNo());
+      hv.insert(hvdata.m_hvdata_HEC.hvLineNo (subgap));
     }
   } else if (m_larfcal_id->is_lar_fcal(id)) { // LAr FCAL
     const FCALDetectorElement* fcalElement = dynamic_cast<const FCALDetectorElement*>(m_calodetdescrmgr->get_element(id));
@@ -228,7 +264,7 @@ std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
     unsigned int nlines = tile->getNumHVLines();
     for (unsigned int i=0;i<nlines;i++) {
       const FCALHVLine* line = tile->getHVLine(i);
-      if(line) hv.insert(line->hvLineNo());
+      if(line) hv.insert(hvdata.m_hvdata_FCAL.hvLineNo (*line));
     }
   } else if (m_larem_id->is_lar_em(id) && m_larem_id->sampling(id)==0) { // Presamplers
     if (abs(m_larem_id->barrel_ec(id))==1) {
@@ -236,13 +272,13 @@ std::vector<int> CaloCellCalcEnergyCorr::GetHVLines(const Identifier& id) {
       if (!embElement) std::abort();
       const EMBCellConstLink cell = embElement->getEMBCell();
       const EMBPresamplerHVModule& hvmodule = cell->getPresamplerHVModule();
-      for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
+      for (unsigned int igap=0;igap<2;igap++) hv.insert(hvdata.m_hvdata_EMBPS.hvLineNo (hvmodule, igap));
     } else {
       const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
       if (!emecElement) std::abort();
       const EMECCellConstLink cell = emecElement->getEMECCell();
       const EMECPresamplerHVModule& hvmodule = cell->getPresamplerHVModule ();
-      for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
+      for (unsigned int igap=0;igap<2;igap++) hv.insert(hvdata.m_hvdata_EMECPS.hvLineNo (hvmodule, igap));
     }
   }
 

Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.h

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOCONDPHYSALGS_CALOCELLCALCENERGYCORR_H
@@ -37,9 +37,11 @@ class CaloCellCalcEnergyCorr: public AthAlgorithm
   virtual StatusCode  initialize();
   virtual StatusCode  execute();
   virtual StatusCode  finalize();
-  virtual StatusCode  stop ATLAS_NOT_THREAD_SAFE /* calls ctor of AthenaAttributeList*/();
+  virtual StatusCode  stop ATLAS_NOT_THREAD_SAFE /* Calls getData() method of HV managers */();
 
 private:
+  struct ATLAS_NOT_THREAD_SAFE HVData;
+
   // Properties
   std::string m_folder;
   std::vector<int> m_calosample;  // which CaloSamples to be filled (numbers from CaloSample enum in CaloCell_Base_ID
@@ -53,7 +55,7 @@ private:
   const LArHEC_ID* m_larhec_id;
   const LArFCAL_ID* m_larfcal_id;
 
-  std::vector<int> GetHVLines(const Identifier& id) ;
+  std::vector<int> GetHVLines(const HVData& hvdata, const Identifier& id) ;
 }; 
 
 #endif //> !CALOCONDPHYSALGS_CALOCELLCALCENERGYCORR_H

Calorimeter/CaloCondPhysAlgs/src/LArHVMapTool.cxx

-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CaloCondPhysAlgs/LArHVMapTool.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloDetDescr/CaloDetectorElements.h"
-#include "CaloIdentifier/LArEM_ID.h"
-#include "CaloIdentifier/LArHEC_ID.h"
-#include "CaloIdentifier/LArFCAL_ID.h"
-#include "CaloIdentifier/CaloIdManager.h"
-
-#include "LArHV/EMBHVElectrode.h"
-#include "LArHV/EMBPresamplerHVModule.h"
-#include "LArHV/EMECHVElectrode.h"
-#include "LArHV/EMECPresamplerHVModule.h"
-#include "LArHV/HECHVSubgap.h"
-#include "LArHV/FCALHVLine.h"
-#include "LArReadoutGeometry/EMECCell.h"
-#include "LArReadoutGeometry/HECCell.h"
-#include "LArReadoutGeometry/EMBCell.h"
-#include "LArReadoutGeometry/FCALTile.h"
-#include "LArReadoutGeometry/EMBCellConstLink.h"
-#include "LArReadoutGeometry/EMECCellConstLink.h"
-#include "LArReadoutGeometry/HECCellConstLink.h"
-#include "LArReadoutGeometry/FCALTubeConstLink.h"
-
-#include "LArHV/LArHVManager.h"
-
-
-
-LArHVMapTool::LArHVMapTool(const std::string& type, const std::string& name, const IInterface* parent)
-  : AthAlgTool(type,name,parent)
-     {
-     declareInterface<LArHVMapTool>( this );
-     }
-
-StatusCode LArHVMapTool::initialize(){
-
-  CHECK(detStore()->retrieve(m_caloIdMgr));
-
-  m_larem_id   = m_caloIdMgr->getEM_ID();
-  m_larhec_id   = m_caloIdMgr->getHEC_ID();
-  m_larfcal_id   = m_caloIdMgr->getFCAL_ID();
-
-  CHECK(detStore()->retrieve(m_calodetdescrmgr));
-
-
-   return StatusCode::SUCCESS;
-}
-
-StatusCode LArHVMapTool::execute() {
-
-
-  CHECK(m_hvCablingTool.retrieve());
-
-  IdentifierHash h=0;
-  Identifier offId;
-  m_larem_id->get_id(h,offId);
-  std::vector<int> hvlineId = GetHVLines(offId);
-  //std::cout<<"LArHVMapTool::execute "<<offId.getString()<<" : "<<hvlineId.size()<<std::endl;
-  //if(hvlineId.size()>0) std::cout<<hvlineId[0]<<std::endl;
-
-   return StatusCode::SUCCESS;
-}
-
-
-std::vector<int> LArHVMapTool::GetHVLines(const Identifier& id) {
-  std::set<int> hv;
-
-  // LAr EMB
-  if (m_larem_id->is_lar_em(id) && m_larem_id->sampling(id)>0) {
-    if (abs(m_larem_id->barrel_ec(id))==1) {
-      const EMBDetectorElement* embElement = dynamic_cast<const EMBDetectorElement*>(m_calodetdescrmgr->get_element(id));
-      if (embElement) {
-	const EMBCellConstLink cell = embElement->getEMBCell();
-	unsigned int nelec = cell->getNumElectrodes();
-	for (unsigned int i=0;i<nelec;i++) {
-	  const EMBHVElectrode& electrode = cell->getElectrode(i);
-	  for (unsigned int igap=0;igap<2;igap++) {
-	    hv.insert(electrode.hvLineNo(igap));
-	  }
-	}
-      }
-      else {
-	ATH_MSG_ERROR( "Failed d'cast to EMBDetectorElement" );
-      }
-    } else { // LAr EMEC
-      const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
-      if (emecElement) {
-	const EMECCellConstLink cell = emecElement->getEMECCell();
-	unsigned int nelec = cell->getNumElectrodes();
-	for (unsigned int i=0;i<nelec;i++) {
-	  const EMECHVElectrode& electrode = cell->getElectrode(i);
-	  for (unsigned int igap=0;igap<2;igap++) hv.insert(electrode.hvLineNo(igap));
-	}
-      }
-      else {
-	ATH_MSG_ERROR( "Failed d'cast to EMECDetectorElement" );
-      }
-    } 
-  } else if (m_larhec_id->is_lar_hec(id)) { // LAr HEC
-    const HECDetectorElement* hecElement = dynamic_cast<const HECDetectorElement*>(m_calodetdescrmgr->get_element(id));
-    if (hecElement) {
-      const HECCellConstLink cell = hecElement->getHECCell();
-      unsigned int nsubgaps = cell->getNumSubgaps();
-      for (unsigned int igap=0;igap<nsubgaps;igap++) {
-	const HECHVSubgap& subgap = cell->getSubgap(igap);
-	hv.insert(subgap.hvLineNo());
-      }
-    }
-    else {
-      ATH_MSG_ERROR( "Failed d'cast to HECDetectorElement" );
-    }
-  } else if (m_larfcal_id->is_lar_fcal(id)) { // LAr FCAL
-    const FCALDetectorElement* fcalElement = dynamic_cast<const FCALDetectorElement*>(m_calodetdescrmgr->get_element(id));
-    if (fcalElement) {
-      const FCALTile* tile = fcalElement->getFCALTile();
-      unsigned int nlines = tile->getNumHVLines();
-      unsigned int nlines_found=0;
-      for (unsigned int i=0;i<nlines;i++) {
-	const FCALHVLine* line = tile->getHVLine(i);
-	if (line) nlines_found++;
-      }
-      if ( nlines_found>0 ) {
-	for (unsigned int i=0;i<nlines;i++) {
-	  const FCALHVLine* line = tile->getHVLine(i);
-	  if (!line) continue;
-	  hv.insert(line->hvLineNo());
-	}
-      }
-    }
-    else {
-      ATH_MSG_ERROR( "Failed d'cast to FCALDetectorElement" );
-    }
- 
-  } else if (m_larem_id->is_lar_em(id) && m_larem_id->sampling(id)==0) { // Presamplers
-    if (abs(m_larem_id->barrel_ec(id))==1) {
-      const EMBDetectorElement* embElement = dynamic_cast<const EMBDetectorElement*>(m_calodetdescrmgr->get_element(id));
-      if (embElement) {
-	const EMBCellConstLink cell = embElement->getEMBCell();
-	const EMBPresamplerHVModule& hvmodule = cell->getPresamplerHVModule();
-	for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
-      }
-      else {
-	ATH_MSG_ERROR( "Failed d'cast to EMBDetectorElement (for presampler)" );
-      }
-    } else {
-      const EMECDetectorElement* emecElement = dynamic_cast<const EMECDetectorElement*>(m_calodetdescrmgr->get_element(id));
-      if (emecElement) {
-	const EMECCellConstLink cell = emecElement->getEMECCell();
-	const EMECPresamplerHVModule& hvmodule = cell->getPresamplerHVModule ();
-	for (unsigned int igap=0;igap<2;igap++) hv.insert(hvmodule.hvLineNo(igap));
-      }
-      else {
-	ATH_MSG_ERROR( "Failed d'cast to EMECDetectorElement (for presampler)" );
-      }
-    }
-  }
-
-  std::vector<int> hvlines;
-  for (std::set<int>::iterator i=hv.begin();i!=hv.end();++i) hvlines.push_back(*i);
-  //std::cout<<"LArHVMapTool hvlines size: "<<hvlines.size()<<std::endl;
-  //if(hvlines.size()>0) std::cout<<hvlines[0]<<std::endl;
-  return hvlines;
-}
-
-

Calorimeter/CaloRec/python/CaloCellFlags.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # @file: CaloCellFlags.py
 # @purpose: a container of flags for CaloCell making configuring
@@ -73,13 +73,6 @@ class doMinBiasAverage(JobProperty):
    allowedTypes = ['bool']
    StoredValue  = False
 
-class doLArRecalibration(JobProperty):
-   """ Flag to activate cell recalibration, undoing online energy computation and applying new calibration
-   """
-   statusOn = True
-   allowedTypes = ['bool']
-   StoredValue = False
-
 class doLArNoiseMasking(JobProperty):
    """ Flag to activate masking of high noise / dead  cell for all events
    """
@@ -183,7 +176,6 @@ list_jobproperties = [
     doLArHVCorr,
     doPedestalCorr,
     doMinBiasAverage,
-    doLArRecalibration,
     doLArNoiseMasking,
     doLArSporadicMasking,
     doLArBadFebMasking,

Calorimeter/CaloRec/python/CaloCellGetter.py

@@ -492,67 +492,6 @@ class CaloCellGetter (Configured)  :
             #theCaloCellMaker += theHVCorrTool
             theCaloCellMaker.CaloCellMakerToolNames += [theLArCellHVCorrTool]
 
-        #
-        # correction to undo online calibration and apply new LAr electronics calibration for ADC->MeV conversion
-        #
-        doLArRecalibration = False
-        if jobproperties.CaloCellFlags.doLArRecalibration.statusOn:
-           from AthenaCommon.GlobalFlags import globalflags
-           from LArConditionsCommon.LArCondFlags import larCondFlags
-           if jobproperties.CaloCellFlags.doLArRecalibration() and globalflags.DataSource() == 'data' and (not larCondFlags.SingleVersion()) :
-               doLArRecalibration = True
-               mlog.info("Redoing LAr electronics calibration for ADC->MeV")
-
-
-        if doLArRecalibration:
-
-            # get tool for cell recalibration
-            try:
-                from LArCellRec.LArCellRecConf import LArCellRecalibration
-                theLArCellRecalibration = LArCellRecalibration("LArCellRecalibration")
-            except Exception:
-                mlog.error("could not get handle to LArCellRecalibration Quit")
-                print(traceback.format_exc())
-                return False
-
-            # get new ADC2MeVTool
-            try:
-                from LArRecUtils.LArADC2MeVToolDefault import LArADC2MeVToolDefault
-                theLArADC2MeVToolDefault = LArADC2MeVToolDefault()
-            except Exception:
-                mlog.error("Could not get handle to LArADC2MeVToolDefault Quit")
-                print(traceback.format_exc())
-                return False
-            ToolSvc += theLArADC2MeVToolDefault
-
-            # get old  ADC2MeVTool
-            try:
-                from LArRecUtils.LArADC2MeVToolOnline import LArADC2MeVToolOnline
-                theLArADC2MeVToolOnline = LArADC2MeVToolOnline()
-            except Exception:
-                mlog.error("Could not get handle to LArADC2MeVToolOnline Quit")
-                print(traceback.format_exc())
-                return False
-            ToolSvc += theLArADC2MeVToolOnline
-
-            theLArCellRecalibration.adc2MeVTool = theLArADC2MeVToolDefault
-            theLArCellRecalibration.adc2MeVToolOnline = theLArADC2MeVToolOnline
-
-
-            try:
-                from CaloRec.CaloRecConf import CaloCellContainerCorrectorTool
-                from CaloIdentifier import SUBCALO 
-                theLArRecalibrationTool = CaloCellContainerCorrectorTool("LArRecalibrationTool",
-                        CaloNums=[ SUBCALO.LAREM, SUBCALO.LARHEC, SUBCALO.LARFCAL ],
-                        CellCorrectionToolNames=[ theLArCellRecalibration])
-            except Exception:
-                mlog.error("could not get handle to HVCorrTool Quit")
-                print(traceback.format_exc())
-                return False
-            theCaloCellMaker += theLArRecalibrationTool
-            theCaloCellMaker.CaloCellMakerToolNames += [theLArRecalibrationTool]
-
-
         #
         # Correction for MinBias energy shift for MC pileup reco
         #

Calorimeter/CaloTriggerTool/CaloTriggerTool/LArTTCellMap.h

@@ -8,12 +8,12 @@
 #include "Identifier/Identifier.h" 
 #include "CaloTriggerTool/LArTTCell.h" 
 #include "CaloTriggerTool/LArTTCell_P.h" 
-#include "CaloIdentifier/LArID_Exception.h" 
+#include "CaloIdentifier/LArID_Exception.h"
+#include "AthenaBaseComps/AthMessaging.h"
 
 #include <vector>
 #include <map>
 
-class MsgStream ; 
 
 /**
    @brief This is a StoreGate object holding the offline TT-cell map
@@ -25,6 +25,7 @@ class MsgStream ;
  */
 
 class LArTTCellMap
+  : public AthMessaging
 {
 public:
 
@@ -70,8 +71,6 @@ private:
   //  std::map<HWIdentifier,Identifier>  m_on2offIdMap;
 
   LArTTCell_P m_persData; 
-
-  MsgStream* m_msg ; 
 };
 
 #include "AthenaKernel/CLASS_DEF.h"

Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx

@@ -7,25 +7,17 @@
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/LArHEC_ID.h"
 #include "CaloIdentifier/LArFCAL_ID.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Bootstrap.h"
+#include "AthenaKernel/getMessageSvc.h"
 #include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IMessageSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
 
 #include "StoreGate/StoreGateSvc.h"
 
 #include <iostream>
 
-LArTTCellMap::LArTTCellMap( ): m_msg(nullptr)
+LArTTCellMap::LArTTCellMap( )
+  : AthMessaging (Athena::getMessageSvc(), "LArTTCellMap")
 {
-
-  IMessageSvc *msgSvc;
-  StatusCode status =Gaudi::svcLocator()->service("MessageSvc",msgSvc);
-  if(status.isFailure()){
-    std::cout <<  "Cannot locate MessageSvc" << std::endl;
-  }
-  m_msg = new MsgStream ( msgSvc, "LArTTCellMap");
-  msgSvc->release() ;
 }
 
 
@@ -40,35 +32,30 @@ void LArTTCellMap::set( const LArTTCell& m )
 
   convert_to_P(m);
 
-  if (m_msg->level() <= MSG::DEBUG) {
-    (*m_msg) <<MSG::DEBUG<<" LArTTCell size = "<<m.size() <<endmsg;
-  }
-  StoreGateSvc * detStore;
-  StatusCode status = Gaudi::svcLocator()->service("DetectorStore",detStore);
-  if(status.isFailure()){
-    (*m_msg) << MSG::ERROR <<  "Cannot locate DetectorStore" << endmsg;
-  }
+  ATH_MSG_DEBUG( " LArTTCell size = "<<m.size() );
+
+  ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "LArTTCellMap");
 
   const LArEM_ID* em_id;
   const LArHEC_ID* hec_id;
   const LArFCAL_ID* fcal_id;
   const CaloLVL1_ID* lvl1_id;
 
-  status=detStore->retrieve(em_id);
+  StatusCode status=detStore->retrieve(em_id);
   if(status.isFailure()){
-    (*m_msg) << MSG::ERROR <<  "Cannot retrieve em_id" << endmsg;
+    ATH_MSG_ERROR( "Cannot retrieve em_id" );
   }
   status=detStore->retrieve(hec_id);
   if(status.isFailure()){
-    (*m_msg) << MSG::ERROR <<  "Cannot retrieve hec_id" << endmsg;
+    ATH_MSG_ERROR( "Cannot retrieve hec_id" );
   }
   status=detStore->retrieve(fcal_id);
   if(status.isFailure()){
-    (*m_msg) << MSG::ERROR <<  "Cannot retrieve fcal_id" << endmsg;
+    ATH_MSG_ERROR( "Cannot retrieve fcal_id" );
   }
   status=detStore->retrieve(lvl1_id);
   if(status.isFailure()){
-    (*m_msg) << MSG::ERROR <<  "Cannot retrieve lvl1_id" << endmsg;
+    ATH_MSG_ERROR( "Cannot retrieve lvl1_id" );
   }
   LArTTCell::const_iterator it  = m.begin();
   LArTTCell::const_iterator it_e  = m.end();
@@ -93,35 +80,29 @@ void LArTTCellMap::set( const LArTTCell& m )
 	id = fcal_id->channel_id(t.pn,t.region,t.eta,t.phi);
 
       } else        {
-	(*m_msg) <<MSG::ERROR <<" Wrong input Detector Number " << t.det << endmsg;
+	ATH_MSG_ERROR( " Wrong input Detector Number " << t.det );
       }
 
       Identifier sid = lvl1_id->layer_id(t.tpn,t.tsample,t.tregion,t.teta,t.tphi,t.layer);
 
-      if (m_msg->level() <= MSG::VERBOSE) {
-	(*m_msg) <<MSG::VERBOSE
-	   << " db struct= "
-	   <<" det="<<t.det
-	   <<" pn="<<t.pn
-	   <<" region="<<t.region
-	   <<" sample="<<t.sample
-	   <<" eta="<<t.eta<<" phi="<<t.phi
-	   <<" trig pn="<<t.tpn
-	   <<" trig region="<<t.tregion
-	   <<" trig sample="<<t.tsample
-	   <<" trig eta="<<t.teta<<" trig phi="<<t.tphi
-	   <<" layer="<<t.layer
-	   << endmsg;
-
-	(*m_msg) <<MSG::VERBOSE<< " lvl1 id = " << sid<<" offline id ="<<id<<endmsg;
-      }
+      ATH_MSG_VERBOSE( " db struct= "
+                       <<" det="<<t.det
+                       <<" pn="<<t.pn
+                       <<" region="<<t.region
+                       <<" sample="<<t.sample
+                       <<" eta="<<t.eta<<" phi="<<t.phi
+                       <<" trig pn="<<t.tpn
+                       <<" trig region="<<t.tregion
+                       <<" trig sample="<<t.tsample
+                       <<" trig eta="<<t.teta<<" trig phi="<<t.tphi
+                       <<" layer="<<t.layer );
+      ATH_MSG_VERBOSE( " lvl1 id = " << sid<<" offline id ="<<id );
 
       if(!(cellIdSet.insert(id)).second) {
-	(*m_msg) <<MSG::ERROR<<" Duplicate cell id "
-	   << lvl1_id->show_to_string(id)
-	   << " in TT= "
-	   << lvl1_id->show_to_string(sid)
-	   << endmsg;
+        ATH_MSG_ERROR( " Duplicate cell id "
+                       << lvl1_id->show_to_string(id)
+                       << " in TT= "
+                       << lvl1_id->show_to_string(sid) );
       }
       m_cell2ttIdMap[id] = sid;
 
@@ -167,13 +148,11 @@ void LArTTCellMap::set( const LArTTCell& m )
 
 
   catch (LArID_Exception& except)  {
-    (*m_msg) <<MSG::ERROR<<" Failed in LArTTCellMap::set " << endmsg;
-    (*m_msg) <<MSG::ERROR<< (std::string) except  << endmsg ;
+    ATH_MSG_ERROR( " Failed in LArTTCellMap::set " );
+    ATH_MSG_ERROR( (std::string) except  );
   }
 
-  if (m_msg->level() <= MSG::DEBUG) {
-    (*m_msg) <<MSG::DEBUG<<" LArTTCellMap::set : number of cell Ids="<<m_cell2ttIdMap.size()<<std::endl;
-  }
+  ATH_MSG_DEBUG( " LArTTCellMap::set : number of cell Ids="<<m_cell2ttIdMap.size() );
 
   detStore->release() ;
 
@@ -190,7 +169,7 @@ Identifier LArTTCellMap::whichTTID(const Identifier& id) const
 	return (*it).second;
  }
 
- (*m_msg) <<MSG::ERROR<<" Offline TT ID not found for cell "<< id <<endmsg;
+ ATH_MSG_ERROR( " Offline TT ID not found for cell "<< id );
 
  return  Identifier();
 
@@ -211,9 +190,7 @@ LArTTCellMap::createCellIDvec(const Identifier & sid) const
 	return (*it).second;
  }
 
- if (m_msg->level() <= MSG::VERBOSE) {
-   (*m_msg) <<MSG::VERBOSE<<" vector of offline cell ID not found, TT id = " <<sid.get_compact()<< endmsg;
- }
+ ATH_MSG_VERBOSE( " vector of offline cell ID not found, TT id = " <<sid.get_compact() );
 
  static const std::vector<Identifier> v;
  return  v ;

Commission/CommissionEvent/CommissionEvent/ATLAS_CHECK_THREAD_SAFETY

+Commission/CommissionEvent

Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx

@@ -44,7 +44,7 @@ AthHistogramAlgorithm::AthHistogramAlgorithm( const std::string& name,
                   "ROOT objects to ROOT files" );
   //  declareProperty("THistService",      m_histSvc, "The THistSvc" );
   
-  declareProperty("RootStreamName",    m_prefix  = "/", "Name of the output ROOT stream (file) that the THistSvc uses");
+  declareProperty("RootStreamName",    m_prefix  = "/ANALYSIS", "Name of the output ROOT stream (file) that the THistSvc uses");
   declareProperty("RootDirName",       m_rootDir = "",
                   "Name of the ROOT directory inside the ROOT file where the histograms will go");
 

Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx

@@ -43,7 +43,7 @@ AthHistogramFilterAlgorithm::AthHistogramFilterAlgorithm( const std::string& nam
                   "ROOT objects to ROOT files" );
 
   //declareProperty("THistService",      m_histSvc, "The THistSvc" );
-  declareProperty("RootStreamName",    m_prefix  = "/", "Name of the output ROOT stream (file) that the THistSvc uses");
+  declareProperty("RootStreamName",    m_prefix  = "/ANALYSIS", "Name of the output ROOT stream (file) that the THistSvc uses");
   declareProperty("RootDirName",       m_rootDir = "",
                   "Name of the ROOT directory inside the ROOT file where the histograms will go");
 

Control/AthenaBaseComps/src/AthHistogramTool.cxx

@@ -41,7 +41,7 @@ AthHistogramTool::AthHistogramTool( const std::string& type,
                   "Handle to a THistSvc instance: it will be used to write "
                   "ROOT objects to ROOT files" );
 
-  declareProperty("RootStreamName",    m_prefix  = "/", "Name of the output ROOT stream (file) that the THistSvc uses");
+  declareProperty("RootStreamName",    m_prefix  = "/ANALYSIS", "Name of the output ROOT stream (file) that the THistSvc uses");
   declareProperty("RootDirName",       m_rootDir = "",
                   "Name of the ROOT directory inside the ROOT file where the histograms will go");
 

Control/AthenaConfiguration/python/ComponentAccumulator.py

@@ -939,6 +939,11 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
     def __areSettingsSame( existingConfigurableInstance, newConf2Instance, indent="" ):
         _log.debug( "%sChecking if settings are the same %s %s",
                     indent, existingConfigurableInstance.getFullName(), newConf2Instance.getFullJobOptName() )
+        if (existingConfigurableInstance.getType() != newConf2Instance.__cpp_type__): 
+            raise ConfigurationError("Old/new ({} | {}) cpp types are not the same for ({} | {}) !".format(
+                                    existingConfigurableInstance.getType(),newConf2Instance.__cpp_type__, 
+                                    existingConfigurableInstance.getFullName(), newConf2Instance.getFullJobOptName() ) )
+
         alreadySetProperties = existingConfigurableInstance.getValuedProperties().copy()
         _log.debug( "Existing properties: %s", alreadySetProperties )
         _log.debug( "New properties: %s", newConf2Instance._properties )
@@ -950,18 +955,35 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
                               indent, compName(newConf2Instance), pname, compName(pvalue) )
                 continue
             propType = newConf2Instance._descriptors[pname].cpp_type
-            _log.debug( "%sComparing type: %s for: %s", indent, propType, pname )
+            _log.debug( "%sComparing type: %s for: %s in: %s", indent, propType, pname, existingConfigurableInstance.getFullJobOptName() )
             if  "PrivateToolHandleArray" in  propType:
                 toolDict = {_.getName(): _ for _ in alreadySetProperties[pname]}
                 _log.debug('Private tool properties? %s', toolDict)
                 newCdict = {_.getName() : _ for _ in pvalue}
                 oldCset = set(toolDict); newCset = set(newCdict)
                 _log.debug('Private tool property names? %s %s', oldCset, newCset)
+                if ( not (oldCset == newCset) ):
+                    _log.warning('%s PrivateToolHandleArray %s  does not have the same named components',indent, pname )
+                    _log.warning('%s Old (conf1) %s for %s',indent, oldCset, existingConfigurableInstance.getFullJobOptName())
+                    _log.warning('%s New (conf2) %s for %s',indent, newCset, newConf2Instance.getFullJobOptName())
+                    _log.warning('%s Will try to merge them, but this might go wrong!',indent)
                 for oldC in oldCset & newCset:
                     __areSettingsSame( toolDict[oldC], newCdict[oldC], __indent(indent))
+                # And now just the new properties in conf2 (the stuff just in conf1 is already in the objec)
                 for newC in newCset-oldCset:
-                    # clone new config to old array
-                    alreadySetProperties[pname].append(conf2toConfigurable(newCdict[newC]))
+                    className = newCdict[newC].getFullJobOptName().split( "/" )[0]
+                    _log.debug('%s %s not in oldconfig. Will try to create conf1 instance using this className: %s, and merge.',indent, newC, className)
+                    configurableClass = __findConfigurableClass( className )
+                    # Do not create with existing name, or it will try to get an existing public tool, if available
+                    # (and public tools cannot be added to a PrivateToolHandleArray)
+                    instance = configurableClass( newC + className + str(len(indent)) ) 
+
+                    # Now give it the correct name
+                    instance._name = newCdict[newC].name
+
+                    __setProperties( instance, newCdict[newC], __indent( indent ) )
+                    _log.debug('%s will now add %s to array.',indent, instance) 
+                    alreadySetProperties[pname].append(instance)
             elif "PublicToolHandleArray" in propType:
                 toolSet = {_.getName() for _ in alreadySetProperties[pname]}
                 _log.debug('Public tool handle array properties? %s %s', toolSet, pvalue)
@@ -982,6 +1004,9 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
                                  "skipping deeper checks, configuration may be incorrect",
                                  indent, propType, newConf2Instance.name, pname, pvalue)
                 else:
+                    if pvalue is None:
+                        _log.debug("%sThe property value for %s of %s is None. Skipping.", indent, pname, newConf2Instance.name )
+                        continue
                     _log.debug( "%sSome kind of handle and, object type %s existing %s",
                                 indent, type(pvalue), type(existingVal) )
                     __areSettingsSame( existingVal, pvalue, indent)
@@ -991,22 +1016,36 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
 
                 if pname not in alreadySetProperties:
                     _log.info( "%sAdding property: %s for %s", indent, pname, newConf2Instance.getName() )
-                    setattr(existingConfigurableInstance, pname, pvalue)
+                    try:
+                        setattr(existingConfigurableInstance, pname, pvalue)
+                    except AttributeError:
+                        _log.info("%s Could not set attribute. Type of existingConfigurableInstance %s.",indent, type(existingConfigurableInstance) )
+                        raise    
                 elif alreadySetProperties[pname] != pvalue:
                     _log.info( "%sMerging property: %s for %s", indent, pname, newConf2Instance.getName() )
                     # create surrogate
                     clone = newConf2Instance.getInstance("Clone")
                     setattr(clone, pname, alreadySetProperties[pname])
-                    updatedPropValue = __listHelperToList(newConf2Instance._descriptors[pname].semantics.merge( getattr(newConf2Instance, pname), getattr(clone, pname)))
-                        
-                    setattr(existingConfigurable, pname, updatedPropValue)
+                    try:
+                        updatedPropValue = __listHelperToList(newConf2Instance._descriptors[pname].semantics.merge( getattr(newConf2Instance, pname), getattr(clone, pname)))
+                    except ValueError:
+                        _log.warning( "Failed merging new config value (%s) and old config value (%s) for (%s) property of %s (%s) old (new). Will take value from NEW configuration, but this should be checked!",
+                            getattr(newConf2Instance, pname),getattr(clone, pname),pname,existingConfigurableInstance.getFullJobOptName() ,newConf2Instance.getFullJobOptName() )
+                        updatedPropValue=getattr(newConf2Instance, pname)
+                        # Necessary because default value is returned for lists... see e.g.:
+                        # https://gitlab.cern.ch/atlas/athena/-/blob/630b82d0540fff24c2a1da6716efc0adb53727c9/Control/AthenaCommon/python/PropertyProxy.py#L109
+                    _log.debug("existingConfigurable.name: %s, pname: %s, updatedPropValue: %s", existingConfigurableInstance.name(), pname, updatedPropValue )
+
+                    setattr(existingConfigurableInstance, pname, updatedPropValue)
                     del clone
                     _log.info("%s invoked GaudiConf2 semantics to merge the %s and the %s to %s "
                               "for property %s of %s",
                               indent, alreadySetProperties[pname], pvalue, pname,
                               updatedPropValue, existingConfigurable.getFullName())
-
+    
+    _log.debug( "%s Conf2 Full name: %s ", indent, comp.getFullJobOptName() )
     existingConfigurable = __alreadyConfigured( comp.name )
+ 
     if existingConfigurable: # if configurable exists we try to merge with it
         _log.debug( "%sPre-existing configurable %s was found, checking if has the same properties", indent, comp.getName() )
         __areSettingsSame( existingConfigurable, comp )

Control/AthenaMPTools/src/SharedHiveEvtQueueConsumer.cxx

@@ -415,8 +415,6 @@ SharedHiveEvtQueueConsumer::bootstrap_func()
   // ___________________ Fire UpdateAfterFork incident _________________
   p_incidentSvc->fireIncident(AthenaInterprocess::UpdateAfterFork(m_rankId,getpid(),name()));
 
-  p_incidentSvc->fireIncident(Incident(name(),"ReloadProxies"));
-
   // Declare success and return
   *(int*)(outwork->data) = 0;
   return outwork;

Control/IOVSvc/share/IOVSvcTool_test.ref

@@ -63,7 +63,6 @@ IncidentSvc         DEBUG Adding [BeginEvent] listener 'ConditionStore' with pri
 IncidentSvc         DEBUG Adding [BeginEvent] listener 'ToolSvc.IOVSvcTool' with priority 100
 IncidentSvc         DEBUG Adding [BeginRun] listener 'ToolSvc.IOVSvcTool' with priority 100
 ToolSvc.IOVSvcTool   INFO IOVRanges will be checked at every Event
-IncidentSvc         DEBUG Adding [ReloadProxies] listener 'ToolSvc.IOVSvcTool' with priority 100
 ToolSvc.IOVSvcTool  DEBUG Tool initialized
 ClassIDSvc           INFO  getRegistryEntries: read 372 CLIDRegistry entries for module ALL
 ToolSvc.IOVSvcTool  DEBUG registering proxy [Dooo:6666/old] at 0x2309460

Control/IOVSvc/src/CondInputLoader.cxx

@@ -24,6 +24,7 @@
 
 #include "xAODEventInfo/EventInfo.h"
 #include "AthenaKernel/BaseInfo.h"
+#include "ICondSvcSetupDone.h"
 
 #include "TClass.h"
 
@@ -265,6 +266,12 @@ CondInputLoader::start()
     return StatusCode::FAILURE;
   }
 
+  // Let the conditions service know that we've finished creating
+  // conditions containers.
+  ServiceHandle<ICondSvcSetupDone> condSvcDone ("CondSvc", name());
+  ATH_CHECK( condSvcDone.retrieve() );
+  ATH_CHECK( condSvcDone->setupDone() );
+
   return StatusCode::SUCCESS;
 
 }

Control/IOVSvc/src/CondSvc.cxx

@@ -130,6 +130,15 @@ CondSvc::finalize() {
 }
 
 
+StatusCode
+CondSvc::start()
+{
+  // Call this now, in case there's no CondInputLoader.
+  ATH_CHECK( setupDone() );
+  return StatusCode::SUCCESS;
+}
+
+
 StatusCode
 CondSvc::stop() {
 
@@ -342,7 +351,10 @@ CondSvc::getValidIDs(const EventContext& ctx, DataObjIDColl& validIDs) {
 
 bool
 CondSvc::isValidID(const EventContext& ctx, const DataObjID& id) const {
-  std::lock_guard<mutex_t> lock(m_lock);
+  // Don't take out the lock here.
+  // In many-thread jobs, a lock here becomes heavily contended.
+  // The only potential conflict is with startConditionSetup(),
+  // which should only be called during START.
 
   EventIDBase now(ctx.eventID());
 
@@ -352,13 +364,15 @@ CondSvc::isValidID(const EventContext& ctx, const DataObjID& id) const {
     sk.erase(0,15);
   }
 
-  if (m_sgs->contains<CondContBase>( sk ) ) {
-    CondContBase *cib;
-    if (m_sgs->retrieve(cib, sk).isSuccess()) {
-      ATH_MSG_VERBOSE("CondSvc::isValidID:  now: " << ctx.eventID() << "  id : " 
-                    << id << (cib->valid(now) ? ": T" : ": F") );
-      return cib->valid(now);
-    }
+  auto it = m_condConts.find (sk);
+  if (it != m_condConts.end()) {
+    bool valid = it->second->valid (now);
+    ATH_MSG_VERBOSE("CondSvc::isValidID:  now: " << ctx.eventID() << "  id : " 
+                    << id << (valid ? ": T" : ": F") );
+    return valid;
+  }
+  else {
+    ATH_MSG_ERROR( "Cannot find CondCont " << id );
   }
 
   ATH_MSG_DEBUG("CondSvc::isValidID:  now: " << ctx.eventID() << "  id: " 
@@ -396,3 +410,20 @@ CondSvc::conditionIDs() const {
 
 }
 
+//---------------------------------------------------------------------------
+
+
+StatusCode CondSvc::setupDone()
+{
+  std::lock_guard<mutex_t> lock(m_lock);
+
+  SG::ConstIterator<CondContBase> cib, cie;
+  if (m_sgs->retrieve(cib,cie).isSuccess()) {
+    while(cib != cie) {
+      m_condConts[cib.key()] = &*cib;
+      ++cib;      
+    }
+  }
+
+  return StatusCode::SUCCESS;
+}

Control/IOVSvc/src/CondSvc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef IOVSVC_CONDSVC_H
@@ -10,7 +10,9 @@
 #include "AthenaBaseComps/AthService.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaBaseComps/AthService.h"
+#include "ICondSvcSetupDone.h"
 
+#include <unordered_map>
 #include <map>
 #include <set>
 #include <vector>
@@ -19,38 +21,45 @@
 class ConditionSlotFuture;
 class ICondtionIOSvc;
 
-class ATLAS_CHECK_THREAD_SAFETY CondSvc: public extends1<AthService, ICondSvc> {
+class ATLAS_CHECK_THREAD_SAFETY CondSvc: public extends<AthService, ICondSvc, ICondSvcSetupDone> {
 public:
 
   CondSvc(const std::string& name, ISvcLocator* svc);
   ~CondSvc();
 
-  virtual StatusCode initialize();
-  virtual StatusCode finalize();
-  virtual StatusCode stop();
+  virtual StatusCode initialize() override;
+  virtual StatusCode finalize() override;
+  virtual StatusCode start() override;
+  virtual StatusCode stop() override;
 
   // from ICondSvc
 public:
-  virtual StatusCode regHandle(IAlgorithm* alg, const Gaudi::DataHandle& id);
+  virtual StatusCode regHandle(IAlgorithm* alg, const Gaudi::DataHandle& id) override;
 
   virtual bool getInvalidIDs(const EventContext&, DataObjIDColl& ids);
   virtual bool getValidIDs(const EventContext&, DataObjIDColl& ids);
   virtual bool getIDValidity(const EventContext&, DataObjIDColl& validIDs,
                              DataObjIDColl& invalidIDs);
-  virtual bool isValidID(const EventContext&, const DataObjID&) const;
+  virtual bool isValidID(const EventContext&, const DataObjID&) const override;
 
-  virtual const std::set<IAlgorithm*>& condAlgs() const { return m_condAlgs; }
+  virtual const std::set<IAlgorithm*>& condAlgs() const override { return m_condAlgs; }
 
-  virtual bool isRegistered(const DataObjID&) const;
-  virtual bool isRegistered(IAlgorithm*) const;
+  virtual bool isRegistered(const DataObjID&) const override;
+  virtual bool isRegistered(IAlgorithm*) const override;
   
-  virtual const DataObjIDColl& conditionIDs() const;
+  virtual const DataObjIDColl& conditionIDs() const override;
 
   virtual StatusCode validRanges( std::vector<EventIDRange>& ranges,
-                                  const DataObjID& id ) const;
+                                  const DataObjID& id ) const override;
 
   //  virtual void dump() const;
-  virtual void dump(std::ostream&) const;
+  virtual void dump(std::ostream&) const override;
+
+  /// To be called after changes to the set of conditions containers
+  /// in the conditions store.
+  /// May not be called concurrently with any other methods of this class.
+  virtual StatusCode setupDone() override;
+
 
 public:
   // unimplemented interfaces
@@ -62,7 +71,7 @@ public:
 
   /// register an IConditionIOSvc (alternative to Algorithm processing of 
   /// Conditions)
-  virtual StatusCode registerConditionIOSvc(IConditionIOSvc*) {
+  virtual StatusCode registerConditionIOSvc(IConditionIOSvc*)  override {
     return StatusCode::FAILURE;
   }
 
@@ -103,6 +112,11 @@ private:
 
   DataObjIDColl m_condIDs;
 
+  // Map from keys to CondContBase instances.
+  // Populated by startConditionSetup().
+  typedef std::unordered_map<std::string, const CondContBase*> CondContMap_t;
+  CondContMap_t m_condConts;
+
   typedef std::mutex mutex_t;
   mutable mutex_t m_lock;
 

Control/IOVSvc/src/ICondSvcSetupDone.h

+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file IOVSvc/src/ICondSvcSetupDone.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Nov, 2020
+ * @brief Interface to tell CondSvc to cache conditions containers.
+ */
+
+
+#ifndef IOVSVC_ICONDSVCSETUPDONE_H
+#define IOVSVC_ICONDSVCSETUPDONE_H
+
+
+#include "GaudiKernel/IInterface.h"
+
+
+class ICondSvcSetupDone
+  : virtual public IInterface
+{
+public:
+  DeclareInterfaceID( ICondSvcSetupDone, 1, 0 );
+
+  /// To be called after creating conditions containers
+  /// in the conditions store.
+  virtual StatusCode setupDone() = 0;
+};
+
+
+#endif // not IOVSVC_ICONDSVCSETUPDONE_H