Fix on the C2F and F2C in SegmentationMosaix class

Author: ChunzhengLab

Detectors/Upgrades/ITS3/base/include/ITS3Base/SegmentationMosaix.h

@@ -102,9 +102,9 @@ class SegmentationMosaix
     // stack
     float dist = std::hypot(xCurved, yCurved);
     float phi = std::atan2(yCurved, xCurved);
-    xFlat = (mRadius * phi) - WidthH;
     // the y position is in the silicon volume however we need the chip volume (silicon+metalstack)
     // this is accounted by a y shift
+    xFlat = WidthH - mRadius * phi;
     yFlat = dist - mRadius + NominalYShift;
   }
 
@@ -122,11 +122,12 @@ class SegmentationMosaix
   {
     // MUST align the flat surface with the curved surface with the original pixel array is on and account for metal
     // stack
+    float dist = yFlat - NominalYShift + mRadius;
+    float phi = (WidthH - xFlat) / mRadius;
     // the y position is in the chip volume however we need the silicon volume
     // this is accounted by a -y shift
-    float dist = yFlat - NominalYShift + mRadius;
-    xCurved = dist * std::cos((xFlat + WidthH) / mRadius);
-    yCurved = dist * std::sin((xFlat + WidthH) / mRadius);
+    xCurved = dist * std::cos(phi);
+    yCurved = dist * std::sin(phi);
   }
 
   /// Transformation from Geant detector centered local coordinates (cm) to

Detectors/Upgrades/ITS3/simulation/include/ITS3Simulation/ITS3DPLDigitizerParam.h

@@ -10,8 +10,6 @@
 
 #include "CommonUtils/ConfigurableParam.h"
 #include "CommonUtils/ConfigurableParamHelper.h"
-#include "ITSMFTSimulation/DPLDigitizerParam.h"
-#include <string>
 
 namespace o2
 {

Detectors/Upgrades/ITS3/simulation/src/ITS3DPLDigitizerParam.cxx

@@ -17,4 +17,5 @@ namespace its3
 {
 static auto& sDigitizerParamITS3 = o2::its3::ITS3DPLDigitizerParam::Instance();
 } // namespace its3
-} // namespace o2
+} // namespace o2
+O2ParamImpl(o2::its3::ITS3DPLDigitizerParam)