Merge branch 'larbytestraem_constfixes' into 'master'

LArByteStream: const fixes for Hid2RESrcID

See merge request atlas/athena!21525

LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Hid2RESrcID.h

@@ -45,27 +45,27 @@ public:
 
   StatusCode initialize(); 
 
-  bool isInitialized(){ return m_initialized;} 
+  bool isInitialized() const { return m_initialized;}
 
   /** make a ROD SrcID for a HWIdentifier 
   */ 
-  uint32_t getRodID  (const HWIdentifier& hid); 
+  uint32_t getRodID  (const HWIdentifier& hid) const ;
 
   /** make a ROD SrcID for a COLLECTION_ID
   */ 
-  uint32_t getRodIDFromROM  (const COLLECTION_ID& hid); 
+  uint32_t getRodIDFromROM  (const COLLECTION_ID& hid) const;
 
   /** Make a ROB Source ID from a ROD source ID
   */ 
-  uint32_t getRobID  ( uint32_t rod_id); 
+  uint32_t getRobID  ( uint32_t rod_id) const;
 
   /** Make a ROS Source ID from a ROB source ID
   */ 
-  uint32_t getRosID  ( uint32_t rob_id); 
+  uint32_t getRosID  ( uint32_t rob_id) const;
 
   /** Make a SubDetector ID from ROS source ID 
   */
-  uint32_t getDetID  ( uint32_t ros_id); 
+  uint32_t getDetID  ( uint32_t ros_id) const;
 
 private: 
   bool m_initialized;

LArCalorimeter/LArCnv/LArByteStream/src/Hid2RESrcID.cxx

@@ -99,7 +99,7 @@ StatusCode Hid2RESrcID::initialize()
       SourceIdentifier sid = SourceIdentifier(detid,m); 
       uint32_t rod_id =  sid.code(); 
 
-      assert( m_coll2ROD.count(mId) == 0 )  ; 
+      assert( m_coll2ROD.count(mId) == 0 );
       m_coll2ROD[ mId ]=rod_id;        
 
     } 
@@ -111,7 +111,7 @@ StatusCode Hid2RESrcID::initialize()
 }
 
 
-uint32_t  Hid2RESrcID::getRodIDFromROM(const COLLECTION_ID& id)
+uint32_t  Hid2RESrcID::getRodIDFromROM(const COLLECTION_ID& id) const
 { // this method returns a RESrcID for the ROD, for a given COLLECTION_ID
 
   COLL_MAP::const_iterator it = m_coll2ROD.find( id ); 
@@ -124,7 +124,7 @@ uint32_t  Hid2RESrcID::getRodIDFromROM(const COLLECTION_ID& id)
 }
 
 
-uint32_t  Hid2RESrcID::getRodID(const HWIdentifier& hid)
+uint32_t  Hid2RESrcID::getRodID(const HWIdentifier& hid) const
 { // this method returns a RESrcID for the ROD, for a given LArOnlineID
   // channel number is ignored.
   HWIdentifier febId =  m_onlineHelper->feb_Id(hid) ;
@@ -136,36 +136,36 @@ uint32_t  Hid2RESrcID::getRodID(const HWIdentifier& hid)
 
 /** mapping SrcID from ROD to ROB
  */ 
-uint32_t Hid2RESrcID::getRobID( uint32_t rod_id)
+uint32_t Hid2RESrcID::getRobID( uint32_t rod_id) const
 {
 //  Change Module Type to ROB 
 
- SourceIdentifier  id  = SourceIdentifier(rod_id)         ; 
- SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), id.module_id()) ; 
- return    id2.code()                  ;
+ SourceIdentifier  id  = SourceIdentifier(rod_id);
+ SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), id.module_id());
+ return    id2.code();
 
 }
 
 
 /** mapping SrcID from ROB to ROS
  */ 
-uint32_t Hid2RESrcID::getRosID( uint32_t rob_id)
+uint32_t Hid2RESrcID::getRosID( uint32_t rob_id) const
 {
 //  Change Module Type to ROS, moduleid = 0  
 
  SourceIdentifier  id  = SourceIdentifier(rob_id);
- SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), 0)      ; 
- return    id2.code()       ; 
+ SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), 0);
+ return    id2.code();
 
 }
 
 /** mapping SrcID from ROS to Det
  */ 
-uint32_t Hid2RESrcID::getDetID  ( uint32_t ros_id) 
+uint32_t Hid2RESrcID::getDetID  ( uint32_t ros_id) const
 {
 //  ROS to DET
 
  SourceIdentifier  id  = SourceIdentifier(ros_id);
- SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), 0) ; 
- return    id2.code() ; 
+ SourceIdentifier  id2 = SourceIdentifier(id.subdetector_id(), 0);
+ return    id2.code();
 }

Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/LArCellCont.h

@@ -90,7 +90,7 @@ private:
 	/** Hash ID Identifier mapping to collection index. */
 	LArRodIdHash m_hash;
 	/** Hardware to Source ID conversion */
-	mutable Hid2RESrcID m_conv;
+	Hid2RESrcID m_conv;
 	/** FEB Hardware Identifier for second FEBs in a
 	    Collection */
 	std::vector<HWIdentifier> m_second;