ITS3: modify layer geo

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

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

@@ -20,13 +20,12 @@
 #include <TGeoTube.h>
 #include <TGeoVolume.h>
 
-#include "Framework/Logger.h"
-#include <fmt/core.h>
+#include "ITS3Base/SpecsV2.h"
 
 namespace o2::its3
 {
 
-/// This class defines the Geometry for the ITS3  using TGeo.
+/// This class defines the geometry for the ITS3 IB layers.
 class ITS3Layer
 {
   // The hierarchy will be the following:
@@ -56,11 +55,10 @@ class ITS3Layer
     return mNames[static_cast<size_t>((b == BuildLevel::kAll) ? BuildLevel::kLayer : b)];
   }
 
-  explicit ITS3Layer(int layer = 0) : mNLayer(layer)
-  {
-    LOGP(debug, "Called on {} layer {}", layer, mNLayer);
-    init();
-  }
+  explicit ITS3Layer(int layer = 0) : mNLayer(layer),
+                                      mR(o2::its3::constants::radii[mNLayer]),
+                                      mRmin(o2::its3::constants::radiiInner[mNLayer]),
+                                      mRmax(o2::its3::constants::radiiOuter[mNLayer]) {}
 
   explicit ITS3Layer(TGeoVolume* motherVolume, int layer = 0) : ITS3Layer(layer)
   {
@@ -101,7 +99,9 @@ class ITS3Layer
   double mRmin{};     // Minimum Radius
   double mRmax{0};    // Maximum Radius
 
-  // Individual Pieces
+  // Individual pieces
+  // since TGeo manages the resources itself one should not use these pointers
+  // after initializition anymore!
   TGeoVolume* mPixelArray{nullptr};
   TGeoVolumeAssembly* mTile{nullptr};
   TGeoVolumeAssembly* mRSU{nullptr};

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

@@ -18,11 +18,11 @@
 #include "TGeoVolume.h"
 #include "TGeoCompositeShape.h"
 
+#include "Framework/Logger.h"
 #include "CommonConstants/MathConstants.h"
 #include "ITSBase/GeometryTGeo.h"
 #include "ITS3Base/SpecsV2.h"
 #include "ITS3Simulation/ITS3Layer.h"
-#include "fairlogger/Logger.h"
 
 namespace o2m = o2::constants::math;
 namespace its3c = o2::its3::constants;
@@ -31,13 +31,6 @@ namespace o2::its3
 {
 using its3TGeo = o2::its::GeometryTGeo;
 
-void ITS3Layer::init()
-{
-  mR = its3c::radii[mNLayer];
-  mRmin = its3c::radiiInner[mNLayer];
-  mRmax = its3c::radiiOuter[mNLayer];
-}
-
 void ITS3Layer::getMaterials(bool create)
 {
   if (gGeoManager == nullptr) {
@@ -59,11 +52,11 @@ TGeoMedium* ITS3Layer::getMaterial(const char* matName, bool create)
     } else { // create dummy
       auto matDummy = gGeoManager->GetMaterial("MAT_DUMMY$");
       if (matDummy == nullptr) {
-        LOGP(info, "Created Dummy material");
+        LOGP(warn, "Created Dummy material");
         matDummy = new TGeoMaterial("MAT_DUMMY$", 26.98, 13, 2.7);
       }
       mat = new TGeoMedium(matName, 1, matDummy);
-      LOGP(info, "Created medium {}", matName);
+      LOGP(warn, "Created medium {}", matName);
     }
   }
   return mat;
@@ -76,12 +69,10 @@ void ITS3Layer::createLayer(TGeoVolume* motherVolume)
   createLayerImpl();
   mBuilt = true;
 
-  LOGP(debug, "ITS3-Layer: Created Layer {} with mR={} (minR={}, maxR={})", mNLayer, mR, mRmin, mRmax);
   if (motherVolume == nullptr) {
     return;
   }
   // Add it to motherVolume
-  LOGP(debug, "  `-> Attaching to motherVolume '{}'", motherVolume->GetName());
   auto* trans = new TGeoTranslation(0, 0, -constants::segment::lengthSensitive / 2.);
   motherVolume->AddNode(mLayer, 0, trans);
 }