[ALICE 3] Implementation of peacock layour for services

Author: marcovanleeuwen

Detectors/Upgrades/ALICE3/TRK/README.md

@@ -17,6 +17,7 @@ Configurables for various sub-detectors are presented in the following Table:
 | `TRKBase.layoutVD` | `kIRIS4` (default), `kIRISFullCyl`, `kIRIS5`, `kIRIS4a` | [link to definitions](./base/include/TRKBase/TRKBaseParam.h) |
 | `TRKBase.layoutML` | `kCylinder`, `kTurboStaves` (default), `kStaggered`     |                                                                  |
 | `TRKBase.layoutOT` | `kCylinder`, `kTurboStaves`, `kStaggered` (default)     |                                                                  |
+| `TRKBase.layoutSRV` | `kPeacockv1` (default), `kLOISymm` | `kLOISymm` produces radially symmetric service volumes, as used in the LoI |
 
 For example, a geometry with fully cylindrical tracker barrel (for all layers in VD, ML and OT) can be obtained by
 ```bash

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/TRKBaseParam.h

@@ -39,6 +39,11 @@ enum eVDLayout {
   kIRIS4a,
 };
 
+enum eSrvLayout {
+  kPeacockv1 = 0,
+  kLOISymm,
+};
+
 struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
   std::string configFile = "";
   float serviceTubeX0 = 0.02f; // X0 Al2O3
@@ -49,10 +54,12 @@ struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
   eLayout layoutML = kTurboStaves; // Type of segmentation for the middle layers
   eLayout layoutOT = kStaggered;   // Type of segmentation for the outer layers
   eVDLayout layoutVD = kIRIS4;     // VD detector layout design
+  eSrvLayout layoutSRV = kPeacockv1; // Layout of services
 
   eLayout getLayoutML() const { return layoutML; }
   eLayout getLayoutOT() const { return layoutOT; }
   eVDLayout getLayoutVD() const { return layoutVD; }
+  eSrvLayout getLayoutSRV() const { return layoutSRV; }
 
   O2ParamDef(TRKBaseParam, "TRKBase");
 };

Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/TRKServices.h

@@ -51,6 +51,8 @@ class TRKServices : public FairModule
   void createMiddleServices(TGeoVolume* motherVolume);
   void createOuterDisksServices(TGeoVolume* motherVolume);
   void createOuterBarrelServices(TGeoVolume* motherVolume);
+  void createMLServicesPeacock(TGeoVolume* motherVolume);
+  void createOTServicesPeacock(TGeoVolume* motherVolume);
   void createVacuumCompositeShape();
   void excavateFromVacuum(TString shapeToExcavate);
   void registerVacuum(TGeoVolume* motherVolume);
@@ -65,12 +67,14 @@ class TRKServices : public FairModule
   float mColdPlateX0;
 
   // Services
+  float mFiberArea = 7.1e-2;                             // cm^2
+  float mPowerBundleArea = 1.13;                         // cm^2
   float mFiberComposition[2] = {0.5, 0.5};               // SiO2, PE
-  float mPowerBundleComposition[2] = {0.09, 0.91};       // Cu, PE
+  float mPowerBundleComposition[2] = {0.08, 0.92};       // Cu, PE (with jacket)
   float mPowerBundleJacketComposition[2] = {0.06, 0.94}; // Cu, PE
   float mWaterBundleComposition[2] = {0.56, 0.44};       // PU, H2O
   float mWaterBundleDiskComposition[2] = {0.44, 0.56};   // PU, H2O
-  float mMiddleDiskThickness = 1.0;                      // cm
+  // float mMiddleDiskThickness = 1.0;                      // cm
   std::vector<float> mCableFanWeights = {0.5, 0.3, 0.2}; // relative weights of the fan layers
 
   ClassDefOverride(TRKServices, 1);