Calorimeter/CaloTools/python/CaloNoiseCondAlgConfig.py

@@ -9,7 +9,7 @@ from AthenaConfiguration.AccumulatorCache import AccumulatorCache
 
 @AccumulatorCache
 def CaloNoiseCondAlgCfg(flags, noisetype="totalNoise"):
-    if noisetype not in ("electronicNoise","pileupNoise","totalNoise"):
+    if noisetype not in ("electronicNoise","pileupNoise","totalNoise","electronicNoiseNoHV"):
         raise RuntimeError("Requested noise of unknown type %s" % noisetype)
 
     noiseAlgName="Calo_"+noisetype+"Alg"
@@ -109,12 +109,14 @@ def CaloNoiseCondAlgCfg(flags, noisetype="totalNoise"):
             result.merge(addFolders(flags,"/TILE/OFL02/NOISE/CELL","TILE_OFL",className="CondAttrListCollection"))
 
 
-            if flags.LAr.doHVCorr:
-                log.info("Run2 & doLArHVCorr=True: Will rescale noise automatically for HV trips")
+            if flags.LAr.doHVCorr and noisetype != "electronicNoiseNoHV":
+                log.info("Run 2/3 & doLArHVCorr=True: Will rescale noise automatically for HV trips")
                 theCaloNoiseAlg.useHVCorr=True
                 from LArCalibUtils.LArHVScaleConfig import LArHVScaleCfg
                 result.merge(LArHVScaleCfg(flags))
                 pass
+            else:
+                theCaloNoiseAlg.useHVCorr=False        
             pass
         else: #COMP200 case:
             log.info("Configuring CaloNoiseCondAlg for Run1 real data processing")

Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx

@@ -33,24 +33,29 @@ StatusCode CaloNoiseCondAlg::initialize() {
     ATH_MSG_INFO("Will compute electronic noise");
     m_noiseType=CaloNoise::ELEC;
   }
-  else if (noiseKey=="pileupNoise") {
+  else if (noiseKey == "electronicNoiseNoHV") {
+    ATH_MSG_INFO("Will compute electronic noise without HV corrections");
+    m_noiseType = CaloNoise::ELEC;
+    if (m_useHVCorr) {
+        ATH_MSG_WARNING("Inconsistent configuration, set useHVCorr=False");
+        m_useHVCorr=false;
+    }
+  } 
+  else if (noiseKey == "pileupNoise") {
     ATH_MSG_INFO("Will compute pileup noise");
     m_noiseType=CaloNoise::PILEUP;
     if (m_useHVCorr) {
       ATH_MSG_INFO("Disabling HV correction, only pile-up noise");
     }
     m_useHVCorr=false;
-  }
-  else if (noiseKey=="totalNoise") {
+  } else if (noiseKey == "totalNoise") {
     m_noiseType=CaloNoise::TOTAL;
     ATH_MSG_INFO("Will compute total (electronic + pileup)  noise");
-  }
-  else {
+  } else {
     ATH_MSG_ERROR("Unexpected noise key given: " <<  noiseKey << ". Expeced 'electronicNoise' or 'pileupNoise' or 'totalNoise'.");
     return StatusCode::FAILURE;
   }
 
-
   ATH_CHECK( m_hvCorrKey.initialize(m_useHVCorr) );
 
   const bool doLumiFolderInit = m_lumi0 < 0 && m_noiseType!=CaloNoise::ELEC;

Control/AthenaConfiguration/python/TestDefaults.py

-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 # Files for use in configuration unit tests
 
 # These samples can be access via shell script through commands such as:
@@ -11,7 +11,11 @@ class defaultTestFiles:
     EVNT = [f"{d}/CampaignInputs/mc23/EVNT/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8514/EVNT.32288062._002040.pool.root.1"]
 
     HITS_RUN2 = [f"{d}/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"] #MC20
-    HITS_RUN3 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8514_s4162/100events.HITS.pool.root"] #MC23a
+    HITS_RUN3_2022 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8514_s4162/100events.HITS.pool.root"] #MC23a
+    HITS_RUN3_2023 = [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.merge.HITS.e8514_e8528_s4159/100events.HITS.pool.root"] #MC23d
+    HITS_RUN3_2024 = HITS_RUN3_2022 # Temporary back-compatibility [f"{d}/CampaignInputs/mc23/HITS/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.merge.HITS.e8514_e8528_s4369/100events.HITS.pool.root"] #MC23e
+    HITS_RUN3_HI = HITS_RUN3_2022 # Temporary back-compatibility
+    HITS_RUN3 = HITS_RUN3_2022 # Temporary back-compatibility
     HITS_RUN4 = [f"{d}/PhaseIIUpgrade/HITS/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8481_s4149/HITS.33605501._000106.pool.root.1"]
     HITS_RUN2_MINBIAS_HIGH = [
         f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000149.pool.root.1",
@@ -43,7 +47,10 @@ class defaultTestFiles:
     RDO_RUN3 = [f"{d}/CampaignInputs/mc23/RDO/mc23_13p6TeV.801451.Py8EG_A3_NNPDF23LO_minbias_ND.recon.RDO.e8486_e8528_s4232_s4114_r15112/300events_RDO.39752217._004082.pool.root.1"] #low-mu minbias sample
     RDO_RUN4 = [f"{d}/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1"]
     RDO_BKG_RUN2 = [f"{d}/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"]
-    RDO_BKG_RUN3 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4112_d1865_d1858/100events.RDO.pool.root"]
+    RDO_BKG_RUN3_2022 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4112_d1865_d1858/100events.RDO.pool.root"] #mc23a
+    RDO_BKG_RUN3_2023 = [f"{d}/CampaignInputs/mc23/RDO_BKG/mc23_13p6TeV.900149.PG_single_nu_Pt50.merge.RDO.e8514_e8528_s4153_d1907_d1908/100events.RDO.pool.root"] #mc23d
+    RDO_BKG_RUN3_2024 = RDO_BKG_RUN3_2022 # Temporary Back-compatibility
+    RDO_BKG_RUN3 = RDO_BKG_RUN3_2022 # Temporary Back-compatibility
     RDO_BKG_RUN4 = [f"{d}/PhaseIIUpgrade/RDO_BKG/ATLAS-P2-RUN4-03-00-00/RUN4_presampling.mu200.withSuperCell.50events.RDO.pool.root"]
 
     ESD_RUN2_MC = [f"{d}/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"] # MC16 TODO Update to MC20

Control/AthenaServices/src/AthenaOutputStream.h

 // Dear emacs, this is -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHENASERVICES_ATHENAOUTPUTSTREAM_H
@@ -92,6 +92,9 @@ protected:
    StringArrayProperty      m_metadataItemList{this,"MetadataItemList",{},"List of metadata items to write","OutputStreamItemList"};
    /// Vector of item names
    StringArrayProperty      m_excludeList{this,"ExcludeList",{},"List of metadata items to write","OrderedSet<std::string>"};
+
+   StringProperty           m_keepProvenances { this, "KeepProvenanceTagsRegEx", {".*"},
+                              "RegEx pattern to select processing tags for which DataHeader should retain provenances"};
    /// Vector of item names
    StringArrayProperty      m_compressionListHigh;
    /// Vector of item names

Control/AthenaServices/src/AthenaOutputStreamTool.cxx

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file AthenaOutputStreamTool.cxx
@@ -26,6 +26,7 @@
 #include "PersistentDataModel/DataHeader.h"
 #include "PersistentDataModel/TokenAddress.h"
 
+
 namespace {
 
 /// Check to see if a DataHeader has been marked as input
@@ -157,6 +158,16 @@ StatusCode AthenaOutputStreamTool::connectServices(const std::string& dataStore,
       }
    }
    m_extendProvenanceRecord = extendProvenenceRecord;
+   auto pprop = dynamic_cast<const IProperty*>(parent());
+   if (not pprop){
+     ATH_MSG_ERROR("'parent' could not be cast to IProperty");
+     return(StatusCode::FAILURE);
+   }
+   auto keep = dynamic_cast<const StringProperty&>( pprop->getProperty("KeepProvenanceTagsRegEx") );
+   m_keepProvenancesStr = keep.value();
+   // create RegEx pattern from the property value, specify extended grammar
+   m_keepProvenancesRE = std::regex(m_keepProvenancesStr, std::regex::extended);
+
    return(connectServices());
 }
 //__________________________________________________________________________
@@ -224,45 +235,8 @@ StatusCode AthenaOutputStreamTool::connectOutput(const std::string& outputName)
       if (m_store->retrieve(dh, dhKey).isFailure()) {
          ATH_MSG_DEBUG("Unable to retrieve the DataHeader with key " << dhKey);
       }
-      SG::DataProxy* dhProxy = m_store->proxy(dh);
-      if (dh->isInput() || hasInputAlias (*dhProxy) || primaryDH) {
-         // Add DataHeader token to new DataHeader
-         if (m_extendProvenanceRecord) {
-            std::string pTag;
-            SG::TransientAddress* dhTransAddr = 0;
-            for (const DataHeaderElement& dhe : *dh) {
-               if (dhe.getPrimaryClassID() == ClassID_traits<DataHeader>::ID()) {
-                  pTag = dhe.getKey();
-                  delete dhTransAddr; dhTransAddr = dhe.getAddress(0);
-               }
-            }
-            // Update dhTransAddr to handle fast merged files.
-            if (dhProxy != 0 && dhProxy->address() != 0) {
-              delete dhTransAddr; dhTransAddr = 0;
-              m_dataHeader->insertProvenance(DataHeaderElement(dhProxy,
-                                                               dhProxy->address(),
-                                                               pTag));
-            }
-            else if (dhTransAddr != nullptr) {
-              m_dataHeader->insertProvenance(DataHeaderElement(dhTransAddr,
-                                                               dhTransAddr->address(),
-                                                               pTag));
-              delete dhTransAddr; dhTransAddr = 0;
-            }
-         }
-         // Each stream tag is written only once in the provenance record
-         // In files where there are multiple entries per stream tag
-         // the record is in reverse, i.e., the latest appears first.
-         // Therefore, only keep the first entry if there are multiple
-         // matches so that we retain the latest one.
-         std::set<std::string> insertedTags{};
-         for(auto iter=dh->beginProvenance(), iEnd=dh->endProvenance(); iter != iEnd; ++iter) {
-            const auto & currentKey = (*iter).getKey();
-            if(!insertedTags.contains(currentKey)) {
-               insertedTags.insert(currentKey);
-               m_dataHeader->insertProvenance(*iter);
-            }
-         }
+      if (dh->isInput() || hasInputAlias(*m_store->proxy(dh)) || primaryDH) {
+         propagateProvenance( *dh );
       }
    }
 
@@ -331,6 +305,62 @@ StatusCode AthenaOutputStreamTool::connectOutput(const std::string& outputName)
    m_connectionOpen = true;
    return(StatusCode::SUCCESS);
 }
+
+//__________________________________________________________________________
+void AthenaOutputStreamTool::propagateProvenance( const DataHeader& src_dh )
+{
+   // keep track of provenance entries inserted into the new DataHeader
+   std::set<std::string> insertedTags{};
+   // Add DataHeader token to the new DataHeader
+   if (m_extendProvenanceRecord) {
+      std::string pTag;
+      std::unique_ptr<SG::TransientAddress> dhTransAddr;
+      for (const DataHeaderElement& dhe : src_dh) {
+         if (dhe.getPrimaryClassID() == ClassID_traits<DataHeader>::ID()) {
+            pTag = dhe.getKey();
+            dhTransAddr.reset( dhe.getAddress(0) );
+         }
+      }
+      // Update dhTransAddr to handle fast merged files.
+      if( auto dhProxy=m_store->proxy(&src_dh); dhProxy && dhProxy->address() ) {
+         DataHeaderElement dhe(dhProxy, dhProxy->address(), pTag);
+         m_dataHeader->insertProvenance(dhe);
+         insertedTags.insert(pTag);
+      }
+      else if( dhTransAddr ) {
+         DataHeaderElement dhe(dhTransAddr.get(), dhTransAddr->address(), pTag);
+         m_dataHeader->insertProvenance(dhe);
+         insertedTags.insert(pTag);
+      }
+   }
+
+   // empty regexpr means do not keep any provenance
+   if( !m_keepProvenancesStr.empty() ) {
+      // Each stream tag is written only once in the provenance record
+      // In files where there are multiple entries per stream tag
+      // the record is in reverse, i.e., the latest appears first.
+      // Therefore, only keep the first entry if there are multiple
+      // matches so that we retain the latest one.
+      for(auto iter=src_dh.beginProvenance(), iEnd=src_dh.endProvenance(); iter != iEnd; ++iter) {
+         const auto & currentKey = (*iter).getKey();
+         if( insertedTags.insert(currentKey).second ) {
+            // first prov with that tag. Now check if we want to keep that tag
+            bool keep = false;
+            auto it =  m_keepProvenanceMatch.find( currentKey );
+            if( it != m_keepProvenanceMatch.end() ) {
+               keep = it->second;
+            } else {
+               keep = std::regex_search(currentKey, m_keepProvenancesRE);
+               m_keepProvenanceMatch[currentKey] = keep;
+            }
+            if( keep ) {
+               m_dataHeader->insertProvenance(*iter);
+            }
+         }
+      }
+   }
+}
+   
 //__________________________________________________________________________
 StatusCode AthenaOutputStreamTool::commitOutput(bool doCommit) {
    ATH_MSG_DEBUG("In commitOutput");

Control/AthenaServices/src/AthenaOutputStreamTool.h

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHENAOUTPUTSTREAMTOOL_H
@@ -15,6 +15,8 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 
 #include <string>
+#include <map>
+#include <regex>
 
 class IClassIDSvc;
 class IDecisionSvc;
@@ -81,6 +83,8 @@ public:
 private:
    /// Do the real connection to services
    virtual StatusCode connectServices();
+   /// copy provenance records when creating new DataHeaders
+   void propagateProvenance( const DataHeader& src_dh );
 
 private:
    StringProperty  m_outputName{ this, "OutputFile", "", "name of the output db name"};
@@ -106,12 +110,20 @@ private:
    /// Ref to DecisionSvc
    ServiceHandle<IDecisionSvc>   m_decSvc;
    /// Current DataHeader for streamed objects
-   DataHeader*     m_dataHeader;
+   DataHeader*          m_dataHeader;
    /// Flag to tell whether connectOutput has been called
-   bool            m_connectionOpen;
+   bool                 m_connectionOpen;
+
    /// Flag as to whether to extend provenance via the DataHeader
-   bool            m_extendProvenanceRecord;
-   /// Flag to extend attribute list with stream flags from DecisionSvc
+   bool                 m_extendProvenanceRecord;
+   /// RegEx string to match provenance tags to keep in the output DataHeader. Retrieved from an OutputStream property
+   std::string          m_keepProvenancesStr;
+   /// RegEx pattern created from m_keepProvenancesStr
+   std::regex           m_keepProvenancesRE;
+   /// Cache provenance RegEx matching result in a map
+   std::map<std::string, bool>  m_keepProvenanceMatch;
+
+   /// Flag to extend attribute list with stream flags from DecisionSvc 
    bool m_extend;
    
    /// set of skipped item keys, because of missing CLID

Control/CxxUtils/share/checkergcc-base.config

@@ -64,3 +64,37 @@ Service::finalize
 AlgTool::finalize
 MinimalEventLoopMgr::initialize
 MinimalEventLoopMgr::finalize
+
+
+[naming.check_paths]
+# Paths under which to check naming conventions.
+AtlasGeometryCommon
+AtlasTest
+Calorimeter
+Commission
+Control
+Database
+DataQuality
+DetectorDescription
+Event
+External/CheckerGccPlugins
+ForwardDetectors
+Generators
+graphics
+HighGranularityTimingDetector
+HLT
+InnerDetector
+LArCalorimeter
+LumiBlock
+MagneticField
+MuonSpectrometer
+PhysicsAnalysis
+Reconstruction
+Simulation
+TestBeam
+TileCalorimeter
+Tools
+Tracking
+Trigger
+# Don't trigger on MagneticField component of acts.
+-acts/Core/src/MagneticField

Control/Hephaestus/src/MemoryTracker.c

@@ -124,7 +124,9 @@ static void hhh_NameSet_Add( struct hhh_NameSet *nameset, const char *name ) {
 
    unsigned int len = strlen( name );
    name_cp = (char*)malloc( len + 1 );
-   strcpy( name_cp, name );
+   if (name_cp){
+     strcpy( name_cp, name );
+   }
    nameset->lens[ nameset->size ] = len;
    nameset->names[ nameset->size++ ] = name_cp;
 }
@@ -191,6 +193,7 @@ static void hhh_report( void ) {
 
    /* report actual leaks with traceback only once */
       uniq = (struct hhh_LeakSummary*)malloc( sizeof(struct hhh_LeakSummary) * gTraceInfo->nentries );
+      if (!uniq) return;
       iuniq = 0;
       for ( i = 0; i < gTraceInfo->size; i++ ) {
          cell = gTraceInfo->table[i];
@@ -234,8 +237,10 @@ static void hhh_report( void ) {
          ignore = 0;
          if ( pos ) {
            sub = (char*)malloc( pos-first + 1 );
-            strncpy( sub, first, pos-first );
-            sub[ pos-first ] = '\0';
+            if (sub){
+              strncpy( sub, first, pos-first );
+              sub[ pos-first ] = '\0';
+            }
          } else {
             sub = (char*)first;
          }
@@ -1040,8 +1045,9 @@ static PyObject* hep_symbname( PyObject* unused, PyObject* args ) {
       free( gSymbolFileName );
 
    gSymbolFileName = (char*)malloc( strlen( name )+1 );
-   strcpy( gSymbolFileName, name );
-
+   if (gSymbolFileName){
+     strcpy( gSymbolFileName, name );
+   }
    Py_INCREF( Py_None );
    return Py_None;
 }

Control/StoreGate/StoreGate/ReadCondHandle.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_READCONDHANDLE_H
@@ -53,6 +53,10 @@ namespace SG {
     ReadCondHandle(const SG::ReadCondHandleKey<T>& key);
     ReadCondHandle(const SG::ReadCondHandleKey<T>& key, 
                    const EventContext& ctx);
+
+    ReadCondHandle(SG::ReadCondHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    ReadCondHandle(SG::ReadCondHandleKey<T>&& key, 
+                   const EventContext& ctx) = delete; // Not allowed from a temporary.
     
     ~ReadCondHandle() {};
     

Control/StoreGate/StoreGate/ReadDecorHandle.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file StoreGate/ReadDecorHandle.h
@@ -133,7 +133,13 @@ public:
   explicit ReadDecorHandle (const ReadDecorHandleKey<T>& key,
                             const EventContext& ctx);
 
-  
+
+  // Disallow initialization from a temporary Key object.
+  explicit ReadDecorHandle (SG::ReadDecorHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ReadDecorHandle (SG::ReadDecorHandleKey<T>&& key, 
+                            const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */

Control/StoreGate/StoreGate/ReadHandle.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: ReadHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
 /**
  * @file StoreGate/ReadHandle.h
  * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov>
@@ -89,7 +86,7 @@ public:
 
 
   /**
-   * @brief Constructor with full arguments.
+   * @brief Constructor specifying the key as a string.
    * @param sgkey StoreGate key of the referenced object.
    * @param storename Name of the referenced event store.
    */
@@ -97,6 +94,26 @@ public:
                       const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
 
 
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param ctx The event context.
+   */
+  explicit ReadHandle(const std::string& sgkey,
+                      const EventContext& ctx);
+
+
+  /**
+   * @brief Constructor specifying the key as a string, with context.
+   * @param sgkey StoreGate key of the referenced object.
+   * @param storename Name of the referenced event store.
+   * @param ctx The event context.
+   */
+  explicit ReadHandle(const std::string& sgkey,
+                      const std::string& storename,
+                      const EventContext& ctx);
+
+
   /**
    * @brief Constructor from a ReadHandleKey.
    * @param key The key object holding the clid/key/store.
@@ -131,6 +148,12 @@ public:
   explicit ReadHandle (SG::DataProxy* proxy);
 
 
+  // Disallow initialization from a temporary Key object.
+  explicit ReadHandle (SG::ReadHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ReadHandle (SG::ReadHandleKey<T>&& key, 
+                       const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Copy constructor.
    */

Control/StoreGate/StoreGate/ReadHandle.icc

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ReadHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -41,7 +41,7 @@ ReadHandle<T>::ReadHandle()
 
 
 /**
- * @brief Constructor with full arguments.
+ * @brief Constructor specifying the key as a string.
  * @param sgkey StoreGate key of the referenced object.
  * @param storename Name of the referenced event store.
  */
@@ -50,7 +50,38 @@ inline
 ReadHandle<T>::ReadHandle(const std::string& sgkey, 
                           const std::string& storename /*= "StoreGateSvc"*/)
   : VarHandleBase( ClassID_traits<T>::ID(),
-                   sgkey, Gaudi::DataHandle::Reader, storename )
+                   sgkey, Gaudi::DataHandle::Reader, storename, nullptr )
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+ReadHandle<T>::ReadHandle(const std::string& sgkey,
+                          const EventContext& ctx)
+  : ReadHandle(sgkey, StoreID::storeName(StoreID::EVENT_STORE), ctx)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param storename Name of the referenced event store.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+ReadHandle<T>::ReadHandle(const std::string& sgkey,
+                          const std::string& storename,
+                          const EventContext& ctx)
+  : VarHandleBase( ClassID_traits<T>::ID(),
+                   sgkey, Gaudi::DataHandle::Reader, storename, &ctx )
 {
 }
 

Control/StoreGate/StoreGate/ReadMetaHandle.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_READMETAHANDLE_H
@@ -37,6 +37,10 @@ namespace SG {
     ReadMetaHandle(const SG::ReadMetaHandleKey<T>& key
 		   , const EventContext& ctx);
     
+    ReadMetaHandle(SG::ReadMetaHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    ReadMetaHandle(SG::ReadMetaHandleKey<T>&& key, 
+                   const EventContext& ctx) = delete; // Not allowed from a temporary.
+
     ~ReadMetaHandle() {};
     
     const_pointer_type retrieve();

Control/StoreGate/StoreGate/ThinningHandle.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/ThinningHandle.h
@@ -116,6 +116,11 @@ public:
       ThinningHandleBase (key.decisionHandleKey(), key.key(), ctx)
   {
   }
+
+  // Disallow initialization from a temporary Key object.
+  explicit ThinningHandle (SG::ThinningHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+  explicit ThinningHandle (SG::ThinningHandleKey<T>&& key, 
+                           const EventContext& ctx) = delete; // Not allowed from a temporary.
 };
 
 

Control/StoreGate/StoreGate/TypelessWriteHandle.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
- * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration.
  */
 /**
  * @file StoreGate/TypelessWriteHandle.h
@@ -49,6 +49,10 @@ public:
                                 const EventContext& ctx);
 
   
+  // Disallow initialization from a temporary Key object.
+  explicit TypelessWriteHandle (SG::TypelessWriteHandleKey&& key) = delete; // Not allowed from a temporary.
+
+
   /**
    * @brief Can the handle be successfully dereferenced?
    *

Control/StoreGate/StoreGate/UpdateHandle.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: UpdateHandle.h 797637 2017-02-17 02:32:11Z ssnyder $
 /**
  * @file StoreGate/UpdateHandle.h
  * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov>
@@ -120,7 +117,7 @@ namespace SG {
 
 
     /**
-     * @brief Constructor with full arguments.
+     * @brief Constructor specifying the key as a string.
      * @param sgkey StoreGate key of the referenced object.
      * @param storename Name of the referenced event store.
      */
@@ -128,6 +125,26 @@ namespace SG {
                  const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
 
 
+    /**
+     * @brief Constructor specifying the key as a string, with context.
+     * @param sgkey StoreGate key of the referenced object.
+     * @param ctx The event context.
+     */
+    explicit UpdateHandle(const std::string& sgkey,
+                          const EventContext& ctx);
+
+
+    /**
+     * @brief Constructor specifying the key as a string, with context.
+     * @param sgkey StoreGate key of the referenced object.
+     * @param storename Name of the referenced event store.
+     * @param ctx The event context.
+     */
+    explicit UpdateHandle(const std::string& sgkey,
+                          const std::string& storename,
+                          const EventContext& ctx);
+
+
     /**
      * @brief Constructor from an UpdateHandleKey.
      * @param key The key object holding the clid/key/store.
@@ -152,6 +169,12 @@ namespace SG {
     explicit UpdateHandle (const UpdateHandleKey<T>& key,const EventContext& ctx);
 
 
+    // Disallow initialization from a temporary Key object.
+    explicit UpdateHandle (SG::UpdateHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    explicit UpdateHandle (SG::UpdateHandleKey<T>&& key, 
+                           const EventContext& ctx) = delete; // Not allowed from a temporary.
+
+
     /**
      * @brief Copy constructor.
      */

Control/StoreGate/StoreGate/UpdateHandle.icc

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: UpdateHandle.icc 797637 2017-02-17 02:32:11Z ssnyder $
@@ -36,7 +36,7 @@ UpdateHandle<T>::UpdateHandle()
 
 
 /**
- * @brief Constructor with full arguments.
+ * @brief Constructor specifying the key as a string.
  * @param sgkey StoreGate key of the referenced object.
  * @param storename Name of the referenced event store.
  */
@@ -45,7 +45,38 @@ inline
 UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
                               const std::string& storename /*= "StoreGateSvc"*/)
   : VarHandleBase( ClassID_traits<T>::ID(),
-                   sgkey, Gaudi::DataHandle::Reader, storename )
+                   sgkey, Gaudi::DataHandle::Reader, storename, nullptr )
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
+                              const EventContext& ctx)
+  : UpdateHandle(sgkey, StoreID::storeName(StoreID::EVENT_STORE), ctx)
+{
+}
+
+
+/**
+ * @brief Constructor specifying the key as a string, with context.
+ * @param sgkey StoreGate key of the referenced object.
+ * @param storename Name of the referenced event store.
+ * @param ctx The event context.
+ */
+template <class T>
+inline
+UpdateHandle<T>::UpdateHandle(const std::string& sgkey,
+                              const std::string& storename,
+                              const EventContext& ctx)
+  : VarHandleBase( ClassID_traits<T>::ID(),
+                   sgkey, Gaudi::DataHandle::Reader, storename, &ctx )
 {
 }
 

Control/StoreGate/StoreGate/VarHandleBase.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file StoreGate/VarHandleBase.h
@@ -102,11 +102,13 @@ namespace SG {
      * @param sgkey StoreGate key of the referenced object.
      * @param mode Mode of this handle (read/write/update).
      * @param storename Name of the referenced event store.
+     * @param ctx The event context to use, or nullptr.
      */
     explicit VarHandleBase(CLID clid,
                            const std::string& sgkey,
                            Gaudi::DataHandle::Mode mode,
-                           const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
+                           const std::string& storename,
+                           const EventContext* ctx);
 
 
     /**

Control/StoreGate/StoreGate/VarHandleBase.icc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file StoreGate/VarHandleBase.icc
  * @author scott snyder <snyder@bnl.gov>

Control/StoreGate/StoreGate/WriteCondHandle.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef STOREGATE_WRITECONDHANDLE_H
@@ -35,6 +35,10 @@ namespace SG {
     WriteCondHandle(const WriteCondHandleKey<T>& key);
     WriteCondHandle(const WriteCondHandleKey<T>& key, const EventContext& ctx);
     
+    WriteCondHandle(SG::WriteCondHandleKey<T>&& key) = delete; // Not allowed from a temporary.
+    WriteCondHandle(SG::WriteCondHandleKey<T>&& key, 
+                    const EventContext& ctx) = delete; // Not allowed from a temporary.
+
     ~WriteCondHandle() {};   
 
     const std::string& key() const { return m_hkey.key(); }