Compare revisions

56725b9a · 56725b9a · 56725b9a · 56725b9a · 56725b9a · 56725b9a
--- a/AtlasTest/TestTools/src/initGaudi.cxx
+++ b/AtlasTest/TestTools/src/initGaudi.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
 */

 /***************************************************************************
@@ -95,6 +95,20 @@ namespace Athena_test {
  {
    ModuleLoadedIncident inc2 ("", "");
  }
-}


+  InitGaudi::InitGaudi(const std::string& jobOptsFile) {
+    ISvcLocator* pSvcLoc{};
+    if (!Athena_test::initGaudi(jobOptsFile, pSvcLoc)) {
+      throw std::runtime_error("Cannot initialize Gaudi");
+      }
+    svcLoc = pSvcLoc;
+  }
+
+  InitGaudi::~InitGaudi() {
+    auto appMgr = svcLoc.as<IAppMgrUI>();
+    appMgr->finalize().ignore();
+    appMgr->terminate().ignore();
+  }
+
+}
--- a/Build/AtlasBuildScripts/prepare_release_notes.py
+++ b/Build/AtlasBuildScripts/prepare_release_notes.py
@@ -29,14 +29,15 @@ try:
 except ImportError:
    gitlab_available = False

+repo = 'atlas/athena'  # change this for testing

 def main():
    parser = argparse.ArgumentParser(description=__doc__,
                                     formatter_class=argparse.RawDescriptionHelpFormatter)
    parser.add_argument('-p', '--previous',
                        help='previous release wrt. which we diff')
-    parser.add_argument('-o', '--output', default='release_notes.md',
-                        help='where the notes are written')
+    parser.add_argument('-o', '--output', nargs='?', metavar='FILE', const='release_notes.md',
+                        help='write release notes to file [%(const)s]')
    parser.add_argument('-r', '--relaxed', action='store_true',
                        help='do not stop on dubious configurations')
    parser.add_argument('-s', '--sweep', action='store_true',
@@ -87,18 +88,18 @@ def main():
        print('Are you running this script from within the athena/ directory?')
        exit(1)
    # If possible, use Gitlab
+    gl = None
    gl_project = None
    if args.token and gitlab_available:
-        print('Trying to connect to gitlab using the supplied token')
+        if verbose: print('Trying to connect to gitlab using the supplied token')
        gl = gitlab.Gitlab("https://gitlab.cern.ch", args.token)
        # Check that the token is valid before we get further
        try:
            gl.auth()
-            print('Authentication to gitlab was successful')
        except Exception as err:
            print(f"Authentication failed. {err=}, {type(err)=}")
            exit(1)
-        gl_project = gl.projects.get("atlas/athena")
+        gl_project = gl.projects.get(repo)

    print('Retrieving the list of MRs (run with --verbose to get more output while this is happening).')
    merged_mrs = parse_mrs_from_log(output_log['stdout'].decode("utf-8"),
@@ -116,7 +117,7 @@ def main():
        optional_message = input(': ')
        if ticket:
            optional_message = optional_message + '\nRelease request ticket: '+ticket
-    print('About to fill release note template.')
+
    release_notes = fill_template(sweep_template() if args.sweep else default_template(),
                                  target_release, nightly_tag, optional_message, previous_release,
                                  merged_mrs, output_filename=args.output, verbose=verbose,
@@ -133,7 +134,7 @@ def main():
            except Exception as err:
                print(f"Failed to create tag or release. {err=}, {type(err)=}")
                exit(1)
-            print('Just created the following release:', release)
+            print(f'Created the following release: https://gitlab.cern.ch/{repo}/-/releases/{release.name}')

    # Create a Draft sweep MR in GitLab
    if args.sweep and args.token and gitlab_available:
@@ -335,7 +336,7 @@ the previous release {previous_release_link:s}:
 Link to the full diff between {target_release_link:s} and
 {previous_release_link:s}
 is available at
-https://gitlab.cern.ch/atlas/athena/compare/{previous_release:s}...{target_release:s}
+https://gitlab.cern.ch/{repo:s}/compare/{previous_release:s}...{target_release:s}
 """

 def sweep_template():
@@ -396,7 +397,7 @@ def fill_template(template, target_release, nightly_tag, optional_message, previ
            [" * %s" % mr for mr in merged_mrs]) if merged_mrs else '* None'

    def formatted_tag_link(tag=''):
-        base_url = 'https://gitlab.cern.ch/atlas/athena/tags'
+        base_url = f'https://gitlab.cern.ch/{repo}/tags'
        return "[%s](%s)" % (tag, base_url+'/'+tag)

    filled_template = template.format(**{'target_release': target_release,
@@ -404,13 +405,14 @@ def fill_template(template, target_release, nightly_tag, optional_message, previ
                                         'nightly_tag': nightly_tag,
                                         'nightly_tag_link': formatted_tag_link(nightly_tag),
                                         'optional_message': optional_message,
+                                         'repo' : repo,
                                         'previous_release': previous_release,
                                         'previous_release_link': formatted_tag_link(previous_release),
                                         'formatted_list_of_merge_requests': formatted_mrs})
-    out_file = open(output_filename, 'w')
-    out_file.write(filled_template)
-    out_file.close()
-    print("Release notes generated in '%s'" % output_filename)
+    if output_filename:
+        with open(output_filename, 'w') as f:
+            f.write(filled_template)
+            print("Release notes stored in '%s'" % output_filename)
    return filled_template

 if __name__ == '__main__':

--- a/Build/AtlasBuildScripts/tag_build.sh
+++ b/Build/AtlasBuildScripts/tag_build.sh
 #! /bin/bash
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 #

 REPOURL="https://:@gitlab.cern.ch:8443/atlas/athena.git"
+DATESTAMP=""

 # Function printing the usage information for the script
 usage() {
@@ -11,15 +12,14 @@ usage() {
 Usage: tag_build.sh [-d date_stamp] [-u repository_url]
       Tag a 'nightly' build based on the current branch and timestamp. If the tag
       already exists it will be checked out instead. This script should only be used
-       by NICOS to tag nightly builds, not for private builds.
+       for tagging nightly builds, not for private builds.

-       date_stamp        Format YYYY-MM-DDTHHMM (default: \$datestamp)
+       date_stamp        Format YYYY-MM-DDTHHMM
       repository_url    git repository URL (default: $REPOURL)
 EOF
 }

 # Parse the command line arguments:
-DATESTAMP="$datestamp"
 while getopts ":d:u:h" opt; do
    case $opt in
        d)
@@ -45,12 +45,8 @@ while getopts ":d:u:h" opt; do
    esac
 done

-# Check we got a datestamp and that it's a valid format
-if [ "$DATESTAMP" = "" ]; then
-	echo "No date_stamp defined from NICOS or given as a parameter"
-	exit 1
-fi
-echo $DATESTAMP | egrep "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{4}$" >& /dev/null
+# Check if datestamp is valid
+echo "$DATESTAMP" | grep -E --quiet "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{4}$"
 if [ $? != "0" ]; then
 	echo "Datestamp '$DATESTAMP' does not correspond to the ATLAS format YYYY-MM-DDTHHMM"
 	exit 1
@@ -67,11 +63,22 @@ cd $ScriptSrcDir/../..
 # Get branch name, then tag/push or checkout if it already exists
 BRANCH=$(git symbolic-ref --short HEAD)
 TAG="nightly/$BRANCH/$DATESTAMP"
-if git rev-parse $TAG > /dev/null 2>&1; then
+
+# Update our local tags in case they are already out of date
+git fetch --tags
+
+if git show-ref --quiet --tags $TAG; then
    echo "Tag $TAG already exists. Doing checkout..."
    git checkout $TAG
 else
    echo "Creating tag $TAG"
    git tag $TAG
-    git push $REPOURL $TAG
+    if ! git push $REPOURL $TAG; then
+        # Extremly unlikely race condition if multiple tag_build.sh run in parallel
+        # and create the same tag from a different commit hash because a commit was
+        # done on the branch in the meantime.
+        echo "Tag $TAG already exists on the remote with a different commit hash. Doing checkout..."
+        git fetch --tags --force
+        git checkout $TAG
+    fi
 fi
--- a/Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CaloCalibClusterTruthAttributerTool.h
+++ b/Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CaloCalibClusterTruthAttributerTool.h
@@ -27,5 +27,8 @@ private:
   /** Toggle storage of invisible and escaped energy - by default this is false, and hence we do not store the invisible or escaped calibration hit truth (ctt) energy. Hence only the EM and nonEM truth ctt energy is stored by default */
  Gaudi::Property<bool> m_fullTruthEnergy{this,"storeFullTruthEnergy",false,"Toggle storage of invisible and escaped energy"};

+  /** Toggle whether to use cell weights or not to calculate calibration hit contribution */
+  Gaudi::Property<bool> m_useCellWeights{this,"useCellWeights",false,"Toggle whether to use cell weights or not to calculate calibration hit contribution"};
+
 };
 #endif
--- a/Calorimeter/CaloCalibHitRec/src/CalibHitToCaloCellTool.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CalibHitToCaloCellTool.cxx
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */

 #include "CaloCalibHitRec/CalibHitToCaloCellTool.h"
@@ -145,7 +145,7 @@ StatusCode CalibHitToCaloCellTool::processCalibHitsFromParticle() const
  for (unsigned int i=0; i<calibHitContainers.size(); i++) {
    for( const auto *const calibhit: *(calibHitContainers[i])) {
      //care only for deposits of the given truth particle
-      if (!MC::isSingleParticle((int)calibhit->particleID())) continue;
+      if (!MC::isSingleParticle(HepMC::barcode(calibhit))) continue; // FIXME barcode-based

      double Etot   = calibhit->energyTotal();
      double Eem    = calibhit->energy(0);

--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterDecoratorAlgorithm.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterDecoratorAlgorithm.cxx
@@ -34,7 +34,7 @@ StatusCode CaloCalibClusterDecoratorAlgorithm::execute(const EventContext& ctx)
    ATH_CHECK(m_truthAttributerTool->calculateTruthEnergies(*thisCaloCluster, m_numTruthParticles, *mapIdentifierToCalibHitsReadHandle, newTruthIDTruthPairs));
    
    for (const auto& thisPair : newTruthIDTruthPairs) ATH_MSG_DEBUG("Cluster Final loop: Particle with truthID " << thisPair.first << " has truth energy of " <<  thisPair.second << " for cluster with e, eta " << thisCaloCluster->e() << " and " << thisCaloCluster->eta());
-    caloClusterWriteDecorHandleNLeadingTruthParticles(*thisCaloCluster) = newTruthIDTruthPairs;
+    caloClusterWriteDecorHandleNLeadingTruthParticles(*thisCaloCluster) = std::move(newTruthIDTruthPairs);
  }
  
  return StatusCode::SUCCESS;

--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx
@@ -377,18 +377,18 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
          int iClus = p.first;
          double weight = p.second;
          if(m_useParticleID){
-            const int uniqueID = hit->particleID(); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
+            const int uniqueID = HepMC::barcode(hit); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
            if (uniqueID == HepMC::INVALID_PARTICLE_ID) {
              ATH_MSG_ERROR("Invalid uniqueID (barcode) detected - this sample cannot be properly analysed.");
              break;
            }
-            clusInfoVec[iClus].Add(weight * hit->energyTotal(), nsmp, (unsigned int)(hit->particleID()));
+            clusInfoVec[iClus].Add(weight * hit->energyTotal(), nsmp, (unsigned int)(HepMC::barcode(hit)));
          }else{
            clusInfoVec[iClus].Add(weight * hit->energyTotal(), nsmp);
          }
        }
      }
-      if( m_useParticleID && hit->particleID() == HepMC::UNDEFINED_ID) {
+      if( m_useParticleID && HepMC::barcode(hit) == HepMC::UNDEFINED_ID) {
        nHitsWithoutParticleID++;
      }
      nHitsTotal++;
@@ -482,7 +482,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
            const CaloDetDescrElement* myCDDE = 
              calo_dd_man->get_element(myId);
            int uniqueID(HepMC::UNDEFINED_ID);
-            if(useParticleID) uniqueID = hit->particleID(); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
+            if(useParticleID) uniqueID = HepMC::barcode(hit); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
            if ( myCDDE ) {
              int jeO = (int)floor(m_n_eta_out*(myCDDE->eta()/m_out_eta_max));
              if ( jeO >= -m_n_eta_out && jeO < m_n_eta_out ) {
@@ -557,7 +557,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
          myCDDE = m_caloDmDescrManager->get_element(myId);
          if ( myCDDE ) {
            int uniqueID(HepMC::UNDEFINED_ID);
-            if(useParticleID) uniqueID = hit->particleID(); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
+            if(useParticleID) uniqueID = HepMC::barcode(hit); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode

            int jeO = (int)floor(m_n_eta_out*(myCDDE->eta()/m_out_eta_max));
            if ( jeO >= -m_n_eta_out && jeO < m_n_eta_out ) {

--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterTruthAttributerTool.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterTruthAttributerTool.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
 */

 #include "CaloCalibHitRec/CaloCalibClusterTruthAttributerTool.h"
@@ -23,7 +23,11 @@ StatusCode CaloCalibClusterTruthAttributerTool::calculateTruthEnergies(const xAO
  std::map<unsigned int, double> truthIDTruePtMap;

  //Loop on calorimeter cells to sum up the truth energies of the truth particles.    
-  for (const auto *thisCaloCell : *theCellLinks){
+  CaloClusterCellLink::const_iterator firstCell = theCellLinks->begin();
+  CaloClusterCellLink::const_iterator lastCell   = theCellLinks->end();
+
+  for (; firstCell != lastCell; ++firstCell) {
+    const CaloCell* thisCaloCell = (*firstCell);
    
    if (!thisCaloCell){
      ATH_MSG_WARNING("Have invalid pointer to CaloCell");
@@ -32,6 +36,9 @@ StatusCode CaloCalibClusterTruthAttributerTool::calculateTruthEnergies(const xAO

    //get the unique calorimeter cell identifier
    Identifier cellID = thisCaloCell->ID();
+
+    //get the weight of the cell
+    double cellWeight = firstCell.weight();
    
    //look up the calibration hit that corresponds to this calorimeter cell - we use find because not all calorimeter cells will have calibration hits
    std::map<Identifier,std::vector<const CaloCalibrationHit*> >::const_iterator identifierToCaloHitMapIterator = identifierToCaloHitMap.find(cellID);
@@ -39,10 +46,17 @@ StatusCode CaloCalibClusterTruthAttributerTool::calculateTruthEnergies(const xAO
    std::vector<const CaloCalibrationHit*> theseCalibrationHits = (*identifierToCaloHitMapIterator).second;

    for (const auto *thisCalibrationHit : theseCalibrationHits){
-      int truthID = thisCalibrationHit->particleUID();
+      const int truthID = HepMC::barcode(thisCalibrationHit); // FIXME barcode-based until xAOD::TruthParticle supports id rather than barcode
      double thisCalHitTruthEnergy = thisCalibrationHit->energyEM() + thisCalibrationHit->energyNonEM();
      if (true == m_fullTruthEnergy) thisCalHitTruthEnergy += (thisCalibrationHit->energyEscaped() + thisCalibrationHit->energyInvisible());

+      //This only makes sense to use for clusters that are NOT calibrated
+      //If the cluster is calibrated this weight includes a calibration factor
+      //which is not relevant for truth information.
+      //For uncalibrated clusters it can contain a gemetrical weight
+      //and also a weight due to pflow reweighting of a cell energy
+      if (m_useCellWeights) thisCalHitTruthEnergy *= cellWeight;
+
      auto iterator = truthIDTruePtMap.find(truthID);
      if (iterator != truthIDTruePtMap.end()) truthIDTruePtMap[truthID] += thisCalHitTruthEnergy;
      else truthIDTruePtMap[truthID] = thisCalHitTruthEnergy;

--- a/Calorimeter/CaloClusterCorrection/share/CaloScaleCluster_test.ref
+++ b/Calorimeter/CaloClusterCorrection/share/CaloScaleCluster_test.ref
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0.ref
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0.ref
@@ -65,7 +65,6 @@ PoolSvc                                              INFO Setting up APR FileCat
 PoolSvc                                              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession                                            INFO     Open     DbSession    
 Domain[ROOT_All]                                     INFO >   Access   DbDomain     READ      [ROOT_All] 
-EventSelector                                        INFO EventSelection with query 
 PoolSvc                                              INFO File is not in Catalog! Attempt to open it anyway.
 Warning in <TClass::Init>: no dictionary for class MissingETSig_p1 is available
 Warning in <TClass::Init>: no dictionary for class MissingETSigHypoContainer_p1 is available

--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0.ref
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0.ref
@@ -47,7 +47,6 @@ PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
-EventSelector        INFO EventSelection with query 
 PoolSvc              INFO File is not in Catalog! Attempt to open it anyway.
 Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_tlp1 is available
 Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_p1 is available
@@ -162,12 +161,8 @@ IdDictDetDescrCnv    INFO Dictionary LArHighVoltage       version fullAtlas
 IdDictDetDescrCnv    INFO Dictionary MuonSpectrometer     version R.01                 DetDescr tag MuonIdentifier-02         file IdDictParser/IdDictMuonSpectrometer_R.01.xml
 IdDictDetDescrCnv    INFO Dictionary TileCalorimeter      version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00         file IdDictParser/IdDictTileCalorimeter.xml
 LArElectrodeID       INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineIDDetD...   INFO in createObj: creating a LArHVLineID helper object in the detector store
 LArHVLineID          INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineID          INFO  => initialize_from_dictionary(dict_mgr) =0
 LArHVLineID          INFO Register_dict_tag of LArHighVoltage is OK
 LArHVLineID          INFO setDictVersion of LArHighVoltage is OK
@@ -191,7 +186,6 @@ EMECConstruction     INFO activating LAr::EMEC::Pos::OuterWheel
 ClassIDSvc           INFO  getRegistryEntries: read 2898 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 TileTBID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 EndcapDMConstru...   INFO Start building EC electronics geometry
 EMECConstruction     INFO multi-layered version of absorbers activated, parameter value is 1
 EMECConstruction     INFO activating LAr::EMEC::Neg::InnerWheel
@@ -207,26 +201,19 @@ TileDddbManager      INFO n_saddle = 1
 TileDddbManager      INFO n_tilb = 20
 TileDddbManager      INFO n_tileSwitches = 1
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 ClassIDSvc           INFO  getRegistryEntries: read 55 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 GeoModelSvc.Til...   INFO  U-shape parameter from database is: 1
 GeoModelSvc.Til...   INFO  Glue parameter from database is: 1
 GeoModelSvc.Til...   INFO  Cs Tube parameter from database is: 0
@@ -317,27 +304,19 @@ CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in th
 ClassIDSvc           INFO  getRegistryEntries: read 208 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloDM_ID helper object in the detector store
 CaloDM_ID            INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a TTOnlineID helper object in the detector store
 TTOnlineID           INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A

--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0.ref
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0.ref
@@ -32,7 +32,6 @@ PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool'])
-EventSelector        INFO EventSelection with query 
 PoolSvc              INFO File is not in Catalog! Attempt to open it anyway.
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8FDFD58C-5873-8CD7-D4CC-A3463BB84220
@@ -139,12 +138,8 @@ IdDictDetDescrCnv    INFO Dictionary LArHighVoltage       version fullAtlas
 IdDictDetDescrCnv    INFO Dictionary MuonSpectrometer     version R.01                 DetDescr tag MuonIdentifier-02         file IdDictParser/IdDictMuonSpectrometer_R.01.xml
 IdDictDetDescrCnv    INFO Dictionary TileCalorimeter      version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00         file IdDictParser/IdDictTileCalorimeter.xml
 LArElectrodeID       INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineIDDetD...   INFO in createObj: creating a LArHVLineID helper object in the detector store
 LArHVLineID          INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineID          INFO  => initialize_from_dictionary(dict_mgr) =0
 LArHVLineID          INFO Register_dict_tag of LArHighVoltage is OK
 LArHVLineID          INFO setDictVersion of LArHighVoltage is OK
@@ -166,7 +161,6 @@ EMECConstruction     INFO activating LAr::EMEC::Pos::OuterWheel
 ClassIDSvc           INFO getRegistryEntries: read 3129 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 TileTBID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 EndcapDMConstru...   INFO Start building EC electronics geometry
 EMECConstruction     INFO multi-layered version of absorbers activated, parameter value is 1
 EMECConstruction     INFO activating LAr::EMEC::Neg::InnerWheel
@@ -182,26 +176,19 @@ TileDddbManager      INFO n_saddle = 1
 TileDddbManager      INFO n_tilb = 20
 TileDddbManager      INFO n_tileSwitches = 1
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 ClassIDSvc           INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 GeoModelSvc.Til...   INFO Ushape parameter from database is: 1
 GeoModelSvc.Til...   INFO Glue parameter from database is: 1
 GeoModelSvc.Til...   INFO PVT parameter from database is: 0
@@ -305,27 +292,19 @@ CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in th
 ClassIDSvc           INFO getRegistryEntries: read 192 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloDM_ID helper object in the detector store
 CaloDM_ID            INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a TTOnlineID helper object in the detector store
 TTOnlineID           INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A

--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0.ref
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0.ref
@@ -32,7 +32,6 @@ PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool'])
-EventSelector        INFO EventSelection with query 
 PoolSvc              INFO File is not in Catalog! Attempt to open it anyway.
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] FD99A7C5-43FB-B2F6-6049-20D4135A04CC
@@ -138,12 +137,8 @@ IdDictDetDescrCnv    INFO Dictionary LArHighVoltage       version fullAtlas
 IdDictDetDescrCnv    INFO Dictionary MuonSpectrometer     version R.01                 DetDescr tag MuonIdentifier-02         file IdDictParser/IdDictMuonSpectrometer_R.01.xml
 IdDictDetDescrCnv    INFO Dictionary TileCalorimeter      version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00         file IdDictParser/IdDictTileCalorimeter.xml
 LArElectrodeID       INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineIDDetD...   INFO in createObj: creating a LArHVLineID helper object in the detector store
 LArHVLineID          INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineID          INFO  => initialize_from_dictionary(dict_mgr) =0
 LArHVLineID          INFO Register_dict_tag of LArHighVoltage is OK
 LArHVLineID          INFO setDictVersion of LArHighVoltage is OK
@@ -165,7 +160,6 @@ EMECConstruction     INFO activating LAr::EMEC::Pos::OuterWheel
 ClassIDSvc           INFO getRegistryEntries: read 3129 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 TileTBID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 EndcapDMConstru...   INFO Start building EC electronics geometry
 EMECConstruction     INFO multi-layered version of absorbers activated, parameter value is 1
 EMECConstruction     INFO activating LAr::EMEC::Neg::InnerWheel
@@ -181,26 +175,19 @@ TileDddbManager      INFO n_saddle = 1
 TileDddbManager      INFO n_tilb = 20
 TileDddbManager      INFO n_tileSwitches = 1
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 ClassIDSvc           INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 GeoModelSvc.Til...   INFO Ushape parameter from database is: 1
 GeoModelSvc.Til...   INFO Glue parameter from database is: 1
 GeoModelSvc.Til...   INFO PVT parameter from database is: 0
@@ -292,27 +279,19 @@ CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in th
 ClassIDSvc           INFO getRegistryEntries: read 188 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloDM_ID helper object in the detector store
 CaloDM_ID            INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a TTOnlineID helper object in the detector store
 TTOnlineID           INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A

--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2.ref
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2.ref
@@ -34,7 +34,6 @@ PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool'])
-EventSelector        INFO EventSelection with query 
 PoolSvc              INFO File is not in Catalog! Attempt to open it anyway.
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] D02C14FF-BC31-285A-AD37-E1D4491CEE9D
@@ -140,12 +139,8 @@ IdDictDetDescrCnv    INFO Dictionary LArHighVoltage       version fullAtlas
 IdDictDetDescrCnv    INFO Dictionary MuonSpectrometer     version R.01                 DetDescr tag MuonIdentifier-02         file IdDictParser/IdDictMuonSpectrometer_R.01.xml
 IdDictDetDescrCnv    INFO Dictionary TileCalorimeter      version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00         file IdDictParser/IdDictTileCalorimeter.xml
 LArElectrodeID       INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineIDDetD...   INFO in createObj: creating a LArHVLineID helper object in the detector store
 LArHVLineID          INFO  => initialize_from_dictionary()
-AtlasDetectorID      INFO initialize_from_dictionary - OK
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArHVLineID          INFO  => initialize_from_dictionary(dict_mgr) =0
 LArHVLineID          INFO Register_dict_tag of LArHighVoltage is OK
 LArHVLineID          INFO setDictVersion of LArHighVoltage is OK
@@ -167,7 +162,6 @@ EMECConstruction     INFO activating LAr::EMEC::Pos::OuterWheel
 ClassIDSvc           INFO getRegistryEntries: read 3129 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 TileTBID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 EndcapDMConstru...   INFO Start building EC electronics geometry
 EMECConstruction     INFO multi-layered version of absorbers activated, parameter value is 1
 EMECConstruction     INFO activating LAr::EMEC::Neg::InnerWheel
@@ -183,26 +177,19 @@ TileDddbManager      INFO n_saddle = 1
 TileDddbManager      INFO n_tilb = 20
 TileDddbManager      INFO n_tileSwitches = 1
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 ClassIDSvc           INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 GeoModelSvc.Til...   INFO Ushape parameter from database is: 1
 GeoModelSvc.Til...   INFO Glue parameter from database is: 1
 GeoModelSvc.Til...   INFO PVT parameter from database is: 0
@@ -292,27 +279,19 @@ CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in th
 ClassIDSvc           INFO getRegistryEntries: read 188 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloDM_ID helper object in the detector store
 CaloDM_ID            INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a TTOnlineID helper object in the detector store
 TTOnlineID           INFO initialize_from_dictionary
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
 CaloIDHelper_ID...   INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
 LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-09-29T2101/Athena/22.0.45/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A

--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
@@ -6,8 +6,8 @@ atlas_subdir( CaloCondAthenaPool )
 # Component(s) in the package:
 atlas_add_poolcnv_library( CaloCondAthenaPoolPoolCnv
                           src/*.cxx
-                           FILES CaloTriggerTool/LArTTCellMap.h CaloTriggerTool/CaloTTOnOffIdMap.h CaloTriggerTool/CaloTTOnAttrIdMap.h CaloTriggerTool/CaloTTPpmRxIdMap.h CaloConditions/ToolConstants.h CaloConditions/CaloCellFactor.h CaloConditions/CaloCellPositionShift.h CaloConditions/CaloHadWeight.h CaloConditions/CaloEMFrac.h CaloConditions/CaloHadDMCoeff.h CaloConditions/CaloHadDMCoeff2.h CaloConditions/CaloLocalHadCoeff.h
-                           TYPES_WITH_NAMESPACE CaloRec::ToolConstants CaloRec::CaloCellFactor CaloRec::CaloCellPositionShift
+                           FILES CaloTriggerTool/LArTTCellMap.h CaloTriggerTool/CaloTTOnOffIdMap.h CaloTriggerTool/CaloTTOnAttrIdMap.h CaloTriggerTool/CaloTTPpmRxIdMap.h CaloConditions/ToolConstants.h CaloConditions/CaloCellPositionShift.h CaloConditions/CaloHadWeight.h CaloConditions/CaloEMFrac.h CaloConditions/CaloHadDMCoeff.h CaloConditions/CaloHadDMCoeff2.h CaloConditions/CaloLocalHadCoeff.h
+                           TYPES_WITH_NAMESPACE CaloRec::ToolConstants CaloRec::CaloCellPositionShift
                           LINK_LIBRARIES CaloConditions CaloTriggerToolLib AthenaKernel GaudiKernel AthenaPoolCnvSvcLib )


--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration

 # Declare the package name:
 atlas_subdir( CaloIdCnv )

 # Component(s) in the package:
 atlas_add_component( CaloIdCnv
-                     src/*.cxx
+                     src/*.cxx src/components/*.cxx
                     LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib IdDictDetDescr Identifier GaudiKernel )

--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 #include "CaloIdCnv/CaloIdMgrDetDescrCnv.h"
 #include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"

--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/src/CaloCalibrationHitContainerCnv_p4.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/src/CaloCalibrationHitContainerCnv_p4.cxx
@@ -60,7 +60,7 @@ void CaloCalibrationHitContainerCnv_p4::transToPers(const CaloCalibrationHitCont
  Compressor A; A.setNrBits(18);
  A.reduce(tempE,persCont->m_energy); // packs energy
  persCont->m_name = transCont->Name(); //stores name
-  persCont->m_particleUID = tempPID;
+  persCont->m_particleUID = std::move(tempPID);

 }


--- a/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref
+++ b/Calorimeter/CaloCnv/CaloTPCnv/share/CaloCompactCellTool_test.ref
@@ -20,7 +20,6 @@ ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 em   decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -35,7 +34,6 @@ is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffff
 channel range -> 4/1/-1,1/0/0/0:60/0:63/0 | 4/1/-1,1/1/0/1:447/0:63/0 | 4/1/-1,1/1/1/0:2/0:255/0 | 4/1/-1,1/2/0/0:55/0:255/0 | 4/1/-1,1/2/1/0/0:255/0 | 4/1/-1,1/3/0/0:26/0:255/0 | 4/1/-2,2/0/0/0:11/0:63/0 | 4/1/-2,2/1/0/0/0:63/0 | 4/1/-2,2/1/1/0:2/0:63/0 | 4/1/-2,2/1/2/0:95/0:63/0 | 4/1/-2,2/1/3/0:47/0:63/0 | 4/1/-2,2/1/4/0:63/0:63/0 | 4/1/-2,2/1/5/0:3/0:63/0 | 4/1/-2,2/2/0/0/0:255/0 | 4/1/-2,2/2/1/0:42/0:255/0 | 4/1/-2,2/3/0/0:19/0:255/0 | 4/1/-3,3/1/0/0:6/0:63/0 | 4/1/-3,3/2/0/0:6/0:63/0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 hec  decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -51,7 +49,6 @@ initialize_from_dict :
 LArHEC_Base_ID::init_neighbors 
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 fcal decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -65,17 +62,13 @@ is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffff
 module range -> 4/3/-2,2/1 | 4/3/-2,2/2 | 4/3/-2,2/3
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 em   decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -90,7 +83,6 @@ is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffff
 channel range -> 4/1/-1,1/0/0/0:15/0:63/1 | 4/1/-1,1/1/0/0:55/0:63/1 | 4/1/-1,1/1/1/0:2/0:63/1 | 4/1/-1,1/2/0/0:55/0:63/1 | 4/1/-1,1/2/1/0/0:63/1 | 4/1/-1,1/3/0/0:13/0:63/1 | 4/1/-2,2/0/0/0:2/0:63/1 | 4/1/-2,2/1/0/0/0:63/1 | 4/1/-2,2/1/2/0:11/0:63/1 | 4/1/-2,2/1/3/0:5/0:63/1 | 4/1/-2,2/1/4/0:15/0:63/1 | 4/1/-2,2/1/5/0/0:63/1 | 4/1/-2,2/2/0/0/0:63/1 | 4/1/-2,2/2/1/0:42/0:63/1 | 4/1/-2,2/3/0/0:9/0:63/1 | 4/1/-3,3/1/0/0:2/0:31/1 | 4/1/-3,3/1/1/0/0:31/1 | 4/1/-3,3/2/0/0:2/0:31/1 | 4/1/-3,3/2/1/0/0:31/1
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 hec  decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -106,7 +98,6 @@ initialize_from_dict :
 LArHEC_Base_ID::init_neighbors 
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 decode index and bit fields for each level: 
 lar  decode 1 vals 2,4,5,7,10,11,12,13 mask/zero mask/shift/bits/offset 7   1fffffffffffffff 61 3  0  indexes 0 0 1 2 0 3 0 0 4 5 6 7 mode  enumerated  
 fcal decode 1 vals -3,-2,-1,1,2,3,4,5 mask/zero mask/shift/bits/offset 7   e3ffffffffffffff 58 3  3  indexes 0 1 2 0 3 4 5 6 7   mode  enumerated  
@@ -120,14 +111,11 @@ is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffff
 module range -> 4/3/-2,2/1 | 4/3/-2,2/2 | 4/3/-2,2/3
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
 AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID      INFO initialize_from_dictionary - OK
 ToolSvc.CaloSup...   INFO Done with initIDMap
 *** test 400 400 0 1
     668      0.0     0.00 65095 6942 -1

--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration

 # Declare the package name:
 atlas_subdir( CaloTTDetDescrCnv )

 # Component(s) in the package:
 atlas_add_component( CaloTTDetDescrCnv
-                     src/*.cxx
+                     src/*.cxx src/components/*.cxx
                     LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib DetDescrCnvSvcLib )
No results found