Fix constructors

Author: scannito

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

@@ -32,6 +32,7 @@ class Detector : public o2::base::DetImpl<Detector>
  public:
   Detector(bool active);
   Detector();
+  Detector(const Detector& other);
   ~Detector();
 
   // Factory method
@@ -87,7 +88,7 @@ class Detector : public o2::base::DetImpl<Detector>
     double mEnergyLoss;             // energy loss
   } mTrackData;                     //! transient data
   GeometryTGeo* mGeometryTGeo;      //!
-  std::vector<o2::trk::Hit>* mHits; // ITSMFT ones for the moment
+  std::vector<o2::trk::Hit>* mHits; // Derived from ITSMFT
   std::vector<std::unique_ptr<TRKCylindricalLayer>> mLayers;
   TRKServices mServices; // Houses the services of the TRK, but not the Iris tracker
 

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

@@ -22,12 +22,16 @@ namespace o2
 {
 namespace trk
 {
+enum class MatBudgetParamMode {
+  Thickness,
+  X2X0
+};
+
 class TRKCylindricalLayer
 {
  public:
   TRKCylindricalLayer() = default;
-  TRKCylindricalLayer(int layerNumber, std::string layerName, float rInn, float length, float layerX2X0);
-  TRKCylindricalLayer(int layerNumber, std::string layerName, float rInn, float length, float thick);
+  TRKCylindricalLayer(int layerNumber, std::string layerName, float rInn, float length, float thickOrX2X0, MatBudgetParamMode mode);
   virtual ~TRKCylindricalLayer() = default;
 
   auto getInnerRadius() const { return mInnerRadius; }
@@ -64,19 +68,18 @@ class TRKSegmentedLayer : public TRKCylindricalLayer
 {
  public:
   TRKSegmentedLayer() = default;
-  TRKSegmentedLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float layerX2X0);
-  TRKSegmentedLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thick);
+  TRKSegmentedLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
   ~TRKSegmentedLayer() override = default;
 
   TGeoVolume* createSensor() override;
   TGeoVolume* createDeadzone();
   TGeoVolume* createMetalStack() override;
   TGeoVolume* createChip();
   TGeoVolume* createModule();
-  TGeoVolume* createStave() = 0;
+  virtual TGeoVolume* createStave() = 0;
   void createLayer(TGeoVolume* motherVolume) override = 0;
 
- private:
+ protected:
   int mNumberOfModules;
 
   // Fixed parameters for the layer, to be set based on the specifications of the chip and module
@@ -90,15 +93,14 @@ class TRKSegmentedLayer : public TRKCylindricalLayer
   // TGeo objects outside logical volumes can cause errors
   static constexpr float sLogicalVolumeThickness = 1.3;
 
-  ClassDef(TRKSegmentedLayer, 0);
+  ClassDefOverride(TRKSegmentedLayer, 0);
 };
 
 class TRKMLLayer : public TRKSegmentedLayer
 {
  public:
   TRKMLLayer() = default;
-  TRKMLLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float layerX2X0);
-  TRKMLLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thick);
+  TRKMLLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
   ~TRKMLLayer() override = default;
 
   TGeoVolume* createStave() override;
@@ -107,15 +109,14 @@ class TRKMLLayer : public TRKSegmentedLayer
  private:
   static constexpr double sStaveWidth = constants::ML::width;
 
-  ClassDef(TRKMLLayer, 0);
+  ClassDefOverride(TRKMLLayer, 0);
 };
 
 class TRKOTLayer : public TRKSegmentedLayer
 {
  public:
   TRKOTLayer() = default;
-  TRKOTLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float layerX2X0);
-  TRKOTLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thick);
+  TRKOTLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
   ~TRKOTLayer() override = default;
 
   TGeoVolume* createStave() override;
@@ -127,7 +128,7 @@ class TRKOTLayer : public TRKSegmentedLayer
   static constexpr double sInStaveOverlap = constants::moduleMLOT::gaps::outerEdgeLongSide + constants::moduleMLOT::chip::passiveEdgeReadOut + 0.1; // 1.5mm outer-edge + 1mm deadzone + 1mm (true) overlap
   static constexpr double sStaveWidth = constants::OT::width - sInStaveOverlap;
 
-  ClassDef(TRKOTLayer, 0)
+  ClassDefOverride(TRKOTLayer, 0)
 };
 
 } // namespace trk

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

@@ -61,10 +61,17 @@ Detector::Detector(bool active)
 
   LOGP(info, "Summary of TRK configuration:");
   for (auto& layer : mLayers) {
-    LOGP(info, "Layer: {} name: {} r: {} cm | z: {} cm | thickness: {} cm", layer.getNumber(), layer.getName(), layer.getInnerRadius(), layer.getZ(), layer.getChipThickness());
+    LOGP(info, "Layer: {} name: {} r: {} cm | z: {} cm | thickness: {} cm", layer->getNumber(), layer->getName(), layer->getInnerRadius(), layer->getZ(), layer->getChipThickness());
   }
 }
 
+Detector::Detector(const Detector& other)
+  : o2::base::DetImpl<Detector>(other),
+    mTrackData(),
+    mHits(o2::utils::createSimVector<o2::trk::Hit>())
+{
+}
+
 Detector::~Detector()
 {
   if (mHits) {
@@ -88,26 +95,28 @@ void Detector::configMLOT()
   const float thick = 100.e-3;
 
   switch (trkPars.layoutMLOT) {
-    case kCylindrical:
+    case kCylindrical: {
       const std::vector<float> length{128.35f, 128.35f, 128.35f, 128.35f, 128.35f, 256.7f, 256.7f, 256.7f};
       LOGP(warning, "Loading cylindrical configuration for ALICE3 TRK");
       for (int i{0}; i < 8; ++i) {
         std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(i);
-        mLayers.push_back(std::make_unique<TRKCylindricalLayer>(i, name, rInn[i], length[i], thick));
+        mLayers.push_back(std::make_unique<TRKCylindricalLayer>(i, name, rInn[i], length[i], thick, MatBudgetParamMode::Thickness));
       }
       break;
-    case kSegmented:
+    }
+    case kSegmented: {
       const std::vector<int> nMods{10, 10, 10, 10, 10, 20, 20, 20};
       LOGP(warning, "Loading segmented configuration for ALICE3 TRK");
       for (int i{0}; i < 8; ++i) {
         std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(i);
         if (i < 4) {
-          mLayers.push_back(std::make_unique<TRKMLLayer>(i, name, rInn[i], nMods[i], thick));
+          mLayers.push_back(std::make_unique<TRKMLLayer>(i, name, rInn[i], nMods[i], thick, MatBudgetParamMode::Thickness));
         } else {
-          mLayers.push_back(std::make_unique<TRKOTLayer>(i, name, rInn[i], nMods[i], thick));
+          mLayers.push_back(std::make_unique<TRKOTLayer>(i, name, rInn[i], nMods[i], thick, MatBudgetParamMode::Thickness));
         }
       }
       break;
+    }
     default:
       LOGP(fatal, "Unknown option {} for configMLOT", static_cast<int>(trkPars.layoutMLOT));
       break;
@@ -146,14 +155,14 @@ void Detector::configFromFile(std::string fileName)
     std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(layerCount);
     switch (trkPars.layoutMLOT) {
       case kCylindrical:
-        mLayers.push_back(std::make_unique<TRKCylindricalLayer>(layerCount, name, tmpBuff[0], tmpBuff[1], tmpBuff[2]));
+        mLayers.push_back(std::make_unique<TRKCylindricalLayer>(layerCount, name, tmpBuff[0], tmpBuff[1], tmpBuff[2], MatBudgetParamMode::Thickness));
         break;
       case kSegmented: {
         int nMods = static_cast<int>(tmpBuff[1]);
         if (layerCount < 4) {
-          mLayers.push_back(std::make_unique<TRKMLLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2]));
+          mLayers.push_back(std::make_unique<TRKMLLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2], MatBudgetParamMode::Thickness));
         } else {
-          mLayers.push_back(std::make_unique<TRKOTLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2]));
+          mLayers.push_back(std::make_unique<TRKOTLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2], MatBudgetParamMode::Thickness));
         }
         break;
       }
@@ -171,8 +180,8 @@ void Detector::configToFile(std::string fileName)
   LOGP(info, "Exporting TRK Detector layout to {}", fileName);
   std::ofstream conFile(fileName.c_str(), std::ios::out);
   conFile << "/// TRK configuration file: inn_radius  z_length  lay_thickness" << std::endl;
-  for (auto layer : mLayers) {
-    conFile << layer.getInnerRadius() << "\t" << layer.getZ() << "\t" << layer.getChipThickness() << std::endl;
+  for (const auto& layer : mLayers) {
+    conFile << layer->getInnerRadius() << "\t" << layer->getZ() << "\t" << layer->getChipThickness() << std::endl;
   }
 }
 
@@ -237,7 +246,7 @@ void Detector::createGeometry()
   vTRK->SetTitle(vstrng);
 
   for (auto& layer : mLayers) {
-    layer.createLayer(vTRK);
+    layer->createLayer(vTRK);
   }
 
   // Add service for inner tracker