[ITS3] Fix digitization and clusterization and implement proper transformations for ITS3

CODEOWNERS

@@ -41,7 +41,7 @@
 /DataFormats/Detectors/TPC                     @davidrohr @wiechula @shahor02
 /DataFormats/Detectors/TRD                     @f3sch @bazinski @tdietel @martenole
 /DataFormats/Detectors/Upgrades                @qgp @marcovanleeuwen @mconcas
-/DataFormats/Detectors/Upgrades/IT3            @fgrosa @arossi81
+/DataFormats/Detectors/Upgrades/ITS3           @fgrosa @arossi81
 /DataFormats/Detectors/ZDC                     @coppedis
 
 #/DataFormats/Headers

Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx

@@ -374,8 +374,11 @@ TGeoHMatrix* GeometryTGeo::extractMatrixSensor(int index) const
   if (mNumberOfModules[lay] > 0) {
     path += Form("%s%d_%d/", mIsLayerITS3[lay] ? getITS3ModulePattern() : getITSModulePattern(), lay, mod);
   }
-  path +=
-    Form("%s%d_%d/%s%d_1", mIsLayerITS3[lay] ? getITS3ChipPattern() : getITSChipPattern(), lay, chipInMod, mIsLayerITS3[lay] ? getITS3SensorPattern() : getITSSensorPattern(), lay);
+  if (!mIsLayerITS3[lay]) {
+    path += Form("%s%d_%d/%s%d_1", getITSChipPattern(), lay, chipInMod, getITSSensorPattern(), lay);
+  } else {
+    path += Form("%s%d_%d", getITS3ChipPattern(), lay, chipInMod); // for ITS3 currently we might have more sensors than chips, so we have to take the chip to avoid mismatches with chipId
+  }
 
   static TGeoHMatrix matTmp;
   gGeoManager->PushPath();
@@ -388,16 +391,16 @@ TGeoHMatrix* GeometryTGeo::extractMatrixSensor(int index) const
 
   matTmp = *gGeoManager->GetCurrentMatrix(); // matrix may change after cd
   // RSS
-  //  printf("%d/%d/%d %s\n",lay,stav,detInSta,path.Data());
-  //  mat->Print();
+  // printf("%d/%d/%d %s\n", lay, stav, detInSta, path.Data());
+  // matTmp.Print();
   // Restore the modeler state.
   gGeoManager->PopPath();
 
   // account for the difference between physical sensitive layer (where charge collection is simulated) and effective sensor ticknesses
   double delta = 0.;
   if (mIsLayerITS3[lay]) {
 #ifdef ENABLE_UPGRADES
-    delta = SegmentationITS3::SensorLayerThickness - SegmentationITS3::SensorLayerThicknessEff;
+    delta = SegmentationITS3::mSensorLayerThickness - SegmentationITS3::mSensorLayerThicknessEff;
 #endif
   } else {
     delta = Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff;

Detectors/Upgrades/CMakeLists.txt

@@ -10,5 +10,5 @@
 # or submit itself to any jurisdiction.
 
 message(STATUS "Building detectors for upgrades")
-add_subdirectory(IT3)
+add_subdirectory(ITS3)
 add_subdirectory(ALICE3)

Detectors/Upgrades/IT3/CMakeLists.txt → Detectors/Upgrades/ITS3/CMakeLists.txt

@@ -9,5 +9,8 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
+add_subdirectory(macros)
 add_subdirectory(simulation)
 add_subdirectory(base)
+add_subdirectory(workflow)
+add_subdirectory(reconstruction)

Detectors/Upgrades/IT3/README.md → Detectors/Upgrades/ITS3/README.md

@@ -2,7 +2,7 @@
 \page refDetectorsUpgradesIT3 UpgradesIT3
 /doxy -->
 
-# IT3
+# ITS3
 Upgraded version of the ITS that includes upgraded truly-cylindrical inner barrel.
 
 # Run the full simulation