Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py

@@ -76,7 +76,8 @@ if __name__=="__main__":
     parser.add_argument('datestamp',help="time specification like 2007-05-25:14:01:00")
     parser.add_argument('-a', '--absolute', action="store_true", help="Absolute rescaling based on noise derived from MC")
     parser.add_argument('-t', '--globaltag', type=str, help="Global conditions tag ")
-    parser.add_argument('-o', '--output',type=str,default="hvcorr",help="name stub for root and sqlite output files")
+    parser.add_argument('-s', '--sqlite', type=str,help="sqlite with CellNoise and HVCorr folders to be scaled ")
+    parser.add_argument('-o', '--output',type=str,default="cellnoise_data.root",help="name stub for root and sqlite output files")
     args = parser.parse_args()
     print(args)
 
@@ -95,13 +96,15 @@ if __name__=="__main__":
     from LArCalibProcessing.TimeStampToRunLumi import TimeStampToRunLumi
     rlb=TimeStampToRunLumi(TimeStamp_ns)
     if rlb is None:
-        rlb=[0xFFFFFFFF-1,0]
-        print("WARNING: Failed to convert time",TimeStamp_ns,"into a run/lumi number. Using 'infinite' run-number",rlb[0])
+        #rlb=[0x7FFFFFFF-1,0]
+        rlb=[999999,0]
+        print("WARNING: CaloScaleNoise: Failed to convert time",TimeStamp_ns,"into a run/lumi number. Using 'infinite' run-number",rlb[0])
 
 
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     flags = initConfigFlags()
     flags.Input.RunNumbers=[rlb[0]]
+    print("set the runnumber: ",flags.Input.RunNumbers)
     flags.Input.TimeStamps=[TimeStamp]
     flags.Input.Files=[]
     flags.IOVDb.DatabaseInstance="CONDBR2"
@@ -111,6 +114,10 @@ if __name__=="__main__":
     if args.globaltag:
         flags.IOVDb.GlobalTag=args.globaltag
 
+    if args.sqlite:
+        flags.IOVDb.SqliteInput=args.sqlite
+        flags.IOVDb.SqliteFolders=("/LAR/NoiseOfl/CellNoise","/LAR/ElecCalibFlat/HVScaleCorr",)
+
     flags.lock()
     cfg=MainEvgenServicesCfg(flags)
     cfg.merge(CaloScaleNoiseCfg(flags,absolute=args.absolute,output=args.output))

Calorimeter/CaloCondPhysAlgs/python/LArMinBiasAlgConfig.py

+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentFactory import CompFactory 
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+def LArMinBiasAlgCfg(flags, output='ntuple.root', supercell=False,
+                      idlowpt=900311, idhighpt=800831, wlowpt=0.099791, whighpt=0.00209):
+
+    result=ComponentAccumulator()
+
+    from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+    result.merge(LArGMCfg(flags))
+    from TileGeoModel.TileGMConfig import TileGMCfg
+    result.merge(TileGMCfg(flags))
+
+    if(supercell):
+       from LArCabling.LArCablingConfig import LArOnOffIdMappingSCCfg
+       result.merge(LArOnOffIdMappingSCCfg(flags))
+
+       rKey="LArOnOffIdMapSC"
+    else:   
+       from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
+       result.merge(LArOnOffIdMappingCfg(flags))
+
+       rKey="LArOnOffIdMap"
+
+    result.addCondAlgo(CompFactory.LArMCSymCondAlg("LArMCSymCondAlgSC",SuperCell=supercell,ReadKey=rKey))
+
+    from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+    result.merge(EventInfoCnvAlgCfg(flags, disableBeamSpot=True))
+
+    larMinBiasAlg = CompFactory.LArMinBiasAlg() 
+    larMinBiasAlg.datasetID_lowPt=idlowpt
+    larMinBiasAlg.datasetID_highPt=idhighpt
+    # in mc16 files, computed at the beginning: 
+    larMinBiasAlg.weight_lowPt = wlowpt
+    larMinBiasAlg.weight_highPt= whighpt
+    larMinBiasAlg.EvtInfo="EventInfo"
+    larMinBiasAlg.CablingKey=rKey
+    larMinBiasAlg.SuperCell=supercell
+    #larMinBiasAlg.OutputLevel=2
+    
+    result.addEventAlgo(larMinBiasAlg)
+
+    import os
+    if os.path.exists(output):
+        os.remove(output)
+    result.addService(CompFactory.THistSvc(Output = ["file1 DATAFILE='"+output+"' OPT='RECREATE'"]))
+    result.setAppProperty("HistogramPersistency","ROOT")
+
+    return result
+
+def list_of_strings(arg):
+    return arg.split(',')
+
+if __name__=="__main__":
+    import argparse
+    parser= argparse.ArgumentParser(description="Compute LArMinBias  from hits")
+    parser.add_argument('-r', '--run',type=int,default=999999,help="run number")
+    parser.add_argument('-o', '--output',type=str,default="ntuple.root",help="name of th root output file")
+    parser.add_argument('-i', '--input',type=list_of_strings,default=[],help="name of the input files")
+    parser.add_argument('-t', '--globaltag', type=str, help="Global conditions tag ")
+    parser.add_argument( '--idlow',type=int,default=900311,help="ID of lowPt sample")
+    parser.add_argument( '--idhigh',type=int,default=800831,help="ID of highPt sample")
+    parser.add_argument( '--wlow',type=float,default=0.099791,help="weight of lowPt sample")
+    parser.add_argument( '--whigh',type=float,default=0.00209,help="weight of highPt sample")
+    parser.add_argument('-s', '--isSC',default=False,action='store_true',help="running for SC ?")
+    args = parser.parse_args()
+    print(args)
+    print(len(args.input))
+
+    from AthenaConfiguration.AllConfigFlags import initConfigFlags
+    flags = initConfigFlags()
+    flags.Input.RunNumbers=[args.run]
+    print("set the runnumber: ",flags.Input.RunNumbers)
+    flags.Input.Files=args.input
+    flags.IOVDb.DatabaseInstance="OFLP200"
+    from AthenaConfiguration.TestDefaults import defaultGeometryTags
+    flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN3
+  
+    if args.globaltag:
+        flags.IOVDb.GlobalTag=args.globaltag
+
+    #flags.Debug.DumpEvtStore=True
+    #flags.Debug.DumpDetStore=True    
+    #flags.Debug.DumpCondStore=True    
+
+    flags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    cfg=MainServicesCfg(flags)
+
+    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+    cfg.merge(PoolReadCfg(flags))
+
+    cfg.merge(LArMinBiasAlgCfg(flags,output=args.output, supercell=args.isSC,
+                               idlowpt=args.idlow, idhighpt=args.idhigh, 
+                                wlowpt=args.wlow, whighpt=args.whigh))
+
+    print("Start running...")
+    cfg.getService("MessageSvc").debugLimit=1000000
+    cfg.run()

Calorimeter/CaloCondPhysAlgs/src/LArMinBiasAlg.cxx

@@ -8,6 +8,7 @@
 #include "CaloIdentifier/CaloIdManager.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/CaloCell_ID.h"
+#include "CaloIdentifier/CaloCell_SuperCell_ID.h"
 
 #include "LArSimEvent/LArHit.h"
 #include "LArSimEvent/LArHitContainer.h"
@@ -67,9 +68,11 @@
 
     const CaloIdManager* mgr = nullptr;
     ATH_CHECK( detStore()->retrieve( mgr ) );
-    m_larem_id   = mgr->getEM_ID();
-    m_calo_id    = mgr->getCaloCell_ID();
-
+    if(m_isSC) {
+       m_calo_id = (const CaloCell_Base_ID*)mgr->getCaloCell_SuperCell_ID();
+    } else {
+       m_calo_id = (const CaloCell_Base_ID*)mgr->getCaloCell_ID();
+    }
 
     ATH_CHECK(m_mcSymKey.initialize());
 
@@ -77,8 +80,15 @@
 
     ATH_CHECK(m_caloMgrKey.initialize());
 
+    ATH_CHECK(m_caloSCMgrKey.initialize(m_isSC));
+
     ATH_CHECK(m_eventInfoKey.initialize());
 
+    ATH_CHECK(m_larHitKeys.assign(m_inputKeys.value()));
+    ATH_CHECK(m_larHitKeys.initialize(!m_inputKeys.empty() ));
+
+    if(m_isSC) ATH_CHECK( m_scidtool.retrieve() );
+
     m_n1=0;
     m_n2=0;
 
@@ -113,8 +123,16 @@
 
     if (m_first) {
 
-      SG::ReadCondHandle<CaloDetDescrManager> caloMgrHandle{m_caloMgrKey};
-      ATH_CHECK(caloMgrHandle.isValid());
+      const CaloDetDescrManager_Base *cMgr=nullptr;
+      if(m_isSC){
+         SG::ReadCondHandle<CaloSuperCellDetDescrManager> caloMgrHandle{m_caloSCMgrKey};
+         ATH_CHECK(caloMgrHandle.isValid());
+         cMgr=(const CaloDetDescrManager_Base *)(*caloMgrHandle);
+      } else {
+         SG::ReadCondHandle<CaloDetDescrManager> caloMgrHandle{m_caloMgrKey};
+         ATH_CHECK(caloMgrHandle.isValid());
+         cMgr=(const CaloDetDescrManager_Base *)(*caloMgrHandle);
+      }
 
       SG::ReadCondHandle<LArMCSym>  mcsym      (m_mcSymKey, ctx);
       SG::ReadCondHandle<LArOnOffIdMapping> cablingHdl (m_cablingKey, ctx);
@@ -125,6 +143,7 @@
       }
 
       m_ncell = m_calo_id->calo_cell_hash_max();
+      ATH_MSG_DEBUG("Hash max: "<<m_ncell);
 
       ATH_MSG_INFO(" --- first event " << m_ncell);
       m_symCellIndex.resize(m_ncell,-1);
@@ -153,13 +172,15 @@
         // we have already processed this hash => just need to associate cell i to the same symmetric cell
         if (doneCell[i2]>=0) {
            m_symCellIndex[i]=doneCell[i2];
+           ATH_MSG_DEBUG("Adding cell "<<id.get_identifier32().get_compact()<<" to a symmetrized  cell "<<id2.get_identifier32().get_compact());
         }
         // we have not already processed this hash, add an entry for this new symmetric cell
         else {  
+           ATH_MSG_DEBUG("New symmetrized  cell "<<id2.get_identifier32().get_compact());
            doneCell[i2]=nsym;
            m_symCellIndex[i] = nsym; 
            CellInfo cell;
-           const CaloDetDescrElement* calodde = (*caloMgrHandle)->get_element(id);
+           const CaloDetDescrElement* calodde = cMgr->get_element(id);
            cell.eta =  calodde->eta();
            cell.phi = calodde->phi();
            cell.region = m_calo_id->region(id);
@@ -214,21 +235,27 @@
 
    for (int i=0;i<m_ncell;i++) m_eCell[i]=0.;
 
-    std::vector <std::string> HitContainer;
-    HitContainer.emplace_back("LArHitEMB");
-    HitContainer.emplace_back("LArHitEMEC");
-    HitContainer.emplace_back("LArHitHEC");
-    HitContainer.emplace_back("LArHitFCAL");
-    for (unsigned int iHitContainer=0;iHitContainer<HitContainer.size();iHitContainer++)
-    {
-      const LArHitContainer* hit_container ;
-      ATH_CHECK(evtStore()->retrieve(hit_container,HitContainer[iHitContainer]));
-      for (const LArHit* hit : *hit_container)
+   auto hitVectorHandles = m_larHitKeys.makeHandles(ctx);
+   for (auto & inputHits : hitVectorHandles) {
+      if (!inputHits.isValid()) {
+        ATH_MSG_ERROR("BAD HANDLE"); //FIXME improve error here
+        //return StatusCode::FAILURE;
+        continue;
+      }
+
+      for (const LArHit* hit : *inputHits)
       {       
-          Identifier cellID=hit->cellID();
+          Identifier hitCellID=hit->cellID();
           double energy = hit->energy(); 
           double time =hit->time();
+          Identifier cellID;
+          if(m_isSC){
+             cellID=m_scidtool->offlineToSuperCellID(hitCellID);
+          } else {
+             cellID=hitCellID;
+          }
           int index = (int) (m_calo_id->calo_cell_hash(cellID));
+
           if (index < m_ncell && index>=0 && fabs(time)<25.) {
              m_eCell[index] += energy;
         }

Calorimeter/CaloCondPhysAlgs/src/LArMinBiasAlg.h

@@ -19,7 +19,9 @@
 #include "xAODEventInfo/EventInfo.h"
 
 #include "CaloDetDescr/CaloDetDescrManager.h"
+#include "CaloDetDescr/ICaloSuperCellIDTool.h"
 
+#include "LArSimEvent/LArHitContainer.h"
 
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "LArRawConditions/LArMCSym.h"
@@ -68,8 +70,13 @@ class ITHistSvc;
       , "CaloDetDescrManager"
       , "SG Key for CaloDetDescrManager in the Condition Store" };
 
-  const LArEM_ID*        m_larem_id = nullptr;
-  const CaloCell_ID*       m_calo_id = nullptr;
+  SG::ReadCondHandleKey<CaloSuperCellDetDescrManager> m_caloSCMgrKey { this
+      , "CaloSuperCellDetDescrManager"
+      , "CaloSuperCellDetDescrManager"
+      , "SG Key for CaloSuperCellDetDescrManager in the Condition Store" };
+
+  const CaloCell_Base_ID*       m_calo_id = nullptr;
+
   std::vector<double> m_eCell;
   
 
@@ -110,5 +117,10 @@ class ITHistSvc;
   float m_first;
   int m_ncell = 0;
   SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,"EvtInfo", "EventInfo", "EventInfo name"};
+  StringArrayProperty m_inputKeys{this, "InputHitContainers", {"LArHitEMB", "LArHitEMEC", "LArHitHEC", "LArHitFCAL"}, 
+                                "Name of input hit vectors (default=[LArHitEMB, LArHitEMEC, LArHitHEC, LArHitFCAL])" };
+  SG::ReadHandleKeyArray<LArHitContainer> m_larHitKeys;
+  BooleanProperty m_isSC {this, "SuperCell", false, "Creating for SC ?"};
+  ToolHandle<ICaloSuperCellIDTool>   m_scidtool{this, "CaloSuperCellIDTool", "CaloSuperCellIDTool", "Offline / SuperCell ID mapping tool"};
   };
 #endif

Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref

-Mon Feb  3 12:23:54 CET 2025
+Thu Feb  6 12:00:25 CET 2025
 Preloading tcmalloc_minimal.so
 Preloading libexcabort.so
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v38r0)
-                                          running on lxplus973.cern.ch on Mon Feb  3 12:23:57 2025
+                                          running on lxplus987.cern.ch on Thu Feb  6 12:00:29 2025
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-Py:ComponentAccumulator    INFO Athena job with pid 3941610
+Py:ComponentAccumulator    INFO Athena job with pid 4182340
 CoreDumpSvc                       INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 14(Alarm clock) 
 Athena...ntLoopMgr                INFO Initializing AthenaHiveEventLoopMgr
 ClassIDSvc                        INFO getRegistryEntries: read 3153 CLIDRegistry entries for module ALL
@@ -70,6 +70,8 @@ Avalan...edulerSvc           0    INFO Data Dependencies for Algorithms:
     o INPUT   ( 'DMTest::C' , 'StoreGateSvc+cinfo.dInt1' ) 
     o INPUT   ( 'DMTest::CVec' , 'StoreGateSvc+cvec' ) 
     o INPUT   ( 'DMTest::CVec' , 'StoreGateSvc+cvec.dInt1' ) 
+    o INPUT   ( 'SG::AuxElement' , 'StoreGateSvc+cinfo' ) 
+    o INPUT   ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1Base' ) 
     o OUTPUT  ( 'DMTest::C' , 'StoreGateSvc+scopy_cinfo' ) 
     o OUTPUT  ( 'DMTest::C' , 'StoreGateSvc+scopy_cinfo.anInt10' ) 
     o OUTPUT  ( 'DMTest::C' , 'StoreGateSvc+scopy_cinfo.dInt1' ) 
@@ -79,6 +81,7 @@ Avalan...edulerSvc           0    INFO Data Dependencies for Algorithms:
     o OUTPUT  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo' ) 
     o OUTPUT  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.anInt10' ) 
     o OUTPUT  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.dInt1' ) 
+    o OUTPUT  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.dInt1Base' ) 
     o OUTPUT  ( 'SG::AuxVectorBase' , 'StoreGateSvc+scopy_cvec' ) 
     o OUTPUT  ( 'SG::AuxVectorBase' , 'StoreGateSvc+scopy_cvec.anInt10' ) 
     o OUTPUT  ( 'SG::AuxVectorBase' , 'StoreGateSvc+scopy_cvec.dInt1' ) 
@@ -94,9 +97,7 @@ Avalan...edulerSvc           0    INFO Data Dependencies for Algorithms:
       none
   IncidentProcAlg3
       none
-Avalan...edulerSvc           0    INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
-Avalan...edulerSvc           0    INFO    o  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.dInt1Base' )     required by Algorithm: 
-Avalan...edulerSvc           0    INFO        * xAODTestReadDecorSCopy
+Avalan...edulerSvc           0    INFO No unmet INPUT data dependencies were found
 PrecedenceSvc                0    INFO Assembling CF and DF task precedence rules
 PrecedenceSvc                0    INFO PrecedenceSvc initialized successfully
 Avalan...edulerSvc           0    INFO Concurrency level information:
@@ -115,7 +116,6 @@ EventP...stencySvc     0     0    INFO Added successfully Conversion service McC
 Athena...ntLoopMgr     0     0    INFO   ===>>>  start of run 0    <<<===
 Athena...ntLoopMgr     0     0    INFO   ===>>>  start processing event #1, run #0 on slot 0,  0 events processed so far  <<<===
 ClassIDSvc             0     0    INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
-SGInputLoader          0     0 WARNING unable to find proxy for  ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo' ) 
 xAODTestReadDecor      0     0    INFO cvec.dInt1: 801 802 803 804 805 806 807 808 809 810
 xAODTestReadDecor      0     0    INFO cinfo.dInt1: 6000
 xAODTestReadDecor      0     0    INFO cinfo.dInt1Base: 6001
@@ -315,7 +315,7 @@ xAODTe...ecorSCopy    19     0    INFO scopy_cinfo.dInt1: 63000
 xAODTe...ecorSCopy    19     0    INFO scopy_cinfo.dInt1Base: 63001
 xAODTe...ecorSCopy    19     0    INFO scopy_cinfo.dInt1: 63000
 Athena...ntLoopMgr    19     0    INFO   ===>>>  done processing event #20, run #0 on slot 0,  20 events processed so far  <<<===
-Athena...ntLoopMgr    19     0    INFO ---> Loop Finished (seconds): 0.0119674
+Athena...ntLoopMgr    19     0    INFO ---> Loop Finished (seconds): 0.0129158
 ApplicationMgr                    INFO Application Manager Stopped successfully
 SGInputLoader                     INFO Finalizing SGInputLoader...
 Avalan...edulerSvc                INFO Joining Scheduler thread

Control/DataModelTest/DataModelTestDataCommon/src/xAODTestShallowCopy.cxx

@@ -59,6 +59,13 @@ StatusCode xAODTestShallowCopy::initialize()
   ATH_CHECK( m_cinfoAnInt10Key.initialize( !m_cinfoReadKey.empty() ) );
   ATH_CHECK( m_cinfoDecorDeps.initialize( m_cinfoReadKey, m_cinfoWriteKey, !m_cinfoReadKey.empty() ) );
 
+  if (m_cinfoReadKeyBase.empty()) {
+    m_cinfoWriteKeyBase = "";
+  }
+  ATH_CHECK( m_cinfoReadKeyBase.initialize( !m_cinfoReadKeyBase.empty() ) );
+  ATH_CHECK( m_cinfoWriteKeyBase.initialize( !m_cinfoReadKeyBase.empty() ) );
+  ATH_CHECK( m_cinfoDecorDepsBase.initialize( m_cinfoReadKeyBase, m_cinfoWriteKeyBase, !m_cinfoReadKeyBase.empty() ) );
+  
   if (m_ctrigReadKey.empty()) {
     m_ctrigWriteKey = "";
     m_ctrigAnInt10Key = "";
@@ -111,7 +118,7 @@ StatusCode xAODTestShallowCopy::execute (const EventContext& ctx) const
   }
 
   if (!m_cinfoReadKey.empty()) {
-    SG::ReadHandle<C> cinfo (m_cinfoReadKey, ctx);
+    SG::ReadHandle<DMTest::C> cinfo (m_cinfoReadKey, ctx);
     auto ret = xAOD::shallowCopyObject (*cinfo);
 
     SG::WriteHandle<DMTest::C> copy (m_cinfoWriteKey, ctx);
@@ -124,6 +131,10 @@ StatusCode xAODTestShallowCopy::execute (const EventContext& ctx) const
     anInt10(*ret.first) = count * 20000 + ret.first->anInt() * 200;
   }
 
+  if (!m_cinfoReadKeyBase.empty()) {
+    ATH_CHECK( m_cinfoDecorDepsBase.linkDecors (m_cinfoReadKeyBase, ctx) );
+  }
+
   if (!m_ctrigReadKey.empty()) {
     SG::ReadHandle<CVec> ctrig (m_ctrigReadKey, ctx);
     auto ret = xAOD::shallowCopyContainer (*ctrig);

Control/DataModelTest/DataModelTestDataCommon/src/xAODTestShallowCopy.h

@@ -75,7 +75,16 @@ private:
   SG::WriteDecorHandleKey<DMTest::C> m_cinfoAnInt10Key
   { this, "CInfoAnInt10Key", "scopy_cinfo.anInt10", "Key for cinfo anInt10 decoration" };
   SG::ShallowCopyDecorDeps<DMTest::C> m_cinfoDecorDeps
-  { this, "CInfoDecorHelper", { "dInt1" } };
+    { this, "CInfoDecorHelper", { "dInt1" } };
+  
+  // one of the decorations (dInt1Base) is a decoration on the SG::AuxElement base class
+  // so to propagate this we need handles for that type too
+  SG::ReadHandleKey<SG::AuxElement> m_cinfoReadKeyBase
+  { this, "CInfoReadKeyBase", "cinfo", "Key for cinfo object read from SG" };
+  SG::WriteHandleKey<SG::AuxElement> m_cinfoWriteKeyBase
+  { this, "CInfoWriteKeyBase", "scopy_cinfo", "Key for cinfo object written to SG" };
+  SG::ShallowCopyDecorDeps<SG::AuxElement> m_cinfoDecorDepsBase
+    { this, "CInfoDecorHelperBase", { "dInt1Base" } };
 
   SG::ReadHandleKey<DMTest::CVec> m_ctrigReadKey
   { this, "CTrigReadKey", "ctrig", "Key for ctrig object read from SG" };
@@ -84,7 +93,7 @@ private:
   SG::WriteDecorHandleKey<DMTest::CVec> m_ctrigAnInt10Key
   { this, "CTrigAnInt10Key", "scopy_ctrig.anInt10", "Key for ctrig anInt10 decoration" };
   SG::ShallowCopyDecorDeps<DMTest::CVec> m_ctrigDecorDeps
-  { this, "CTrigDecorHelper", { "dInt1" } };
+    { this, "CTrigDecorHelper", { "dInt1" } };
 
 };
 

Control/SGComps/src/SGInputLoader.cxx

@@ -107,7 +107,10 @@ SGInputLoader::execute()
         // Strip any decoration name.
         std::string::size_type ppos = obj.key().find ('.');
         if (ppos < obj.key().size()-1) {
-          obj.updateKey (obj.key().substr (0, ppos));
+          //obj.updateKey (obj.key().substr (0, ppos));
+          // commented out line above, to keep decoration on key so can distinguish undeclared decorations from undeclared objects
+          // undeclared objects will be an error, undeclared decorations will just be a warning
+          // TODO: restore the above modification (and make all transient proxies an error in loadObj, not just non-decorations) when all decorations are declared
         }
         m_load.emplace (std::move(obj));
       }
@@ -183,17 +186,24 @@ SGInputLoader::loadObjs(const DataObjIDColl& objs) const {
 
   for (auto &obj: objs) {
 
+    std::string::size_type ppos = obj.key().substr(0,obj.key().size()-1).find('.');
+
     // use the parsing built into the VarHandleKey to get the correct
     // StoreGate key
-    SG::VarHandleKey vhk(obj.clid(),obj.key(),Gaudi::DataHandle::Reader);
+    SG::VarHandleKey vhk(obj.clid(),obj.key().substr(0,ppos),Gaudi::DataHandle::Reader);
 
     ATH_MSG_DEBUG("trying to load " << obj << "   sgkey: " << vhk.key() );
 
     SG::DataProxy* dp = evtStore()->proxy(obj.clid(), vhk.key());
     if (dp != 0) {
       ATH_MSG_DEBUG(" found proxy for " << obj);
-      if (dp->provider() == 0) {
-	ATH_MSG_DEBUG("   obj " << obj << " has no provider, and is only Transient" );
+      if (dp->provider() == 0 && extraOutputDeps().find(obj)==extraOutputDeps().end()) {
+        if(ppos==std::string::npos) {
+          ATH_MSG_ERROR("   obj " << obj << " has no provider, and is only Transient - indicative of a missing output declaration" );
+          ok =false;
+        } else { // just warning for now for potentially undeclared decorations, instead of error, because too many cases to fix
+          ATH_MSG_WARNING("   decoration " << obj << " has no provider, and is only Transient - indicative of a missing output declaration" );
+        }
       }
     } else {
       ok = false;

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx

@@ -4,6 +4,7 @@
 
 #include "ZDC_DetFactory.h"
 #include "ZdcIdentifier/ZdcID.h"
+#include "ZDC_ModuleBase.h"
 
 
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -22,8 +23,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelUtilities/GeoExtendedMaterial.h"
 #include "AthenaKernel/getMessageSvc.h"
-#include "src/ZDC_ModuleBase.h"
-#include <GeoModelKernel/GeoAlignableTransform.h>
+#include "GeoModelKernel/GeoAlignableTransform.h"
 
 // Author Chad Lantz
 // chad.stephen.lantz@cern.ch
@@ -56,7 +56,7 @@ ZDC_DetFactory::ZDC_DetFactory(StoreGateSvc *detStore) :
 
 ZDC_DetFactory::~ZDC_DetFactory() {}
 
-void ZDC_DetFactory::setTANSlot(uint iside, double width, double height, double depth, const GeoTrf::Transform3D trf, std::string name){
+void ZDC_DetFactory::setTANSlot(uint iside, double width, double height, double depth, const GeoTrf::Transform3D trf, const std::string& name){
     m_tanW.at(iside) = width;
     m_tanH.at(iside) = height;
     m_tanD.at(iside) = depth;
@@ -103,7 +103,6 @@ void ZDC_DetFactory::create(GeoPhysVol *world)
     /*************************************************
     * Place TAN/TAXN slots
     **************************************************/
-    Identifier id;
     for(int side : {0, 1}){
         int sideSign = (side == 0) ? -1 : 1;
         world->add(new GeoNameTag(m_tanSlotName.at(side)));
@@ -113,6 +112,7 @@ void ZDC_DetFactory::create(GeoPhysVol *world)
 
         m_detectorManager->addTreeTop(Envelope_Physical.at(side));
     }
+
 }
 
 void ZDC_DetFactory::buildMaterials(StoredMaterialManager *materialManager){

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h

@@ -34,12 +34,8 @@ public:
   virtual const ZDC_DetManager *getDetectorManager() const override;
   void buildMaterials(StoredMaterialManager *materialManager);
 
-  /*************************************************
-  * The scene of the crime. Still inlined because
-  * the function is just to push_back
-  **************************************************/
   inline void addModule(std::unique_ptr<ZDC_ModuleBase> module) { m_modules.push_back(std::move(module) ); }
-  void setTANSlot(uint iside, double width, double height, double depth, const GeoTrf::Transform3D trf, std::string name);
+  void setTANSlot(uint iside, double width, double height, double depth, const GeoTrf::Transform3D trf, const std::string& name);
   
 private:
 

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ZDC_DetTool.h"
 #include "ZDC_DetFactory.h" 
 #include "ZDC_ZDCModule.h" 
 #include "ZDC_RPDModule.h" 
-#include "ZDC_BRANModule.h" 
-#include "ZDC_DetManager.h" 
+#include "ZDC_BRANModule.h"
+#include "ZDC_DetManager.h"
 #include "ZdcConditions/ZdcGeometryDB.h" 
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "GaudiKernel/IService.h"

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_ModuleBase.h

@@ -33,10 +33,10 @@ class ZDC_ModuleBase{
     virtual void create(GeoFullPhysVol* mother, StoredMaterialManager *materialManager, const ZdcID *zdcID) = 0;
     inline void setTransform(const GeoTrf::Transform3D trf){m_trf = trf;}
     
-    inline int getSide() const {return m_side;}
-    inline int getModule() const {return m_module;}
-    inline std::string getName() const {return m_name;}
-    inline GeoTrf::Transform3D getTransform() const {return m_trf;}
+    inline const int& getSide() const {return m_side;}
+    inline const int& getModule() const {return m_module;}
+    inline const std::string& getName() const {return m_name;}
+    inline const GeoTrf::Transform3D& getTransform() const {return m_trf;}
 
   protected:
 

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_ZDCModule.cxx

@@ -30,7 +30,7 @@ ZDC_ZDCModule::ZDC_ZDCModule()
 {
 }
 
-ZDC_ZDCModule::ZDC_ZDCModule(std::string name, int side, int module, int modType)
+ZDC_ZDCModule::ZDC_ZDCModule(const std::string& name, int side, int module, int modType)
     : ZDC_ModuleBase(name, side, module),
       m_modType(modType)
 {

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_ZDCModule.h

@@ -10,7 +10,7 @@
 class ZDC_ZDCModule : public ZDC_ModuleBase{
   public:
     ZDC_ZDCModule();
-    ZDC_ZDCModule(std::string name, int side, int module, int modType);
+    ZDC_ZDCModule(const std::string& name, int side, int module, int modType);
     ZDC_ZDCModule(ZDC_ZDCModule *right, int side, int module);
 
     virtual ~ZDC_ZDCModule() = default;

ForwardDetectors/ZDC/ZdcConditions/CMakeLists.txt

@@ -11,6 +11,6 @@ atlas_add_library( ZdcConditions
                    src/*.cxx
                    PUBLIC_HEADERS ZdcConditions
                    LINK_LIBRARIES AthenaKernel Identifier ZdcIdentifier AsgMessagingLib nlohmann_json::nlohmann_json 
-                   PRIVATE_LINK_LIBRARIES GaudiKernel RDBAccessSvcLib StoreGateLib PathResolver)
+                   PRIVATE_LINK_LIBRARIES GaudiKernel RDBAccessSvcLib GeoModelInterfaces GeoModelUtilities GeoPrimitives GeometryDBSvcLib StoreGateLib PathResolver)
 
 atlas_install_data( data/* )

ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcGeometryDB.h

@@ -13,7 +13,7 @@ class IZdcGeometryDB
 {
 
 protected:
-  bool m_geoLoaded;
+  bool m_geoLoaded{};
   nlohmann::json m_mainJson;
 
 public:

ForwardDetectors/ZDC/ZdcConditions/src/ZdcGeometryDB.cxx

@@ -6,6 +6,8 @@
 #include "GaudiKernel/Bootstrap.h"
 #include "PathResolver/PathResolver.h"
 #include <GaudiKernel/ISvcLocator.h>
+#include "GeoModelInterfaces/IGeoModelSvc.h"
+#include "GeoModelUtilities/DecodeVersionKey.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBRecord.h"
@@ -84,10 +86,18 @@ bool ZdcGeoDBGeometryDB::loadGeoDB()
       ATH_MSG_FATAL("No RDBAccessSvc");
       throw std::runtime_error("No RDBAccessSvc found!");
     }
-  //DecodeVersionKey atlasVersion("ATLAS");
-  //const std::string& AtlasVersion = atlasVersion.tag();
-  IRDBRecordset_ptr tanParams = iAccessSvc->getRecordsetPtr("TanTaxn","TanTaxn-00");
-  IRDBRecordset_ptr zdcParams = iAccessSvc->getRecordsetPtr("ZdcPrd","ZdcPrd-00");
+
+  SmartIF<IGeoModelSvc> geoModel{Gaudi::svcLocator()->service ("GeoModelSvc")};
+  if (!geoModel)
+    {
+      ATH_MSG_FATAL("No GeoModelSvc");
+      throw std::runtime_error("No GeoModelSvc found!");
+    }
+  DecodeVersionKey versionKey(geoModel, "ForwardDetectors");
+
+  ATH_MSG_INFO("Loading ZDC geometry from tag: " << versionKey.tag() << " node: " << versionKey.node());
+  IRDBRecordset_ptr tanParams = iAccessSvc->getRecordsetPtr("TanTaxn",versionKey.tag(), versionKey.node());
+  IRDBRecordset_ptr zdcParams = iAccessSvc->getRecordsetPtr("ZdcPrd",versionKey.tag(), versionKey.node());
 
   IRDBRecordset::const_iterator AccessSvc_iter;
   for(AccessSvc_iter = tanParams->begin(); AccessSvc_iter != tanParams->end(); ++AccessSvc_iter)
@@ -115,8 +125,10 @@ bool ZdcGeoDBGeometryDB::loadGeoDB()
     {
       std::string name = (*AccessSvc_iter)->getString("NAME");
       std::string key = name;
-      if (key.substr(0,2)=="12" || key.substr(0,2)=="81")
+      if ( (key.find("RPD") == std::string::npos) &&
+	   (key.find("BRAN") == std::string::npos) )
 	key = "ZDC"+key;
+	
       int side = (*AccessSvc_iter)->getInt("SIDE");
       int mod = (*AccessSvc_iter)->getInt("MODUL");
       int type = -1;
@@ -135,7 +147,7 @@ bool ZdcGeoDBGeometryDB::loadGeoDB()
       m_mainJson["Detector"][key]["name"]=name;
       m_mainJson["Detector"][key]["module"]=mod;
       m_mainJson["Detector"][key]["side"]=side;
-      if (type>-1) m_mainJson["Detector"][key]["type"]=type; // RPD & BRAN have no "type"
+      if (type>-1) m_mainJson["Detector"][key]["type"]=type; // RPD & BRAN have no "type" in some versions of the GeoDB
       m_mainJson["Detector"][key]["x"]=x;
       m_mainJson["Detector"][key]["y"]=y;
       m_mainJson["Detector"][key]["z"]=z;
@@ -145,7 +157,7 @@ bool ZdcGeoDBGeometryDB::loadGeoDB()
       m_mainJson["Detector"][key]["k"]=k;
     }
 
-  ATH_MSG_INFO("Loaded ZDC DB from GeoDB");
+  ATH_MSG_INFO("Loaded ZDC DB from GeoDB" << versionKey.tag());
   return true;
 }
 

ForwardDetectors/ZDC/ZdcRec/python/ZdcRecConfig.py

@@ -19,9 +19,39 @@ from ZdcNtuple.ZdcNtupleConfig import ZdcNtupleCfg
 from TrigConfigSvc.TriggerConfigAccess import getL1MenuAccess
 # added getRun3NavigationContainerFromInput as per Tim Martin's suggestions
 from TrigDecisionTool.TrigDecisionToolConfig import TrigDecisionToolCfg, getRun3NavigationContainerFromInput
+from AthenaConfiguration.TestDefaults import defaultGeometryTags
 
 zdcConfigMap = {}
 
+defaultGeometryZdcRun2 = "ATLAS-R2-2016-01-03-00"
+defaultGeometryZdc2023 = "ATLAS-R3S-2021-03-03-00"
+defaultGeometryZdc2024 = "ATLAS-R3S-2021-03-04-00"
+
+def zdcGeometry(flags):
+    projName = flags.Input.ProjectName
+    match projName:
+        case "data15_hi":
+            return defaultGeometryZdcRun2
+        case "data18_hi":
+            return defaultGeometryZdcRun2
+        case "data16_hi":
+            return defaultGeometryZdcRun2
+        case "data16_hip":
+            return defaultGeometryZdcRun2
+        case "data23_hi":
+            return defaultGeometryZdc2023
+        case "data24_hi":
+            return defaultGeometryZdc2024
+        case "data24_hicomm":
+            return defaultGeometryZdc2024
+        case _:
+            run = flags.GeoModel.Run
+            if (run == LHCPeriod.RUN2):
+                return defaultGeometryTags.RUN2
+            if (run == LHCPeriod.RUN3):
+                return defaultGeometryTags.RUN3
+            return ""
+        
 def GenerateConfigTagDict():
 
     zdcConfigMap['data15_hi'] = {}
@@ -466,7 +496,6 @@ if __name__ == '__main__':
     """ This is selftest & ZDC calibration transform at the same time"""
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    from AthenaConfiguration.TestDefaults import defaultGeometryTags
 
     flags = initConfigFlags()
 
@@ -535,7 +564,6 @@ if __name__ == '__main__':
     if (isInj or isLED or isInj or pn == 'data_test'):
         flags.Trigger.EDMVersion=3
         flags.GeoModel.Run = LHCPeriod.Run3
-        flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
     else:
         year = int(pn.split('_')[0].split('data')[1])
         if (year < 20):
@@ -544,7 +572,6 @@ if __name__ == '__main__':
         elif (year > 20):
             flags.Trigger.EDMVersion=3
             flags.GeoModel.Run = LHCPeriod.Run3
-            flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
 
     if (flags.Input.isMC):
         print('ZdcRecConfig: Overriding MC run to be Run 3!')
@@ -559,6 +586,8 @@ if __name__ == '__main__':
         flags.DQ.useTrigger = False
         flags.DQ.triggerDataAvailable = False 
 
+    flags.GeoModel.AtlasVersion=zdcGeometry(flags)
+
     flags.lock()
     # flags.dump(evaluate=True) # uncomment this line if needed for testing
 

LArCalorimeter/LArBadChannelTool/share/LArBuildBadChannelDB.sh

@@ -402,6 +402,6 @@ then
     echo "$outputSqliteOnl: Containing UPD1 version of bad-channel list for ONLINE DB."
     echo "Upload to ONLINE oracle server using"
     echo "export COOL_FLASK=https://cool-proxy-app.cern.ch"
-    echo "/afs/cern.ch/user/a/atlcond/utilsproxy/AtlCoolMerge.py --online BadChannels.db CONDBR2 ATONR_COOL ATLAS_COOLONL_LAR_W <password>"
+    echo "/afs/cern.ch/user/a/atlcond/utilsproxy/AtlCoolMerge.py --online BadChannelsOnl.db CONDBR2 ATONR_COOL ATLAS_COOLONL_LAR_W <password>"
 fi 
 

LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h

@@ -31,6 +31,8 @@ class LArDigits2Ntuple : public LArCond2NtupleBase
   Gaudi::Property< unsigned int >  m_Nsamples{this, "NSamples", 32, "number of samples to store"};
   Gaudi::Property< std::vector<unsigned int> > m_FTlist{this, "FTlist", {}, "which FT to dump"};
   Gaudi::Property< std::vector<unsigned int> > m_Slotlist{this, "Slotlist", {}, "which Slot to dump"};
+  Gaudi::Property< std::vector<unsigned int> > m_Sidelist{this, "Sidelist", {}, "which side to dump"};
+  Gaudi::Property< std::vector<unsigned int> > m_BElist{this, "BElist", {}, "which B or E to dump"};
   Gaudi::Property< bool > m_fillEMB{this, "FillEMB", true, "if to fill EMB"};
   Gaudi::Property< bool > m_fillEndcap{this, "FillEndcap", true, "if to fill Eendcap"};
   Gaudi::Property< bool > m_fillBCID{this, "FillBCID", false, "if to fill BCID"};
@@ -56,9 +58,9 @@ class LArDigits2Ntuple : public LArCond2NtupleBase
   NTuple::Item<unsigned long long> m_IEventEvt;
   NTuple::Item<short> m_LB;
 
-  SG::ReadHandleKey<LArDigitContainer> m_contKey{this, "ContainerKey", "FREE", "key for LArDigitContainer"};
-  SG::ReadHandleKey<LArAccumulatedCalibDigitContainer> m_accCalibContKey{this, "AccCalibContainerKey", "HIGH", "key for LArAccumulatedCalibDigitDigitContainer"};
-  SG::ReadHandleKey<LArAccumulatedDigitContainer> m_accContKey{this, "AccContainerKey", "HIGH", "key for LArAccumulatedDigitDigitContainer"};
+  SG::ReadHandleKey<LArDigitContainer> m_contKey{this, "ContainerKey", "", "key for LArDigitContainer"};
+  SG::ReadHandleKey<LArAccumulatedCalibDigitContainer> m_accCalibContKey{this, "AccCalibContainerKey", "", "key for LArAccumulatedCalibDigitDigitContainer"};
+  SG::ReadHandleKey<LArAccumulatedDigitContainer> m_accContKey{this, "AccContainerKey", "", "key for LArAccumulatedDigitDigitContainer"};
   SG::ReadHandleKey<LArFebHeaderContainer> m_LArFebHeaderContainerKey { this, "LArFebHeaderKey", "LArFebHeader" };
 };