Calorimeter/CaloIdentifier/src/LArEM_Base_ID.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file CaloIdentifier/src/LArEM_Base_ID.cxx
@@ -23,16 +23,6 @@ LArEM_Base_ID::LArEM_Base_ID (const std::string& name, bool supercell)
   : CaloIDHelper (name),
     m_slar (supercell ? 1 : 0)
 {
-  m_REGION_INDEX = 999;
-  m_ETA_INDEX = 999;
-  m_PHI_INDEX = 999;
-  m_SLAR_INDEX = 999;
-  m_LAR_INDEX = 999;
-  m_EM_INDEX = 999;
-  m_BEC_INDEX = 999;
-  m_SAMPLING_INDEX = 999;
-  m_em_region_index = 0;
-  m_two_sym_sides = 1;
 }
 
 
@@ -59,7 +49,7 @@ int LArEM_Base_ID::eta_min(const Identifier regId) const
       const Range& range = m_full_em_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;
@@ -85,7 +75,7 @@ int LArEM_Base_ID::eta_max(const Identifier regId) const
       const Range& range = m_full_em_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;
 	}
@@ -106,7 +96,7 @@ int LArEM_Base_ID::phi_min_init(const Identifier regId) const
       const Range& range = m_full_em_range[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;
@@ -132,7 +122,7 @@ int LArEM_Base_ID::phi_max(const Identifier regId) const
       const Range& range = m_full_em_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;
 	}

Calorimeter/CaloIdentifier/src/LArFCAL_Base_ID.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloIdentifier/LArFCAL_Base_ID.h"
@@ -19,15 +19,6 @@ LArFCAL_Base_ID::LArFCAL_Base_ID(const std::string& name, bool supercell)
   : CaloIDHelper (name),
     m_slar (supercell ? 1 : 0)
 {
-  m_fcal_region_index = 0;
-  m_LAR_INDEX = 999;
-  m_SLAR_INDEX = 999;
-  m_FCAL_INDEX = 999;
-  m_POSNEG_INDEX = 999;
-  m_MODULE_INDEX = 999; 
-  m_ETA_INDEX = 999;
-  m_PHI_INDEX = 999;
-  m_two_sym_sides = 1;
 }
 
 
@@ -46,7 +37,7 @@ int LArFCAL_Base_ID::eta_min(const Identifier modId) const
       const Range& range = m_full_channel_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;
@@ -72,7 +63,7 @@ int LArFCAL_Base_ID::eta_max(const Identifier modId) const
       const Range& range = m_full_channel_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;
 	}
@@ -93,7 +84,7 @@ int LArFCAL_Base_ID::phi_min_init(const Identifier modId) const
       const Range& range = m_full_channel_range[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;
@@ -119,7 +110,7 @@ int LArFCAL_Base_ID::phi_max(const Identifier modId) const
       const Range& range = m_full_channel_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;
 	}
@@ -610,7 +601,7 @@ int         LArFCAL_Base_ID::init_neighbours_from_file(const std::string& filena
   log << MSG::DEBUG << "init_neighbours_from_file" << endmsg;
   // Find the full path to filename:
   std::string file = PathResolver::find_file (filename, "DATAPATH");
-  log << MSG::INFO << "Reading file " << file << endmsg;
+  log << MSG::DEBUG << "Reading file " << file << endmsg;
   std::ifstream fin;
   if (!file.empty()) {
     fin.open(file.c_str());

Calorimeter/CaloIdentifier/src/LArHEC_Base_ID.cxx

@@ -79,7 +79,7 @@ int LArHEC_Base_ID::eta_min(const Identifier regId) const
       const Range& range = m_full_channel_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;
@@ -105,7 +105,7 @@ int LArHEC_Base_ID::eta_max(const Identifier regId) const
       const Range& range = m_full_channel_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;
 	}
@@ -126,7 +126,7 @@ int LArHEC_Base_ID::phi_min_init(const Identifier regId) const
       const Range& range = m_full_channel_range[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;
@@ -152,7 +152,7 @@ int LArHEC_Base_ID::phi_max(const Identifier regId) const
       const Range& range = m_full_channel_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;
 	}

Calorimeter/CaloIdentifier/src/LArMiniFCAL_ID.cxx

@@ -52,7 +52,7 @@ int LArMiniFCAL_ID::eta_min(const Identifier modId) const
       const Range& range = m_full_channel_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;
@@ -78,7 +78,7 @@ int LArMiniFCAL_ID::eta_max(const Identifier modId) const
       const Range& range = m_full_channel_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;
 	}
@@ -99,7 +99,7 @@ int LArMiniFCAL_ID::phi_min_init(const Identifier modId) const
       const Range& range = m_full_channel_range[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;
@@ -125,7 +125,7 @@ int LArMiniFCAL_ID::phi_max(const Identifier modId) const
       const Range& range = m_full_channel_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;
 	}

Calorimeter/CaloIdentifier/src/TTOnlineID.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/TTOnlineID.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>
@@ -524,8 +525,9 @@ int  TTOnlineID::init_hashes(void)
 	  std::set<HWIdentifier> ids;
 	  for (unsigned int i = 0; i < m_full_crate_range.size(); ++i) {
 	    const Range& range = m_full_crate_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);
 	      HWIdentifier cra_id = crateId( exp_id[m_crate_index] ) ;
@@ -587,8 +589,9 @@ int  TTOnlineID::init_hashes(void)
 	  std::set<HWIdentifier> ids;
 	  for (unsigned int i = 0; i < m_full_module_range.size(); ++i) {
 	    const Range& range = m_full_module_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);
 	      HWIdentifier mod_id = moduleId(exp_id[m_crate_index], exp_id[m_module_index] ) ;
@@ -650,8 +653,9 @@ int  TTOnlineID::init_hashes(void)
 	  std::set<HWIdentifier> ids;
 	  for (unsigned int i = 0; i < m_full_submodule_range.size(); ++i) {
 	    const Range& range = m_full_submodule_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);
 	      HWIdentifier submod_id = submoduleId(exp_id[m_crate_index], exp_id[m_module_index], exp_id[m_submodule_index] ) ;
@@ -714,8 +718,9 @@ int  TTOnlineID::init_hashes(void)
 	  std::set<HWIdentifier> ids;
 	  for (unsigned int i = 0; i < m_full_channel_range.size(); ++i) {
 	    const Range& range = m_full_channel_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);
 	      HWIdentifier chan_id = channelId(exp_id[m_crate_index], exp_id[m_module_index], exp_id[m_submodule_index], exp_id[m_channel_index]) ;

Calorimeter/CaloIdentifier/src/TileNeighbour.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
 */
 
 /***************************************************************************
@@ -67,7 +67,7 @@ int TileNeighbour::initialize(const Tile_Base_ID* tileID, const std::string& fil
 
   // Find the full path to filename:
   std::string file = PathResolver::find_file (filename, "DATAPATH");
-  log << MSG::INFO << "Reading file  " << file << endmsg;
+  log << MSG::DEBUG << "Reading file  " << file << endmsg;
   std::ifstream fin;
   if (!file.empty()) {
     fin.open(file.c_str());
@@ -171,8 +171,9 @@ int TileNeighbour::initialize(const Tile_Base_ID* tileID, const std::string& fil
   ids.clear();
   for (unsigned int i = 0; i < tileID->m_full_cell_range.size(); ++i) {
     const Range& range = tileID->m_full_cell_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);
       phi = exp_id[tileID->m_MODULE_INDEX];

Calorimeter/CaloIdentifier/src/TileTBID.cxx

@@ -13,6 +13,7 @@
 #include "CaloIdentifier/TileTBID.h"
 #include "IdDict/IdDictDefs.h"
 #include "Identifier/IdentifierHash.h"
+#include "Identifier/RangeIterator.h"
 #include "CxxUtils/StrFormat.h"
 #include "GaudiKernel/MsgStream.h"
 
@@ -609,8 +610,9 @@ int TileTBID::init_hashes(void)
   std::set<Identifier> ids;
   for (unsigned int i = 0; i < m_full_type_range.size(); ++i) {
     const Range& range = m_full_type_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 id = type_id (exp_id[m_TYPE_INDEX]);
@@ -631,8 +633,9 @@ int TileTBID::init_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_module_range.size(); ++i) {
     const Range& range = m_full_module_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 id = module_id (exp_id[m_TYPE_INDEX], 
@@ -654,8 +657,9 @@ int TileTBID::init_hashes(void)
   ids.clear();
   for (unsigned int i = 0; i < m_full_channel_range.size(); ++i) {
     const Range& range = m_full_channel_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 id = channel_id    (exp_id[m_TYPE_INDEX], 

Calorimeter/CaloIdentifier/src/Tile_Base_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
 */
 
 // $Id$
@@ -1506,7 +1506,7 @@ int Tile_Base_ID::eta_min(const Identifier& id, const IdContext& context) const
       const Range& range = m_full_tower_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_TOWER_INDEX];
-	if (eta_field.has_minimum()) {
+	if (not eta_field.empty()) {
 	  int etamin = eta_field.get_minimum();
 	  if (-999 == result) {
 	    result = etamin;
@@ -1531,7 +1531,7 @@ int Tile_Base_ID::eta_max(const Identifier& id, const IdContext& context) const
       const Range& range = m_full_cell_range[i];
       if (range.match(expId)) {
 	const Range::field& eta_field = range[m_TOWER_INDEX];
-	if (eta_field.has_maximum()) {
+	if (not eta_field.empty()) {
 	  int etamax = eta_field.get_maximum();
 	  if (result < etamax) result = etamax;
 	}
@@ -1576,7 +1576,7 @@ int Tile_Base_ID::phi_max(const Identifier& id) const
       const Range& range = m_full_cell_range[i];
       if (range.match(expId)) {
 	const Range::field& phi_field = range[m_MODULE_INDEX];
-	if (phi_field.has_maximum()) {
+	if (not phi_field.empty()) {
 	  int phimax = phi_field.get_maximum();
 	  if (result < phimax) result = phimax;
 	}
@@ -1824,12 +1824,12 @@ int Tile_Base_ID::get_neighbours(const IdentifierHash& id_orig, const LArNeighbo
 
   } else if (corners2DOnly) {
     // neighbours of phi-neigbours are 2D corners
-    inpList = neighbourList; // copy 2 phi neighbours to input list 
+    inpList = std::move(neighbourList); // copy 2 phi neighbours to input list 
     neighbourList.clear();   // and clear neighbour list
 
   } else if ( (option & all2D) == all2D) {
     // copy all neighbours to input list
-    std::copy(neighbourList.begin(), neighbourList.end(), std::back_inserter(inpList));
+    inpList.insert (inpList.end(), neighbourList.begin(), neighbourList.end());
 
   }
   

Calorimeter/CaloIdentifier/test/calocell_id_test_common.cxx

@@ -638,7 +638,7 @@ void test_regions (const CaloCell_Base_ID& calo_id)
     assert (regId1 == regId);
 
     int subcalo = calo_id.sub_calo(regId);
-
+    if (subcalo == CaloIDHelper::NOT_VALID) std::abort();
     IdentifierHash min=0, max=0;
     calo_id.calo_reg_hash_range(regId, min, max);
     IdentifierHash min2=0, max2=0;

Calorimeter/CaloIdentifier/test/test_lvl1_id.cxx

@@ -28,10 +28,6 @@ test_id(const CaloLVL1_ID& idh, Identifier id)
     if(idh.is_lar_fcal	(id)) std::cout << "is_lar_fcal" << std::endl;
     if(idh.is_lar_dm	(id)) std::cout << "is_lar_dm" << std::endl;
     if(idh.is_tile_dm	(id)) std::cout << "is_tile_dm" << std::endl;
-    if(idh.is_mdt	(id)) std::cout << "is_mdt" << std::endl;
-    if(idh.is_csc	(id)) std::cout << "is_csc" << std::endl;
-    if(idh.is_tgc	(id)) std::cout << "is_tgc" << std::endl;
-    if(idh.is_rpc	(id)) std::cout << "is_rpc" << std::endl;
 }
 
 static void
@@ -115,21 +111,6 @@ check_lvl1_id_decoding(IdDictMgr& idd)
     std::cout << "id                  " << lvl1_id.show_to_string(id) << std::endl;
     test_id(lvl1_id, id);
 
-    id = lvl1_id.mdt();
-    std::cout << "id                  " << lvl1_id.show_to_string(id) << std::endl;
-    test_id(lvl1_id, id);
-
-    id = lvl1_id.csc();
-    std::cout << "id                  " << lvl1_id.show_to_string(id) << std::endl;
-    test_id(lvl1_id, id);
-
-    id = lvl1_id.rpc();
-    std::cout << "id                  " << lvl1_id.show_to_string(id) << std::endl;
-    test_id(lvl1_id, id);
-
-    id = lvl1_id.tgc();
-    std::cout << "id                  " << lvl1_id.show_to_string(id) << std::endl;
-    test_id(lvl1_id, id);
 }
 
 static void