Calorimeter/CaloIdentifier/CaloIdentifier/LArFCAL_Base_ID.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOIDENTIFIER_LARFCAL_BASE_ID_H
@@ -197,18 +197,18 @@ private:
 
 
 private:
-  unsigned                      m_slar;
-
-  bool                          m_two_sym_sides;
-
-  size_type                     m_fcal_region_index;
-  size_type                     m_LAR_INDEX;
-  size_type                     m_SLAR_INDEX;
-  size_type                     m_FCAL_INDEX;
-  size_type                     m_POSNEG_INDEX;
-  size_type                     m_MODULE_INDEX;
-  size_type                     m_ETA_INDEX;
-  size_type                     m_PHI_INDEX;
+  unsigned                      m_slar{0};
+
+  bool                          m_two_sym_sides{1};
+
+  size_type                     m_fcal_region_index{0};
+  size_type                     m_LAR_INDEX{999};
+  size_type                     m_SLAR_INDEX{999};
+  size_type                     m_FCAL_INDEX{999};
+  size_type                     m_POSNEG_INDEX{999};
+  size_type                     m_MODULE_INDEX{999};
+  size_type                     m_ETA_INDEX{999};
+  size_type                     m_PHI_INDEX{999};
 
   MultiRange                    m_full_channel_range;
   MultiRange                    m_full_module_range;

Calorimeter/CaloIdentifier/CaloIdentifier/LArID_Exception.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /* Generated by Together */
@@ -38,7 +38,7 @@ public:
     /**
      * return error message <br> 
      */
-    std::string message() const { return m_message;}
+    const std::string& message() const { return m_message;}
 
     /**
      * set error code number<br> 

Calorimeter/CaloIdentifier/CaloIdentifier/TileID_Exception.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILEID_EXCEPTION_H
@@ -34,7 +34,7 @@ public:
     /**
      * return error message  
      */
-    std::string message() const { return m_message;}
+    const std::string& message() const { return m_message;}
 
     /**
      * set error code number 

Calorimeter/CaloIdentifier/share/CaloCell_ID_test.ref

-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  
-bec  decode 1 vals -3,-2,-1,1,2,3  mask/zero mask/shift/bits/offset 7   fc7fffffffffffff 55 3  6  indexes 0 1 2 0 3 4 5       mode  enumerated  
-samp decode 0 vals 0:3             mask/zero mask/shift/bits/offset 3   ff9fffffffffffff 53 2  9  indexes                     mode  both_bounded  
-reg  decode 0 vals 0:5             mask/zero mask/shift/bits/offset 7   ffe3ffffffffffff 50 3  11 indexes                     mode  both_bounded  
-eta  decode 0 vals 0:447           mask/zero mask/shift/bits/offset 1ff fffc01ffffffffff 41 9  14 indexes                     mode  both_bounded  
-phi  decode 0 vals 0:255           mask/zero mask/shift/bits/offset ff  fffffe01ffffffff 33 8  23 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   fffffffeffffffff 32 1  31 indexes                     mode  both_bounded  
  LArEM_Base_ID::initialize_from_dict : 
  region range -> 4/1/-1,1/0/0 | 4/1/-1,1/1/0 | 4/1/-1,1/1/1 | 4/1/-1,1/2/0 | 4/1/-1,1/2/1 | 4/1/-1,1/3/0 | 4/1/-2,2/0/0 | 4/1/-2,2/1/0 | 4/1/-2,2/1/1 | 4/1/-2,2/1/2 | 4/1/-2,2/1/3 | 4/1/-2,2/1/4 | 4/1/-2,2/1/5 | 4/1/-2,2/2/0 | 4/1/-2,2/2/1 | 4/1/-2,2/3/0 | 4/1/-3,3/1/0 | 4/1/-3,3/2/0
  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  
-pn   decode 1 vals -2,2            mask/zero mask/shift/bits/offset 1   fdffffffffffffff 57 1  6  indexes 0 0 0 0 1           mode  enumerated  
-samp decode 0 vals 0:3             mask/zero mask/shift/bits/offset 3   fe7fffffffffffff 55 2  7  indexes                     mode  both_bounded  
-reg  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffbfffffffffffff 54 1  9  indexes                     mode  both_bounded  
-eta  decode 0 vals 0:9             mask/zero mask/shift/bits/offset f   ffc3ffffffffffff 50 4  10 indexes                     mode  both_bounded  
-phi  decode 0 vals 0:63            mask/zero mask/shift/bits/offset 3f  fffc0fffffffffff 44 6  14 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   fffff7ffffffffff 43 1  20 indexes                     mode  both_bounded  
 initialize_from_dict : 
  channel range -> 4/2/-2,2/0/0/0:9/0:63/0 | 4/2/-2,2/1/0/0:9/0:63/0 | 4/2/-2,2/2/0/1:9/0:63/0 | 4/2/-2,2/3/0/2:9/0:63/0 | 4/2/-2,2/0/1/0:3/0:31/0 | 4/2/-2,2/1/1/0:2/0:31/0 | 4/2/-2,2/2/1/0:2/0:31/0 | 4/2/-2,2/3/1/0:3/0:31/0
  region range -> 4/2/-2,2/0/0 | 4/2/-2,2/1/0 | 4/2/-2,2/2/0 | 4/2/-2,2/3/0 | 4/2/-2,2/0/1 | 4/2/-2,2/1/1 | 4/2/-2,2/2/1 | 4/2/-2,2/3/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  
-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  
-pn   decode 1 vals -2,2            mask/zero mask/shift/bits/offset 1   fdffffffffffffff 57 1  6  indexes 0 0 0 0 1           mode  enumerated  
-mod  decode 1 vals 1:3             mask/zero mask/shift/bits/offset 3   fe7fffffffffffff 55 2  7  indexes                     mode  both_bounded  
-eta  decode 0 vals 0:63            mask/zero mask/shift/bits/offset 3f  ff81ffffffffffff 49 6  9  indexes                     mode  both_bounded  
-phi  decode 0 vals 0:15            mask/zero mask/shift/bits/offset f   fffe1fffffffffff 45 4  15 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffffefffffffffff 44 1  19 indexes                     mode  both_bounded  
  initialize_from_dict : 
  channel range -> 4/3/-2,2/1/0:62/0:15/0 | 4/3/-2,2/2/0:29/0,7,8,15/0 | 4/3/-2,2/2/0:30/3,4,11,12/0 | 4/3/-2,2/2/0:31/1,2,5,6,9,10,13,14/0 | 4/3/-2,2/3/0:14/2,10/0 | 4/3/-2,2/3/0:14/0,1,3,4,5,6,7,8,9,11,12,13,14,15/0 | 4/3/-2,2/3/15/0,1,2,3,4,6,7,8,9,10,11,12,14,15/0
  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  
-bec  decode 1 vals -3,-2,-1,1,2,3  mask/zero mask/shift/bits/offset 7   fc7fffffffffffff 55 3  6  indexes 0 1 2 0 3 4 5       mode  enumerated  
-samp decode 0 vals 0:3             mask/zero mask/shift/bits/offset 3   ff9fffffffffffff 53 2  9  indexes                     mode  both_bounded  
-reg  decode 0 vals 0:5             mask/zero mask/shift/bits/offset 7   ffe3ffffffffffff 50 3  11 indexes                     mode  both_bounded  
-eta  decode 0 vals 0:447           mask/zero mask/shift/bits/offset 1ff fffc01ffffffffff 41 9  14 indexes                     mode  both_bounded  
-phi  decode 0 vals 0:255           mask/zero mask/shift/bits/offset ff  fffffe01ffffffff 33 8  23 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   fffffffeffffffff 32 1  31 indexes                     mode  both_bounded  
  LArEM_Base_ID::initialize_from_dict : 
  region range -> 4/1/-1,1/0/0 | 4/1/-1,1/1/0 | 4/1/-1,1/1/1 | 4/1/-1,1/2/0 | 4/1/-1,1/2/1 | 4/1/-1,1/3/0 | 4/1/-2,2/0/0 | 4/1/-2,2/1/0 | 4/1/-2,2/1/1 | 4/1/-2,2/1/2 | 4/1/-2,2/1/3 | 4/1/-2,2/1/4 | 4/1/-2,2/1/5 | 4/1/-2,2/2/0 | 4/1/-2,2/2/1 | 4/1/-2,2/3/0 | 4/1/-3,3/1/0 | 4/1/-3,3/2/0
  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
  LArEM_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  
-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  
-pn   decode 1 vals -2,2            mask/zero mask/shift/bits/offset 1   fdffffffffffffff 57 1  6  indexes 0 0 0 0 1           mode  enumerated  
-samp decode 0 vals 0:3             mask/zero mask/shift/bits/offset 3   fe7fffffffffffff 55 2  7  indexes                     mode  both_bounded  
-reg  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffbfffffffffffff 54 1  9  indexes                     mode  both_bounded  
-eta  decode 0 vals 0:9             mask/zero mask/shift/bits/offset f   ffc3ffffffffffff 50 4  10 indexes                     mode  both_bounded  
-phi  decode 0 vals 0:63            mask/zero mask/shift/bits/offset 3f  fffc0fffffffffff 44 6  14 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   fffff7ffffffffff 43 1  20 indexes                     mode  both_bounded  
 initialize_from_dict : 
  channel range -> 4/2/-2,2/0/0/0:9/0:63/0 | 4/2/-2,2/1/0/0:9/0:63/0 | 4/2/-2,2/2/0/1:9/0:63/0 | 4/2/-2,2/3/0/2:9/0:63/0 | 4/2/-2,2/0/1/0:3/0:31/0 | 4/2/-2,2/1/1/0:2/0:31/0 | 4/2/-2,2/2/1/0:2/0:31/0 | 4/2/-2,2/3/1/0:3/0:31/0
  region range -> 4/2/-2,2/0/0 | 4/2/-2,2/1/0 | 4/2/-2,2/2/0 | 4/2/-2,2/3/0 | 4/2/-2,2/0/1 | 4/2/-2,2/1/1 | 4/2/-2,2/2/1 | 4/2/-2,2/3/1
  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  
-pn   decode 1 vals -2,2            mask/zero mask/shift/bits/offset 1   fdffffffffffffff 57 1  6  indexes 0 0 0 0 1           mode  enumerated  
-mod  decode 1 vals 1:3             mask/zero mask/shift/bits/offset 3   fe7fffffffffffff 55 2  7  indexes                     mode  both_bounded  
-eta  decode 0 vals 0:63            mask/zero mask/shift/bits/offset 3f  ff81ffffffffffff 49 6  9  indexes                     mode  both_bounded  
-phi  decode 0 vals 0:15            mask/zero mask/shift/bits/offset f   fffe1fffffffffff 45 4  15 indexes                     mode  both_bounded  
-is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffffefffffffffff 44 1  19 indexes                     mode  both_bounded  
  initialize_from_dict : 
  channel range -> 4/3/-2,2/1/0:62/0:15/0 | 4/3/-2,2/2/0:29/0,7,8,15/0 | 4/3/-2,2/2/0:30/3,4,11,12/0 | 4/3/-2,2/2/0:31/1,2,5,6,9,10,13,14/0 | 4/3/-2,2/3/0:14/2,10/0 | 4/3/-2,2/3/0:14/0,1,3,4,5,6,7,8,9,11,12,13,14,15/0 | 4/3/-2,2/3/15/0,1,2,3,4,6,7,8,9,10,11,12,14,15/0
  module range -> 4/3/-2,2/1 | 4/3/-2,2/2 | 4/3/-2,2/3
 LarFCal_Base_ID::init_neighbours 
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/work/s/schaffer/public/work-20.x.64bitIdFix_1/InstallArea/share/FCal2DNeighbors-DC3-05-Comm-01.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/work/s/schaffer/public/work-20.x.64bitIdFix_1/InstallArea/share/FCal3DNeighborsNext-DC3-05-Comm-01.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/work/s/schaffer/public/work-20.x.64bitIdFix_1/InstallArea/share/FCal3DNeighborsPrev-DC3-05-Comm-01.txt
 LarFCal_Base_ID::init_neighbours status: 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
 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
-TileNeighbour        INFO Reading file  /afs/cern.ch/work/s/schaffer/public/work-20.x.64bitIdFix_1/InstallArea/share/TileNeighbour_reduced.txt
-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
 test_cells
 [4.1.-3.1.0.0.0.0]
-======
 EM
 Sampling   Barrel   Outer wheel   Inner wheel
 0            7808          1536             0
@@ -125,7 +38,6 @@ Sampling   Barrel   Outer wheel   Inner wheel
 3           13824         10240             0
 Total      109568         61952          1792   Grand total: 173312
 
-======
 FCAL
 Sampling   Barrel   Outer wheel   Inner wheel
 0               0             0             0
@@ -134,7 +46,6 @@ Sampling   Barrel   Outer wheel   Inner wheel
 3               0           508             0
 Total           0          3524             0   Grand total:   3524
 
-======
 HEC
 Sampling   Barrel   Outer wheel   Inner wheel
 0               0          1536             0
@@ -143,7 +54,6 @@ Sampling   Barrel   Outer wheel   Inner wheel
 3               0          1280             0
 Total           0          5632             0   Grand total:   5632
 
-======
 Tile
 Side    Barrel   Extended Barrel   Gap     Ancillary
 0         1408      768               384       0   

Calorimeter/CaloIdentifier/share/CaloCell_SuperCell_ID_test.ref

 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  
@@ -15,7 +14,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:14/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:11/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  
@@ -30,7 +28,6 @@ initialize_from_dict :
  region range -> 4/2/-2,2/0/0 | 4/2/-2,2/0/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  
 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  
@@ -44,14 +41,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
 test_cells
 [4.1.-3.1.0.0.0.1]
 ======

Calorimeter/CaloIdentifier/share/CaloHelpersTest_test.ref

 CaloIdentifier/CaloHelpersTest
 test1
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 LArEM: 173312 36
 LArHEC: 5632 16
 LArFCAL: 3524 6

Calorimeter/CaloIdentifier/share/CaloIDHelper_test.ref

@@ -3,10 +3,9 @@ test_hashgroup
 CaloIDHelper::H...  ERROR helperinit_hashes  duplicated id for channel id. nids= 9 compact Id  Unable to decode id
 CaloIDHelper        ERROR helper. set size 9 not equal to hash max 10
 test_helper
-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
-AtlasDetectorID      INFO initialize_from_dictionary - OK
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+AtlasDetectorID     ERROR register_dict_tag:193 No dictionary found
 100 0 0 0.025 0.0981748
 110 0.003125 0 0.003125 0.0981748
 120 0 0 0.025 0.0245437

Calorimeter/CaloIdentifier/share/LArEM_ID_test.ref

-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
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 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  
@@ -13,9 +12,8 @@ is-slar  decode 0 vals 0:1             mask/zero mask/shift/bits/offset 1   ffff
  LArEM_Base_ID::initialize_from_dict : 
  region range -> 4/1/-1,1/0/0 | 4/1/-1,1/1/0 | 4/1/-1,1/1/1 | 4/1/-1,1/2/0 | 4/1/-1,1/2/1 | 4/1/-1,1/3/0 | 4/1/-2,2/0/0 | 4/1/-2,2/1/0 | 4/1/-2,2/1/1 | 4/1/-2,2/1/2 | 4/1/-2,2/1/3 | 4/1/-2,2/1/4 | 4/1/-2,2/1/5 | 4/1/-2,2/2/0 | 4/1/-2,2/2/1 | 4/1/-2,2/3/0 | 4/1/-3,3/1/0 | 4/1/-3,3/2/0
  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
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 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  

Calorimeter/CaloIdentifier/share/LArEM_SuperCell_ID_test.ref

 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  
@@ -15,7 +14,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:14/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:11/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  
 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  

Calorimeter/CaloIdentifier/share/LArFCAL_ID_test.ref

 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  
@@ -14,7 +13,6 @@ 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
 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  

Calorimeter/CaloIdentifier/share/LArFCAL_SuperCell_ID_test.ref

 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  

Calorimeter/CaloIdentifier/share/LArHEC_ID_test.ref

 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  
@@ -15,7 +14,6 @@ initialize_from_dict :
  region range -> 4/2/-2,2/0/0 | 4/2/-2,2/1/0 | 4/2/-2,2/2/0 | 4/2/-2,2/3/0 | 4/2/-2,2/0/1 | 4/2/-2,2/1/1 | 4/2/-2,2/2/1 | 4/2/-2,2/3/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  

Calorimeter/CaloIdentifier/share/LArHEC_SuperCell_ID_test.ref

 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  
@@ -15,7 +14,6 @@ initialize_from_dict :
  region range -> 4/2/-2,2/0/0 | 4/2/-2,2/0/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  

Calorimeter/CaloIdentifier/share/LArMiniFCAL_ID_test.ref

 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  
@@ -15,7 +14,6 @@ initialize_from_dict :
  depth range -> 4/3/-2,2/0/0: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
 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  

Calorimeter/CaloIdentifier/share/TileID_test.ref

 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
 TileNeighbour        INFO Reading file  /afs/cern.ch/work/s/schaffer/public/work-20.x.64bitIdFix_1/InstallArea/share/TileNeighbour_reduced.txt
 test_basic
 [5.1.1.0.0.1.0.0] hex(4480001000000000)

Calorimeter/CaloIdentifier/share/Tile_SuperCell_ID_test.ref

 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
 test_basic
 [5.5.1.0.0.0.0.0] hex(5600000000000000)
 [5.6.1.1.10.2.0.0] hex(5a0d400000000000)

Calorimeter/CaloIdentifier/src/CaloDM_ID.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 "CaloIdentifier/CaloDM_ID.h"
@@ -8,6 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "IdDict/IdDictDefs.h"
 #include "Identifier/IdentifierHash.h"
+#include "Identifier/RangeIterator.h"
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -59,7 +60,7 @@ int CaloDM_ID::eta_min(const Identifier& id) const
       const Range& range = (*zoneRange)[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_minimum()) {
+	if (not eta_field.empty()) {
 	  int etamin = eta_field.get_minimum();
 	  if (-999 == result) {
 	    result = etamin;
@@ -92,7 +93,7 @@ int CaloDM_ID::eta_max(const Identifier& id) const
       const Range& range = (*zoneRange)[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_maximum()) {
+	if (not eta_field.empty()) {
 	  int etamax = eta_field.get_maximum();
 	  if (result < etamax) result = etamax;
 	}
@@ -120,7 +121,7 @@ int CaloDM_ID::phi_min(const Identifier& id) const
       const Range& range = (*zoneRange)[i];
       if (range.match(expId)) {
 	const Range::field& phi_field = range[m_PHI_INDEX];
-	if (phi_field.has_minimum()) {
+	if (not phi_field.empty()) {
 	  int phimin = phi_field.get_minimum();
 	  if (-999 == result) {
 	    result = phimin;
@@ -153,7 +154,7 @@ int CaloDM_ID::phi_max(const Identifier& id) const
       const Range& range = (*zoneRange)[i];
       if (range.match(expId)) {
 	const Range::field& phi_field = range[m_PHI_INDEX];
-	if (phi_field.has_maximum()) {
+	if (not phi_field.empty()) {
 	  int phimax = phi_field.get_maximum();
 	  if (result < phimax) result = phimax;
 	}
@@ -893,8 +894,9 @@ int   CaloDM_ID::init_lar_hashes(void)
   std::set<Identifier> ids;
   for (unsigned int i = 0; i < m_full_lar_zone_range.size(); ++i) {
     const Range& range = m_full_lar_zone_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier zon_id = zone_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -957,8 +959,9 @@ int   CaloDM_ID::init_lar_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_lar_region_range.size(); ++i) {
     const Range& range = m_full_lar_region_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       //     std::cout << "exp_id = " << (std::string)exp_id << std::endl;
@@ -1034,8 +1037,9 @@ int   CaloDM_ID::init_tile_hashes(void)
   std::set<Identifier> ids;
   for (unsigned int i = 0; i < m_full_tile_zone_range.size(); ++i) {
     const Range& range = m_full_tile_zone_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier zon_id = zone_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -1109,8 +1113,9 @@ int   CaloDM_ID::init_tile_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_tile_region_range.size(); ++i) {
     const Range& range = m_full_tile_region_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       //     std::cout << "exp_id = " << (std::string)exp_id << std::endl;

Calorimeter/CaloIdentifier/src/CaloID_Exception.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloIdentifier/CaloID_Exception.h"
@@ -19,7 +19,7 @@ m_message ( lMessage ) , m_code ( lCode )
 void CaloID_Exception::message(const std::string& lMessage) 
 { m_message = lMessage ;}
 
-std::string CaloID_Exception::message() const 
+const std::string& CaloID_Exception::message() const 
 { return m_message;}
 
 void CaloID_Exception::code(int lCode) 

Calorimeter/CaloIdentifier/src/CaloLVL1_ID.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 "CaloIdentifier/CaloLVL1_ID.h"
@@ -8,6 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "IdDict/IdDictDefs.h"
 #include "Identifier/IdentifierHash.h"
+#include "Identifier/RangeIterator.h"
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -454,7 +455,7 @@ int CaloLVL1_ID::eta_min(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_minimum()) {
+	if (not eta_field.empty()) {
 	  int etamin = eta_field.get_minimum();
 	  if (-999 == result) {
 	    result = etamin;
@@ -480,7 +481,7 @@ int CaloLVL1_ID::eta_max(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_maximum()) {
+	if (not eta_field.empty()) {
 	  int etamax = eta_field.get_maximum();
 	  if (result < etamax) result = etamax;
 	}
@@ -501,7 +502,7 @@ int CaloLVL1_ID::phi_max(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& phi_field = range[m_PHI_INDEX];
-	if (phi_field.has_maximum()) {
+	if (not phi_field.empty()) {
 	  int phimax = phi_field.get_maximum();
 	  if (result < phimax) result = phimax;
 	}
@@ -522,7 +523,7 @@ int CaloLVL1_ID::layer_max(const Identifier regId) const
       const Range& range = m_full_layer_range[i];
       if (range.match(expId)) {
 	const Range::field& lay_field = range[m_LAYER_INDEX];
-	if (lay_field.has_maximum()) {
+	if (not lay_field.empty()) {
 	  int laymax = lay_field.get_maximum();
 	  if (result < laymax) result = laymax;
 	}
@@ -951,8 +952,9 @@ int   CaloLVL1_ID::init_hashes(void)
   std::set<Identifier> ids;
   for (unsigned int i = 0; i < m_full_tower_range.size(); ++i) {
     const Range& range = m_full_tower_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier tow_id = tower_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -1015,8 +1017,9 @@ int   CaloLVL1_ID::init_hashes(void)
   for (unsigned int i = 0; i < m_full_layer_range.size(); ++i) 
     {
       const Range& range = m_full_layer_range[i];
-      Range::const_identifier_factory first = range.factory_begin();
-      Range::const_identifier_factory last  = range.factory_end();
+      ConstRangeIterator rit(range);
+      auto first = rit.begin();
+      auto last  = rit.end();
       for (; first != last; ++first) 
 	{
 	  const ExpandedIdentifier& exp_id = (*first);
@@ -1081,8 +1084,9 @@ int   CaloLVL1_ID::init_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_region_range.size(); ++i) {
     const Range& range = m_full_region_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier reg_id = region_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -1152,10 +1156,11 @@ int   CaloLVL1_ID::init_neighbors(void)
   m_next_eta_vec.resize(m_tower_hash_max, NOT_VALID_HASH);
   for (unsigned int i = 0; i < m_full_tower_range.size(); ++i) {
     const Range& range = m_full_tower_range[i];
+    ConstRangeIterator rit(range);
     const Range::field& eta_field = range[m_ETA_INDEX];
     const Range::field& phi_field = range[m_PHI_INDEX];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       ExpandedIdentifier::element_type previous_eta;

Calorimeter/CaloIdentifier/src/JGTowerBase_ID.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 "CaloIdentifier/JGTowerBase_ID.h"
@@ -8,6 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "IdDict/IdDictDefs.h"
 #include "Identifier/IdentifierHash.h"
+#include "Identifier/RangeIterator.h"
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -423,7 +424,7 @@ int JGTowerBase_ID::eta_min(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_minimum()) {
+	if (not eta_field.empty()) {
 	  int etamin = eta_field.get_minimum();
 	  if (-999 == result) {
 	    result = etamin;
@@ -449,7 +450,7 @@ int JGTowerBase_ID::eta_max(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_ETA_INDEX];
-	if (eta_field.has_maximum()) {
+	if (not eta_field.empty()) {
 	  int etamax = eta_field.get_maximum();
 	  if (result < etamax) result = etamax;
 	}
@@ -470,7 +471,7 @@ int JGTowerBase_ID::phi_max(const Identifier regId) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& phi_field = range[m_PHI_INDEX];
-	if (phi_field.has_maximum()) {
+	if (not phi_field.empty()) {
 	  int phimax = phi_field.get_maximum();
 	  if (result < phimax) result = phimax;
 	}
@@ -862,8 +863,9 @@ int   JGTowerBase_ID::init_hashes(void)
   std::set<Identifier> ids;
   for (unsigned int i = 0; i < m_full_tower_range.size(); ++i) {
     const Range& range = m_full_tower_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier tow_id = tower_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -924,8 +926,9 @@ int   JGTowerBase_ID::init_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_reg_range.size(); ++i) {
     const Range& range = m_full_reg_range[i];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       Identifier reg_id = region_id   ( exp_id[m_DETZSIDE_INDEX],
@@ -997,8 +1000,9 @@ int   JGTowerBase_ID::init_neighbors(void)
     const Range& range = m_full_tower_range[i];
     const Range::field& eta_field = range[m_ETA_INDEX];
     const Range::field& phi_field = range[m_PHI_INDEX];
-    Range::const_identifier_factory first = range.factory_begin();
-    Range::const_identifier_factory last  = range.factory_end();
+    ConstRangeIterator rit(range);
+    auto first = rit.begin();
+    auto last  = rit.end();
     for (; first != last; ++first) {
       const ExpandedIdentifier& exp_id = (*first);
       ExpandedIdentifier::element_type previous_eta;