Merge branch 'port-hgtd-fix-sihit-coords-master' into 'master'

Port fix for HGTD hit coordinates to master

See merge request atlas/athena!47508

HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx

@@ -1084,14 +1084,12 @@ InDetDD::HGTD_ModuleDesign* HGTD_DetectorFactory::createHgtdDesign( double thick
     int diodeRowsPerCircuit = cellRowsPerCircuit;
 
     std::shared_ptr<const PixelDiodeMatrix> normalCell = InDetDD::PixelDiodeMatrix::construct(phiPitch, etaPitch);
-    std::shared_ptr<const PixelDiodeMatrix> singleRow  = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::etaDir, 0,
+    std::shared_ptr<const PixelDiodeMatrix> singleRow  = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::phiDir, 0,
                                                                                               normalCell, diodeColumnsPerCircuit, 0);
-    std::shared_ptr<const PixelDiodeMatrix> fullMatrix = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::phiDir, 0,
+    std::shared_ptr<const PixelDiodeMatrix> fullMatrix = InDetDD::PixelDiodeMatrix::construct(InDetDD::PixelDiodeMatrix::etaDir, 0,
                                                                                               singleRow, 2*diodeRowsPerCircuit, 0); // note 30 = 2*15 rows adopted
 
-    DetectorDesign::Axis yDirection = InDetDD::DetectorDesign::xAxis;
-    if (m_geomVersion == 0 )
-      yDirection = InDetDD::DetectorDesign::yAxis;
+    DetectorDesign::Axis yDirection = InDetDD::DetectorDesign::yAxis;
 
     InDetDD::HGTD_ModuleDesign* design = new InDetDD::HGTD_ModuleDesign(thickness,
                                                                         circuitsPerColumn, circuitsPerRow,

HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_ModuleDesign.cxx

@@ -23,7 +23,7 @@ HGTD_ModuleDesign::HGTD_ModuleDesign(const double thickness,
                                      DetectorDesign::Axis yDirection,
                                      DetectorDesign::Axis depthDirection):
     DetectorDesign(thickness, 
-                   true, true, true, // phi,eta,depth axes symmetric
+                   false, false, true, // phi,eta,depth axes symmetric
                    carrierType,
                    readoutSide,
                    yDirection,

HighGranularityTimingDetector/HGTD_G4/HGTD_G4_SD/src/HGTDSensorSD.cxx

@@ -142,13 +142,13 @@ G4bool HGTDSensorSD::ProcessHits(G4Step* aStep, G4TouchableHistory* /*ROhist*/)
     }
 
     HepGeom::Point3D<double> lP1,lP2;
-    lP1[SiHit::xEta] = localPosition1[2]*CLHEP::mm;
-    lP1[SiHit::xPhi] = localPosition1[1]*CLHEP::mm;
-    lP1[SiHit::xDep] = localPosition1[0]*CLHEP::mm;
-  
-    lP2[SiHit::xEta] = localPosition2[2]*CLHEP::mm;
-    lP2[SiHit::xPhi] = localPosition2[1]*CLHEP::mm;
-    lP2[SiHit::xDep] = localPosition2[0]*CLHEP::mm;
+    lP1[SiHit::xEta] = localPosition1[1]*CLHEP::mm; //long edge of the module
+    lP1[SiHit::xPhi] = localPosition1[0]*CLHEP::mm; //short edge of the module
+    lP1[SiHit::xDep] = localPosition1[2]*CLHEP::mm; //depth (z)
+
+    lP2[SiHit::xEta] = localPosition2[1]*CLHEP::mm;
+    lP2[SiHit::xPhi] = localPosition2[0]*CLHEP::mm;
+    lP2[SiHit::xDep] = localPosition2[2]*CLHEP::mm;
 
     std::string module_indices = myTouch->GetVolume(1)->GetLogicalVolume()->GetName();
     std::size_t found = module_indices.find_last_of("_");