Cleanup

Author: plariono

Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx

@@ -122,7 +122,8 @@ void Alice3Pipe::ConstructGeometry()
   // Add everything to the barrel
   barrel->AddNode(pipeVolume, 1, new TGeoTranslation(0, 30.f, 0));
 
-  pipeVolume->SetLineColor(kGreen + 3);
+  pipeVolume->SetLineColor(37);
+  pipeVolume->SetTransparency(10);
 }
 
 void Alice3Pipe::createMaterials()

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

@@ -42,15 +42,12 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   };
   static const char* getTRKVolPattern() { return sVolumeName.c_str(); }
   static const char* getTRKLayerPattern() { return sLayerName.c_str(); }
-  static const char* getVDLayerPattern() { return sVDLayerName.c_str(); }
-  static const char* getVDDiskPattern() { return sVDDiskName.c_str(); }
   static const char* getTRKPetalPattern() { return sPetalName.c_str(); }
   static const char* getTRKPetalDiskPattern() { return sPetalDiskName.c_str(); }
   static const char* getTRKPetalLayerPattern() { return sPetalLayerName.c_str(); }
   static const char* getTRKStavePattern() { return sStaveName.c_str(); }
   static const char* getTRKChipPattern() { return sChipName.c_str(); }
   static const char* getTRKSensorPattern() { return sSensorName.c_str(); }
-  static const char* getVDSensorPattern() { return sVDSensorName.c_str(); }
   static const char* getTRKWrapVolPattern() { return sWrapperVolumeName.c_str(); }
 
   int getNumberOfChips() const { return mSize; }
@@ -144,9 +141,6 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   static std::string sVolumeName;
   static std::string sLayerName;
-  static std::string sVDLayerName;
-  static std::string sVDDiskName;
-  static std::string sVDSensorName;
   static std::string sPetalName;
   static std::string sPetalDiskName;
   static std::string sPetalLayerName;

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

@@ -24,16 +24,13 @@ std::unique_ptr<o2::trk::GeometryTGeo> GeometryTGeo::sInstance;
 // Names
 std::string GeometryTGeo::sVolumeName = "TRKV";
 std::string GeometryTGeo::sLayerName = "TRKLayer";
+std::string GeometryTGeo::sPetalName = "PETALCASE";
 std::string GeometryTGeo::sPetalDiskName = "DISK";
 std::string GeometryTGeo::sPetalLayerName = "LAYER";
 std::string GeometryTGeo::sStaveName = "TRKStave";
 std::string GeometryTGeo::sChipName = "TRKChip";
 std::string GeometryTGeo::sSensorName = "TRKSensor";
 
-std::string GeometryTGeo::sPetalName = "Petal";
-std::string GeometryTGeo::sVDLayerName = "Layer";
-std::string GeometryTGeo::sVDDiskName = "Disk";
-std::string GeometryTGeo::sVDSensorName = "VDSensor";
 std::string GeometryTGeo::sWrapperVolumeName = "TRKUWrapVol"; ///< Wrapper volume name, not implemented at the moment
 
 o2::trk::GeometryTGeo::~GeometryTGeo()

Detectors/Upgrades/ALICE3/TRK/simulation/CMakeLists.txt

@@ -18,9 +18,6 @@ o2_add_library(TRKSimulation
                        src/Digitizer.cxx
                        src/TRKServices.cxx
                        src/DPLDigitizerParam.cxx
-                       src/TRKPetalCase.cxx
-                       src/TRKPetalLayer.cxx
-                       src/TRKPetalDisk.cxx
                        src/VDLayer.cxx
                        src/VDGeometryBuilder.cxx
                PUBLIC_LINK_LIBRARIES O2::TRKBase
@@ -37,9 +34,7 @@ o2_target_root_dictionary(TRKSimulation
                                   include/TRKSimulation/Detector.h
                                   include/TRKSimulation/TRKLayer.h
                                   include/TRKSimulation/TRKServices.h
-                                  include/TRKSimulation/TRKPetalCase.h
-                                  include/TRKSimulation/TRKPetalLayer.h
-                                  include/TRKSimulation/TRKPetalDisk.h
                                   include/TRKSimulation/VDLayer.h
                                   include/TRKSimulation/VDGeometryBuilder.h
+                                  include/TRKSimulation/VDSensorRegistry.h
                                   include/TRKSimulation/DPLDigitizerParam.h)

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

@@ -17,7 +17,6 @@
 
 #include "TRKSimulation/TRKLayer.h"
 #include "TRKSimulation/TRKServices.h"
-#include "TRKSimulation/TRKPetalCase.h"
 #include "TRKBase/GeometryTGeo.h"
 
 #include <TLorentzVector.h>
@@ -92,7 +91,6 @@ class Detector : public o2::base::DetImpl<Detector>
   std::vector<o2::itsmft::Hit>* mHits; // ITSMFT ones for the moment
   std::vector<TRKLayer> mLayers;
   TRKServices mServices;                 // Houses the services of the TRK, but not the Iris tracker
-  std::vector<TRKPetalCase> mPetalCases; // Houses the Iris tracker and its services. Created fully in the beam pipe
 
   std::vector<std::string> mFirstOrLastLayers; // Names of the first or last layers
   bool InsideFirstOrLastLayer(std::string layerName);
@@ -106,8 +104,6 @@ class Detector : public o2::base::DetImpl<Detector>
  public:
   static constexpr Int_t sNumberVDPetalCases = 4;          //! Number of VD petals
   int getNumberOfLayers() const { return mLayers.size(); } //! Number of TRK layers
-  int getNumberOfLayersVD() const { return mPetalCases[0].mPetalLayers.size(); }
-  int getNumberOfDisksVD() const { return mPetalCases[0].mPetalDisks.size(); }
 
   void Print(FairVolume* vol, int volume, int subDetID, int layer, int stave, int halfstave, int chipID) const;
 

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

@@ -266,7 +266,7 @@ void Detector::createGeometry()
 
   // Choose the VD design (here: IRIS4 by default).
   // You can wire this to a parameter in TRKBaseParam if desired.
-  // Alternatives: createIRIS5Geometry(vVD); createIRIS4aGeometry(vVD);
+  // Alternatives: createIRIS5Geometry(vTRK); createIRIS4aGeometry(vTRK);
   o2::trk::createIRIS4Geometry(vTRK);
 
   mServices.excavateFromVacuum("IRIS_CUTOUTsh");