Merge branch '24.0-ZDC_GeoM-ZDC-Pixel-Routing' into '24.0'

Added pixel routing volume to ZDC description

See merge request atlas/athena!70794

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx

@@ -61,8 +61,8 @@ void ZDC_DetFactory::initializePbPb2015(){
                {true, true, true, true}};
     m_zdcPos = {{-397.0, -27.0, 153.0, 303.0}, //Positions of the ZDC modules
                 {-397.0, -27.0, 153.0, 303.0}};
-    m_zdcPixelStart_Stop = {{{1,8}, {0,9}, {0,0}, {0,0}}, //Pixel start and stop layers for each ZDC
-                            {{0,0}, {0,9}, {0,0}, {0,0}}};
+    m_zdcModType = {{3,2,1,1}, //Module types of the ZDC modules
+                    {1,2,1,1}};
 }
 
 void ZDC_DetFactory::initializePbPb2023(){
@@ -70,11 +70,11 @@ void ZDC_DetFactory::initializePbPb2023(){
     m_BRANs_On = true; //Flag for both BRAN modules
     m_zdcOn = {{true, true, true, true}, //If the given ZDC is on
                {true, true, true, true}};
-    m_zdcPos = {{-394.5, 38.5, 220.8, 375.8},
-                {-325.5, 6.5, 188.8, 343.8}};
-    m_zdcPixelStart_Stop = {{{1,8}, {0,9}, {0,0}, {0,0}}, //Pixel start and stop layers for each ZDC
-                            {{0,0}, {0,9}, {0,0}, {0,0}}};
-    m_rpdPos = {new GeoAlignableTransform(GeoTrf::Translate3D(-2.012 * Gaudi::Units::mm, 21.388 * Gaudi::Units::mm, -178.0 * Gaudi::Units::mm)),
+    m_zdcPos = {{-344, 52.15, 220.8, 375.8},
+                {-325.5, 20.15, 188.8, 343.8}};
+    m_zdcModType = {{3,2,1,1}, //Module types of the ZDC modules
+                    {1,2,1,1}};
+    m_rpdPos = {new GeoAlignableTransform(GeoTrf::Translate3D(2.012 * Gaudi::Units::mm, 21.388 * Gaudi::Units::mm, -178.0 * Gaudi::Units::mm)),
                 new GeoAlignableTransform(GeoTrf::Translate3D(1.774 * Gaudi::Units::mm, 21.344 * Gaudi::Units::mm, -210.0 * Gaudi::Units::mm))};
     m_branPos = {-89.5, -121.5};
 }
@@ -110,7 +110,7 @@ void ZDC_DetFactory::create(GeoPhysVol *world)
          **************************************************/
         for(int module = 0; module < 4; ++module){
             if(!m_zdcOn[side][module]) continue;
-            ZDC_ZDCModule *zdcMod = new ZDC_ZDCModule(m_detectorStore, sideSign ,module, m_zdcID, m_zdcPixelStart_Stop[side][module].first, m_zdcPixelStart_Stop[side][module].second);
+            ZDC_ZDCModule *zdcMod = new ZDC_ZDCModule(m_detectorStore, sideSign ,module, m_zdcID, m_zdcModType[side][module]);
             zdcMod->create(Envelope_Physical, new GeoAlignableTransform(GeoTrf::TranslateZ3D(m_zdcPos[side][module] * Gaudi::Units::mm)));
         }
 

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h

@@ -44,7 +44,7 @@ private:
   bool m_BRANs_On{}; //Flag for both BRAN modules
   std::vector< std::vector< bool > > m_zdcOn;
   std::vector< std::vector< float > > m_zdcPos; //Positions of the ZDC modules
-  std::vector< std::vector< std::pair<int,int> > > m_zdcPixelStart_Stop; //Start and stop layers of the pixels for a given ZDC module
+  std::vector< std::vector< int > > m_zdcModType; //Module types of the ZDC modules
   std::vector< GeoAlignableTransform* > m_rpdPos; //Positions of the RPD modules
   std::vector< float > m_branPos; //Positions of the BRAN modules
 };

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_ZDCModule.h

@@ -10,7 +10,7 @@
 class ZDC_ZDCModule : public ZDC_ModuleBase{
   public:
     ZDC_ZDCModule();
-    ZDC_ZDCModule(StoreGateSvc *detStore, int side, int module, const ZdcID *zdcID, int pixelStart, int pixelStop);
+    ZDC_ZDCModule(StoreGateSvc *detStore, int side, int module, const ZdcID *zdcID, int modType);
     ZDC_ZDCModule(ZDC_ZDCModule *right, int side, int module);
 
     virtual ~ZDC_ZDCModule() = default;
@@ -18,8 +18,7 @@ class ZDC_ZDCModule : public ZDC_ModuleBase{
     virtual void create(GeoFullPhysVol* mother, GeoAlignableTransform* trf) override;
 
   protected:
-    int m_pixelStart;
-    int m_pixelStop;
+    int m_modType;
 
 };