fix positioning of chips in modules + update otof geometry

Author: maciacco

Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/IOTOFBaseParam.h

@@ -21,11 +21,11 @@ namespace iotof
 {
 
 struct ChipSpecifics {
-  int NCols = 129;
-  int NRows = 271;
+  int NCols = 120;
+  int NRows = 240;
   float PitchCol = 250.00e-4;
   float PitchRow = 100.00e-4;
-  float PassiveEdgeReadOut = 0.;
+  float PassiveEdgeReadOut = 0.2;
   float PassiveEdgeTop = 0.;
   float PassiveEdgeSide = 0.;
   float PixelPassiveEdgeX = 0.;
@@ -63,11 +63,10 @@ struct IOTOFBaseParam : public o2::conf::ConfigurableParamHelper<IOTOFBaseParam>
 
   // OTOF segmentation parameters
   float otofRadius = 92.f;          // OTOF radius (cm)
-  float otofLength = 680.f;         // OTOF length (cm)
+  float otofLength = 688.54f;       // OTOF length (cm)
   int otofNStaves = 62;             // OTOF number of staves
   float otofStaveTilt = 5;          // OTOF stave tilt angle (deg)
 
-
   O2ParamDef(IOTOFBaseParam, "IOTOFBase");
 };
 

Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Layer.h

@@ -34,7 +34,7 @@ class Layer
   auto getZLength() const { return mZLength; }
   auto getZOffset() const { return mZOffset; }
   auto getx2X0() const { return mX2X0; }
-  auto getChipThickness() const { return mChipThickness; }
+  auto getChipThickness() const { return mLayerThickness; }
   auto getName() const { return mLayerName; }
   auto getLayout() const { return mLayout; }
   auto getSegments() const { return mStaves; }
@@ -52,13 +52,19 @@ class Layer
   float mZLength;
   float mZOffset{0.f}; // Of use when fwd layers
   float mX2X0;
-  float mChipThickness;   // Thickness of the chip in cm, derived from mX2X0 and the radiation length of silicon
+  float mLayerThickness;  // Thickness of the layer in cm, derived from mX2X0 and the radiation length of silicon
   float mSensorThickness; // Thickness of the sensor in cm, to be subtracted from the chip thickness to get the total module thickness
   int mLayout{kBarrel};   // Identifier of the type of layer layout (barrel, disk, barrel segmented, disk segmented)
   // To be used only in case of the segmented layout, to define the number of staves in phi (for barrel) or in r (for disk)
   std::pair<int, float> mStaves{0, 0.0f}; // Number and size of staves in phi (for barrel) or in r (for disk) in case of segmented layout
   int mModulesPerStave{0};                // Number of modules along a stave
   double mTiltAngle{0.0};                 // Tilt angle in degrees to be applied as a rotation around the local center of the stave
+
+  static const int sChipsPerRow;  // number of chips per row in module
+  static const int sChipsPerCol;  // number of chips per col in module
+  static const double sChipGap;   // gap between chips in module
+  static const double sModuleGap; // gap between modules in stave
+  static const double sChipThickness; // full thickness of the chip
 };
 
 class ITOFLayer : public Layer
@@ -67,6 +73,8 @@ class ITOFLayer : public Layer
   using Layer::Layer;
   virtual void createLayer(TGeoVolume* motherVolume) override;
   static std::vector<std::string> mRegister;
+
+ private:
 };
 
 class OTOFLayer : public Layer
@@ -75,6 +83,9 @@ class OTOFLayer : public Layer
   using Layer::Layer;
   virtual void createLayer(TGeoVolume* motherVolume) override;
   static std::vector<std::string> mRegister;
+
+  static const double sSubStavesDistanceY;
+  static const double sSubStavesOverlapX;
 };
 
 class FTOFLayer : public Layer

Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/TF3Chip.h

@@ -45,9 +45,11 @@ class TF3Chip
 
   static void createMaterials(Int_t id, Int_t fieldType, Float_t maxField);
 
- private:
-  static constexpr double chipSizeX = 2.6; // cm
-  static constexpr double chipSizeZ = 3; // cm (TODO: will be decreased to 3 cm)
+  static const double getChipSizeX() { return sChipSizeX; };
+  static const double getChipSizeY() { return sChipSizeZ; };
+
+  static const double sChipSizeX;
+  static const double sChipSizeZ;
 
   ClassDefNV(TF3Chip, 0); // TF3Chip geometry
 };

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Detector.cxx

@@ -128,7 +128,7 @@ void Detector::configLayers(bool itof, bool otof, bool ftof, bool btof, std::str
     const int nStaves = itofSegmented ? iotofPars.itofNStaves : 0;               // number of staves in segmented case
     const double staveWidth = itofSegmented ? 5.42 : 0.0;                        // cm
     const double staveTiltAngle = itofSegmented ? iotofPars.itofStaveTilt : 0.0; // degrees
-    const int modulesPerStave = itofSegmented ? 7 : 0;                          // number of modules per stave in segmented case
+    const int modulesPerStave = itofSegmented ? 7 : 0;                           // number of modules per stave in segmented case
     mITOFLayer = ITOFLayer(name,
                            dInnerTof.first, 0.f, dInnerTof.second, 0.f, x2x0, itofSegmented ? ITOFLayer::kBarrelSegmented : ITOFLayer::kBarrel,
                            nStaves, staveWidth, staveTiltAngle, modulesPerStave, itofSegmented ? sensorThickness : 0.0f);
@@ -138,7 +138,7 @@ void Detector::configLayers(bool itof, bool otof, bool ftof, bool btof, std::str
     const int nStaves = otofSegmented ? iotofPars.otofNStaves : 0;               // number of staves in segmented case
     const double staveWidth = otofSegmented ? 9.74 : 0.0;                        // cm
     const double staveTiltAngle = otofSegmented ? iotofPars.otofStaveTilt : 0.0; // degrees
-    const int modulesPerStave = otofSegmented ? 54 : 0;                          // number of modules per stave in segmented case
+    const int modulesPerStave = otofSegmented ? 38 : 0;                          // number of modules per stave in segmented case
     mOTOFLayer = OTOFLayer(name,
                            dOuterTof.first, 0.f, dOuterTof.second, 0.f, x2x0, otofSegmented ? OTOFLayer::kBarrelSegmented : OTOFLayer::kBarrel,
                            nStaves, staveWidth, staveTiltAngle, modulesPerStave, otofSegmented ? sensorThickness : 0.0f);