Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/versions/CTrigAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/versions/CTrigAuxContainer_v1.h
  * @author scott snyder <snyder@bnl.gov>
@@ -35,8 +32,8 @@ public:
 
 
 private:
-  std::vector<int> anInt;
-  std::vector<float> aFloat;
+  AUXVAR_DECL (int, anInt);
+  AUXVAR_DECL (float, aFloat);
 };
 
 

Control/DataModelTest/DataModelTestDataCommon/src/CAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/src/CAuxContainer_v1.xcx
  * @author scott snyder <snyder@bnl.gov>
@@ -31,13 +29,6 @@ namespace DMTest {
 CAuxContainer_v1::CAuxContainer_v1()
   : xAOD::AuxContainerBase()
 {
-  AUX_VARIABLE (anInt);
-  AUX_VARIABLE (aFloat);
-  AUX_VARIABLE (pInt);
-  AUX_VARIABLE (pFloat);
-  AUX_VARIABLE (pvInt);
-  AUX_VARIABLE (pvFloat);
-
   if (!pInt.setOption (SG::AuxDataOption ("nbits", 17)) ||
       !pFloat.setOption (SG::AuxDataOption ("nbits", 17)) || 
       !pFloat.setOption (SG::AuxDataOption ("signed", 0)) ||

Control/DataModelTest/DataModelTestDataCommon/src/CInfoAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/src/CInfoAuxContainer_v1.xcx
  * @author scott snyder <snyder@bnl.gov>
@@ -20,8 +18,6 @@ namespace DMTest {
 CInfoAuxContainer_v1::CInfoAuxContainer_v1()
   : xAOD::AuxInfoBase()
 {
-  AUX_VARIABLE (anInt);
-  AUX_VARIABLE (aFloat);
 }
 
 

Control/DataModelTest/DataModelTestDataCommon/src/CLinksAuxContainer_v1.cxx

 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file DataModelTestDataCommon/src/CLinksAuxContainer_v1.cxx
@@ -18,8 +18,6 @@ namespace DMTest {
 CLinksAuxContainer_v1::CLinksAuxContainer_v1()
   : xAOD::AuxContainerBase()
 {
-  AUX_VARIABLE (link);
-  AUX_VARIABLE (links);
 }
 
 

Control/DataModelTest/DataModelTestDataCommon/src/CLinksAuxInfo_v1.cxx

 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file DataModelTestDataCommon/src/CLinksAuxInfo_v1.cxx
@@ -18,8 +18,6 @@ namespace DMTest {
 CLinksAuxInfo_v1::CLinksAuxInfo_v1()
   : xAOD::AuxInfoBase()
 {
-  AUX_VARIABLE (link);
-  AUX_VARIABLE (links);
 }
 
 

Control/DataModelTest/DataModelTestDataCommon/src/CTrigAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataCommon/src/CTrigAuxContainer_v1.xcx
  * @author scott snyder <snyder@bnl.gov>
@@ -20,8 +18,6 @@ namespace DMTest {
 CTrigAuxContainer_v1::CTrigAuxContainer_v1()
   : xAOD::ByteStreamAuxContainer_v1()
 {
-  AUX_VARIABLE (anInt);
-  AUX_VARIABLE (aFloat);
 }
 
 

Event/PyDumper/python/Dumpers.py

@@ -30,6 +30,7 @@ from math import \
 
 from AthenaPython import PyAthena
 from PyUtils.fprint import fprint, fprintln, fwrite
+from PyDumper import PDG
 import ROOT
 import cppyy
 
@@ -2796,7 +2797,7 @@ def _genvertex_particles_out_size(e):
     return e.particles_out().size()
 
 
-def barcodes (beg, end, sz, f):
+def barcodes (beg, end, sz):
     #out = [x.barcode() for x in toiter (beg, end)]
 
     # Work around pyroot iterator comparison breakage.
@@ -2808,9 +2809,25 @@ def barcodes (beg, end, sz, f):
         out.append (x.barcode())
 
     out.sort()
-    for i in out:
-        fprint (f, i)
-    return
+    return out
+def genvertex_in_barcodes(v):
+    if hasattr(v, 'particles_in_const_begin'):
+        parts = barcodes(v.particles_in_const_begin(),
+                         v.particles_in_const_end(),
+                         v.particles_in_size())
+    else:
+        parts = [_gen_barcode(p) for p in v.particles_in()]
+        parts.sort()
+    return parts
+def genvertex_out_barcodes(v):
+    if hasattr(v, 'particles_out_const_begin'):
+        parts = barcodes(v.particles_out_const_begin(),
+                         v.particles_out_const_end(),
+                         v.particles_out_size())
+    else:
+        parts = [_gen_barcode(p) for p in v.particles_out()]
+        parts.sort()
+    return parts
 def dump_GenVertex (v, f):
     fprint (f, "%d %d %d %d %d" %
             (v.status() if hasattr(v,'status') else v.id(),
@@ -2828,42 +2845,38 @@ def dump_GenVertex (v, f):
         ww = list(v.weights())
     fprintln (f, [w for w in ww])
     fprint (f, '     (')
-    if hasattr(v, 'particles_in_const_begin'):
-        barcodes(v.particles_in_const_begin(),
-                 v.particles_in_const_end(),
-                 v.particles_in_size(), f)
-    else:
-        parts = [_gen_barcode(p) for p in v.particles_in()]
-        parts.sort()
-        for bc in parts:
-            fprint (f, bc)
+    for bc in genvertex_in_barcodes(v):
+        fprint (f, bc)
     fprint (f, ')(')
-    if hasattr(v, 'particles_out_const_begin'):
-        barcodes(v.particles_out_const_begin(),
-                 v.particles_out_const_end(),
-                 v.particles_out_size(), f)
-    else:
-        parts = [_gen_barcode(p) for p in v.particles_out()]
-        parts.sort()
-        for bc in parts:
-            fprint (f, bc)
+    for bc in genvertex_out_barcodes(v):
+        fprint (f, bc)
     fprint (f, ')')
 
     return
 
 
 def dump_GenParticle (p, f):
-    fprint (f, "%d %d %d %d" %
+    fprint (f, "%d %5s %d %d" %
             (_gen_barcode(p),
-             p.pdg_id(),
+             PDG.pdgid_to_name(p.pdg_id()),
              p.parent_event().event_number(),
              p.status(),))
     if p.production_vertex():
-        fprint (f, _gen_barcode (p.production_vertex()))
+        s = str(_gen_barcode (p.production_vertex())) + '('
+        parts = genvertex_in_barcodes (p.production_vertex())
+        for bc in parts: s += '%d ' % bc
+        if len(parts) > 3: s += '...'
+        s += '->)'
+        fprint (f, s)
     else:
         fprint (f, None)
     if p.end_vertex():
-        fprint (f, _gen_barcode (p.end_vertex()))
+        s = str (_gen_barcode (p.end_vertex())) + '(->'
+        parts = genvertex_out_barcodes (p.end_vertex())
+        for bc in parts: s += '%d ' % bc
+        if len(parts) > 3: s += '...'
+        s += ')'
+        fprint (f, s)
     else:
         fprint (f, None)
     dump_HLV (p.momentum(), f)

Event/xAOD/xAODForward/Root/AFPTrack_v1.cxx

@@ -28,7 +28,7 @@ namespace xAOD
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, xSlope, setXSlope)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, ySlope, setYSlope)
   // AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1,  float, zSlope, setZSlope)
-  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, nHoles, setNHoles)
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, unsigned int, nHoles, setNHoles)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, nHits, setNHits)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, chi2, setChi2)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, algID, setAlgID)

Event/xAOD/xAODForward/Root/AFPTrack_v2.cxx

@@ -27,7 +27,7 @@ namespace xAOD
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, zLocal, setZLocal)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, xSlope, setXSlope)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, ySlope, setYSlope)
-  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, nHoles, setNHoles)
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, unsigned int, nHoles, setNHoles)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, nClusters, setNClusters)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, chi2, setChi2)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, algID, setAlgID)

Event/xAOD/xAODForward/xAODForward/versions/AFPTrackAuxContainer_v1.h

@@ -44,7 +44,7 @@ namespace xAOD {
     std::vector< float > xSlope;
     std::vector< float > ySlope;
     // float zSlope() const;
-    std::vector< int > nHoles;
+    std::vector< unsigned int > nHoles;
     std::vector< int > nHits;
     std::vector< std::vector<AFPTrack_v1::AFPHitLink_t> > hits;
     std::vector< float > chi2;

Event/xAOD/xAODForward/xAODForward/versions/AFPTrackAuxContainer_v2.h

@@ -43,7 +43,7 @@ namespace xAOD {
     std::vector< float > zLocal;
     std::vector< float > xSlope;
     std::vector< float > ySlope;
-    std::vector< int > nHoles;
+    std::vector< unsigned int > nHoles;
     std::vector< int > nClusters;
     std::vector< std::vector<AFPTrack_v2::AFPClusterLink_t> > clusters;
     std::vector< float > chi2;

Event/xAOD/xAODForward/xAODForward/versions/AFPTrack_v1.h

@@ -159,7 +159,7 @@ namespace xAOD {
      *
      * @return Number of empty pixels that the track passes through
      */
-    int nHoles() const;
+    unsigned int nHoles() const;
 
 
     /** 
@@ -169,7 +169,7 @@ namespace xAOD {
      *
      * @param nHoles number of empty pixels that the track passes through
      */
-    void setNHoles (int nHoles);
+    void setNHoles (unsigned int nHoles);
 
 
     /** 

Event/xAOD/xAODForward/xAODForward/versions/AFPTrack_v2.h

@@ -155,7 +155,7 @@ namespace xAOD {
      *
      * @return Number of empty pixels that the track passes through
      */
-    int nHoles() const;
+    unsigned int nHoles() const;
 
     /** 
      * @brief Set number of empty pixels that the track passes through.
@@ -164,7 +164,7 @@ namespace xAOD {
      *
      * @param nHoles number of empty pixels that the track passes through
      */
-    void setNHoles (int nHoles);
+    void setNHoles (unsigned int nHoles);
 
     /** 
      * @brief Number of clusters used to reconstruct the track.

ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcMCTruthAlg.h

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ZdcMCTruthAlg_H
@@ -21,7 +21,7 @@ class ZdcMCTruthAlg : public AthAlgorithm {
 
 public:
 
-    ZdcMCTruthAlg(std::string name, ISvcLocator* pSvcLocator);
+    ZdcMCTruthAlg(const std::string& name, ISvcLocator* pSvcLocator);
 
     virtual ~ZdcMCTruthAlg();
 

ForwardDetectors/ZDC/ZdcRec/src/ZdcMCTruthAlg.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 "ZdcRec/ZdcMCTruthAlg.h"
@@ -8,7 +8,7 @@
 #include "ZdcConditions/ZdcLucrodMapRun3.h"
 #include <AsgDataHandles/WriteDecorHandle.h>
 
-ZdcMCTruthAlg::ZdcMCTruthAlg(std::string name, ISvcLocator* pSvcLocator)
+ZdcMCTruthAlg::ZdcMCTruthAlg(const std::string& name, ISvcLocator* pSvcLocator)
    : AthAlgorithm(name, pSvcLocator),
      m_zdcID(nullptr)
 {

InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx

@@ -663,28 +663,13 @@ void TRTDetectorFactory_Full::create(GeoPhysVol *world)
 
     pCoolingTube->add(pCoolingFluid);
 
-    double activeGasZPositionNormalStraws, activeGasZPositionStrawsWithLargeDeadRegion;
-	//AALONSO, create the Argon Straws
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStrawAR;
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStrawWithLargeDeadRegionAR;
-    if (m_doArgon)
-      {
-      pHoleForMixedStrawAR                    = makeStraw(activeGasZPositionNormalStraws, false, GM_ARGON);
-      pHoleForMixedStrawWithLargeDeadRegionAR = makeStraw(activeGasZPositionStrawsWithLargeDeadRegion,true, GM_ARGON);
-      }
-    // and krypton straws
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStrawKR;
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStrawWithLargeDeadRegionKR;
-    if (m_doKrypton)
-      {
-      pHoleForMixedStrawKR                    = makeStraw(activeGasZPositionNormalStraws, false, GM_KRYPTON);
-      pHoleForMixedStrawWithLargeDeadRegionKR = makeStraw(activeGasZPositionStrawsWithLargeDeadRegion,true, GM_KRYPTON);
-      }
+    double lengthOfInnerDeadRegion= m_data->lengthOfDeadRegion;
+    double lengthOfActiveGas = (m_data->barrelLengthOfStraw-m_data->barrelLengthOfTwister)/2.0 - m_data->lengthOfDeadRegion - lengthOfInnerDeadRegion;
+    double activeGasZPositionNormalStraws = (lengthOfActiveGas + m_data->barrelLengthOfTwister) / 2. + lengthOfInnerDeadRegion;
 
-    // The barrel straw (including the "hole" in the radiator around it):
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStraw = makeStraw(activeGasZPositionNormalStraws);
-    // The straws in the inner layers of module A have a large dead region, and are thus different.
-    GeoNodePtr<GeoPhysVol> pHoleForMixedStrawWithLargeDeadRegion = makeStraw(activeGasZPositionStrawsWithLargeDeadRegion,true);
+    lengthOfInnerDeadRegion = m_data->barrelLengthOfLargeDeadRegion;
+    lengthOfActiveGas = (m_data->barrelLengthOfStraw-m_data->barrelLengthOfTwister)/2.0 - m_data->lengthOfDeadRegion - lengthOfInnerDeadRegion;
+    double activeGasZPositionStrawsWithLargeDeadRegion = (lengthOfActiveGas + m_data->barrelLengthOfTwister) / 2. + lengthOfInnerDeadRegion;
   
     // The modules themselves.
     for (size_t iABC=0;iABC<m_data->nBarrelRings;iABC++) {
@@ -737,37 +722,14 @@ void TRTDetectorFactory_Full::create(GeoPhysVol *world)
       if (!radMat) radMat = m_materialManager->getMaterial("trt::FibreRadiator");
 
       lRad = new GeoLogVol(radName, sRad, radMat);
-      GeoNodePtr<GeoPhysVol> pRad(new GeoPhysVol(lRad));
-      GeoNodePtr<GeoPhysVol> pRadAR(m_doArgon   ? new GeoPhysVol(lRad) : nullptr );
-      GeoNodePtr<GeoPhysVol> pRadKR(m_doKrypton ? new GeoPhysVol(lRad) : nullptr);
 
       //---------------------------------------------------------------------------------------------------------------
       // Place the cooling tubes in the Radiator
-
       GeoTransform  *xCool1 = new GeoTransform(shellPosition.inverse()
 					       *GeoTrf::Translate3D(m_data->barrelXOfCoolingTube[iABC][0],m_data->barrelYOfCoolingTube[iABC][0],0));
       GeoTransform  *xCool2 = new GeoTransform(shellPosition.inverse()
 					       *GeoTrf::Translate3D(m_data->barrelXOfCoolingTube[iABC][1],m_data->barrelYOfCoolingTube[iABC][1],0));
 
-      pRad->add(xCool1);
-      pRad->add(pCoolingTube);
-      pRad->add(xCool2);
-      pRad->add(pCoolingTube);
-      if (m_doArgon)
-        {
-        pRadAR->add(xCool1);
-        pRadAR->add(pCoolingTube);
-        pRadAR->add(xCool2);
-        pRadAR->add(pCoolingTube);
-        }
-      if (m_doKrypton)
-        {
-        pRadKR->add(xCool1);
-        pRadKR->add(pCoolingTube);
-        pRadKR->add(xCool2);
-        pRadKR->add(pCoolingTube);
-        }
-
       //----------------------------------------------------------------------------------------------------------------
       // Parameterize all of the straws and put them within the radiator.
 
@@ -840,46 +802,7 @@ void TRTDetectorFactory_Full::create(GeoPhysVol *world)
       } else {
 	m_detectorManager->setBarrelTransformField(iABC,tx2.clone());
       }
-	//AALONSO
-      GeoSerialTransformer *serialTransformer = nullptr;
-      GeoSerialTransformer *serialTransformerAR = nullptr;  //Ruslan
-      GeoSerialTransformer *serialTransformerKR = nullptr;  //Artem
-
-      serialTransformer     = new GeoSerialTransformer(pHoleForMixedStraw,   &tx2, m_data->barrelNumberOfStrawsInModule[iABC]-nStrawsWithLargeDeadRegion);
-      if (m_doArgon) {
-        serialTransformerAR = new GeoSerialTransformer(pHoleForMixedStrawAR, &tx2, m_data->barrelNumberOfStrawsInModule[iABC]-nStrawsWithLargeDeadRegion);
-      }
-      if (m_doKrypton) {
-        serialTransformerKR = new GeoSerialTransformer(pHoleForMixedStrawKR, &tx2, m_data->barrelNumberOfStrawsInModule[iABC]-nStrawsWithLargeDeadRegion);
-      }
-
-
-      GeoNodePtr<GeoSerialTransformer> serialTransformerDead;
-      GeoNodePtr<GeoSerialTransformer> serialTransformerDeadAR;
-      GeoNodePtr<GeoSerialTransformer> serialTransformerDeadKR;
-      serialTransformerDead     = new GeoSerialTransformer(pHoleForMixedStrawWithLargeDeadRegion  , &tx2Dead,
-								      nStrawsWithLargeDeadRegion);
-      if (m_doArgon)
-        serialTransformerDeadAR = new GeoSerialTransformer(pHoleForMixedStrawWithLargeDeadRegionAR, &tx2Dead,
-                      nStrawsWithLargeDeadRegion);
-      if (m_doKrypton)
-        serialTransformerDeadKR = new GeoSerialTransformer(pHoleForMixedStrawWithLargeDeadRegionKR, &tx2Dead,
-                      nStrawsWithLargeDeadRegion);
-
-     
       
-      pRad->add(new GeoSerialIdentifier(0));
-      if (m_doArgon  ) pRadAR->add(new GeoSerialIdentifier(0));
-      if (m_doKrypton) pRadKR->add(new GeoSerialIdentifier(0));
-      if (iABC==0) {
-        pRad->add(serialTransformerDead);
-        if (m_doArgon  ) pRadAR->add(serialTransformerDeadAR);
-        if (m_doKrypton) pRadKR->add(serialTransformerDeadKR);
-      }
-      pRad->add(serialTransformer);
-      if (m_doArgon  ) pRadAR->add(serialTransformerAR);
-      if (m_doKrypton) pRadKR->add(serialTransformerKR);
-
       // Adds one straw from each layer (reformulate..) (should be done via m_data from database)
       double oldx=-999*GeoModelKernelUnits::cm, oldz=-999*GeoModelKernelUnits::cm;
       unsigned int c=0;
@@ -961,24 +884,36 @@ void TRTDetectorFactory_Full::create(GeoPhysVol *world)
 	if (m_strawsvcavailable && (m_doArgon || m_doKrypton)) strawStatusHT = m_sumTool->getStatusHT(TRT_Identifier);
 	ActiveGasMixture agm = DecideGasMixture(strawStatusHT);
 
-	// Ruslan: insert radiators with Ar-straws
-	// Artem: same for Kr
+	// Make a radiator
+	GeoNodePtr<GeoPhysVol> pRad(new GeoPhysVol(lRad));
+	pRad->add(xCool1);
+        pRad->add(pCoolingTube);
+        pRad->add(xCool2);
+        pRad->add(pCoolingTube);
+	pRad->add(new GeoSerialIdentifier(0));
+
+	GeoNodePtr<GeoPhysVol> pHoleForMixedStraw;
+	GeoNodePtr<GeoPhysVol> pHoleForMixedStrawWithLargeDeadRegion;
+
 	switch (agm)
 	{
 	case GM_ARGON:
 	  ATH_MSG_DEBUG( "Marking Argon straws from /TRT/Cond/StatusHT:\t"
 			 << idHelper->print_to_string(TRT_Identifier));
-	  pShell->add(pRadAR);
+	  pHoleForMixedStraw                    = makeStraw(false, GM_ARGON);
+	  pHoleForMixedStrawWithLargeDeadRegion = makeStraw(true, GM_ARGON);
 	  break;
 	case GM_KRYPTON:
 	  ATH_MSG_DEBUG( "Marking Krypton straws from /TRT/Cond/StatusHT:\t"
 			 << idHelper->print_to_string(TRT_Identifier));
-	  pShell->add(pRadKR);
+	  pHoleForMixedStraw                    = makeStraw(false, GM_KRYPTON);
+	  pHoleForMixedStrawWithLargeDeadRegion = makeStraw(true, GM_KRYPTON);
 	  break;
 	case GM_XENON:
 	  ATH_MSG_DEBUG( "Marking Xenon straws from /TRT/Cond/StatusHT:\t"
 			 << idHelper->print_to_string(TRT_Identifier) );
-	  pShell->add(pRad);
+	  pHoleForMixedStraw = makeStraw();
+	  pHoleForMixedStrawWithLargeDeadRegion = makeStraw(true);
 	  break;
 	default:
 	  ATH_MSG_FATAL( "Unexpected gas mixture: " << agm );
@@ -986,6 +921,20 @@ void TRTDetectorFactory_Full::create(GeoPhysVol *world)
 	  return;
 	}
 
+	GeoNodePtr<GeoSerialTransformer> serialTransformer = new GeoSerialTransformer(pHoleForMixedStraw
+										      , &tx2
+										      , m_data->barrelNumberOfStrawsInModule[iABC]-nStrawsWithLargeDeadRegion);
+
+	if (iABC==0) {
+	  GeoNodePtr<GeoSerialTransformer> serialTransformerDead = new GeoSerialTransformer(pHoleForMixedStrawWithLargeDeadRegion
+											    , &tx2Dead
+											    , nStrawsWithLargeDeadRegion);
+	  pRad->add(serialTransformerDead);
+	}
+	pRad->add(serialTransformer);
+
+	pShell->add(pRad);
+
 	//-------------------------------------------------------------------//
 	//                                                                   //
 	// Barrel readout:                                                   //
@@ -2119,16 +2068,13 @@ const GeoShape * TRTDetectorFactory_Full::makeModule ( double length, const GeoT
 //////////////////////////////////// makeStraw ///////////////////////////////////
 
 //
-//GeoPhysVol * TRTDetectorFactory_Full::makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion /*= false*/ ) const {
-GeoPhysVol * TRTDetectorFactory_Full::makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion /*= false*/, ActiveGasMixture gasMixture) {
+GeoPhysVol * TRTDetectorFactory_Full::makeStraw(bool hasLargeDeadRegion, ActiveGasMixture gasMixture) {
 
   double lengthOfInnerDeadRegion= hasLargeDeadRegion ? m_data->barrelLengthOfLargeDeadRegion : m_data->lengthOfDeadRegion ;
   double lengthOfActiveGas = (m_data->barrelLengthOfStraw-m_data->barrelLengthOfTwister)/2.0 - m_data->lengthOfDeadRegion - lengthOfInnerDeadRegion;
   double posA   = (lengthOfActiveGas + m_data->barrelLengthOfTwister) / 2. + lengthOfInnerDeadRegion; // middle of lengthOfActiveGas
   double posInnerDeadRegion = ( m_data->barrelLengthOfTwister + lengthOfInnerDeadRegion ) / 2;
 
-  activeGasZPosition=posA;
-
   // Straws:
   GeoTube    *sHole      = new GeoTube(0,m_data->barrelOuterRadiusOfStrawHole, m_data->barrelLengthOfStraw/2.0);
   GeoLogVol  *lHole      = new GeoLogVol("Hole", sHole, m_materialManager->getMaterial("trt::CO2"));

InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h

@@ -73,12 +73,19 @@ class TRTDetectorFactory_Full : public InDetDD::DetectorFactoryBase  {
   ActiveGasMixture DecideGasMixture(int strawStatusHT);
 
   // private helper methods:
-  const GeoShape * makeModule ( double length, const GeoTrf::Vector2D& corner1 ,  const GeoTrf::Vector2D& corner2, const GeoTrf::Vector2D& corner3,
-				const GeoTrf::Vector2D& corner4, GeoTrf::Transform3D & absolutePosition, double shrinkDist=0 ) const;
-  //GeoPhysVol * makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion=false ) const;
-  GeoPhysVol * makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion=false, ActiveGasMixture gasMixture = GM_XENON);
-  //GeoFullPhysVol  *makeStrawPlane( size_t w ) const;
-  GeoFullPhysVol  *makeStrawPlane( size_t w , ActiveGasMixture gasMixture = GM_XENON);
+  const GeoShape* makeModule(double length
+			     , const GeoTrf::Vector2D& corner1
+			     , const GeoTrf::Vector2D& corner2
+			     , const GeoTrf::Vector2D& corner3
+			     , const GeoTrf::Vector2D& corner4
+			     , GeoTrf::Transform3D & absolutePosition
+			     , double shrinkDist=0) const;
+
+  GeoPhysVol* makeStraw(bool hasLargeDeadRegion=false
+			, ActiveGasMixture gasMixture = GM_XENON);
+
+  GeoFullPhysVol* makeStrawPlane(size_t w
+				 , ActiveGasMixture gasMixture = GM_XENON);
 
   // private member data:
   InDetDD::TRT_DetectorManager                  *m_detectorManager = nullptr; // ownership handed to calleer.

LArCalorimeter/LArCalibUtils/LArCalibUtils/LArMasterWaveBuilder.h

 //Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -10,19 +10,17 @@
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 
-#include "LArRawConditions/LArWave.h"
-#include "LArRawConditions/LArWaveHelper.h"
-#include "LArRawConditions/LArCaliWave.h"
+
 #include "StoreGate/ReadCondHandleKey.h"
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "LArRecConditions/LArCalibLineMapping.h"
 
-#include "LArIdentifier/LArOnlineID.h"
-#include "CaloIdentifier/LArEM_ID.h"
-
 #include <vector>
 #include <string>
-#include <map>
+
+class LArWave;
+class LArWaveHelper;
+class LArCaliWave;
 
 class LArMasterWaveBuilder : public AthAlgorithm {
 public:

LArCalorimeter/LArCalibUtils/LArCalibUtils/LArOFCAlg.h

@@ -2,45 +2,38 @@
 //Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARCALIBUTILS_LAROFCALGORITHM_H
 #define LARCALIBUTILS_LAROFCALGORITHM_H
  
-#include <vector>
-#include <string>
- 
-#include "LArRawConditions/LArWaveCumul.h"
 
+#include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
-#include "LArElecCalib/ILArAutoCorrDecoderTool.h"
-
-#include "CaloIdentifier/CaloGain.h"
-#include "LArRawConditions/LArCaliWaveContainer.h"
-#include "LArRawConditions/LArPhysWaveContainer.h"
+#include "StoreGate/ReadCondHandleKey.h"
 
-#include "LArRawConditions/LArOFCComplete.h"
-#include "LArRawConditions/LArOFCBinComplete.h"
-#include "LArRawConditions/LArShapeComplete.h"
-#include "LArCOOLConditions/LArDSPConfig.h"
+#include "LArElecCalib/ILArAutoCorrDecoderTool.h"
+#include "LArCOOLConditions/LArDSPConfig.h" //unique_ptr template param with no explicit d'tor
 #include "LArCabling/LArOnOffIdMapping.h"
-#include "StoreGate/ReadCondHandleKey.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-#include <Eigen/Dense>
+#include <Eigen/Dense> //Eigen::MatrixXd
 
 #include "tbb/blocked_range.h"
 #include "tbb/global_control.h"
 
 #include <memory>
+#include <vector>
+#include <string>
 
 #include "CxxUtils/checker_macros.h"
 
 class LArOnlineID_Base; 
 class CaloDetDescrManager_Base; 
+class LArCaliWaveContainer;
+class LArOFCBinComplete;
+class LArWaveCumul;
 
 
 class ATLAS_NOT_THREAD_SAFE LArOFCAlg:public AthAlgorithm {