Fix extrusions and overlaps

mconcas · mconcas · commit 433ed5c9cb66 · 2021-03-03T16:12:03.000+01:00
diff --git a/Detectors/Upgrades/ALICE3/Passive/include/Alice3DetectorsPassive/Pipe.h b/Detectors/Upgrades/ALICE3/Passive/include/Alice3DetectorsPassive/Pipe.h
@@ -25,7 +25,7 @@ class Alice3Pipe : public Alice3PassiveBase
   ~Alice3Pipe() override;
   Alice3Pipe(const char* name,
              const char* title = "Alice 3 Pipe",
-             const bool isAlone = false,
+             const bool isTRKActivated = false,
              const float rMinInnerPipe = 0.f,
              const float innerThickness = 0.f,
              const float innerLength = 0.f,
@@ -48,22 +48,22 @@ class Alice3Pipe : public Alice3PassiveBase
   float getOuterWidth() const { return mBeOuterPipeThick; }
   float getOuterDz() const { return mOuterIpHLength; }
 
-  bool getIsAlone() const { return mIsAlone; }
+  bool IsTRKActivated() const { return mIsTRKActivated; }
 
  private:
   void createMaterials();
   Alice3Pipe(const Alice3Pipe& orig) = default;
   Alice3Pipe& operator=(const Alice3Pipe&);
 
-  float mBeInnerPipeRmin = 0.;  // inner diameter of the Be section
-  float mBeInnerPipeThick = 0.; // inner section  thickness
+  float mBeInnerPipeRmin = 0.;  // inner diameter of the inner Be section
+  float mBeInnerPipeThick = 0.; // inner beam pipe section thickness
   float mInnerIpHLength = 0.;   // half length of the inner beampipe around the IP
 
-  float mBeOuterPipeRmin = 0.;  // outer diameter of the Be section
-  float mBeOuterPipeThick = 0.; // outer section  thickness
+  float mBeOuterPipeRmin = 0.;  // inner diameter of the outer Be section
+  float mBeOuterPipeThick = 0.; // outer beam pipe section thickness
   float mOuterIpHLength = 0.;   // half length of the outer beampipe around the IP
 
-  bool mIsAlone = true; // If A3IP is simulated alone don't subtract TRK shapes
+  bool mIsTRKActivated = true; // If TRK is not active don't create TRK layers allocations in the vacuum volume
 
   ClassDefOverride(Alice3Pipe, 1);
 };
diff --git a/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx b/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx
@@ -29,15 +29,15 @@ using namespace o2::passive;
 Alice3Pipe::Alice3Pipe() : Alice3PassiveBase{"Alice3PIPE", ""} {}
 Alice3Pipe::Alice3Pipe(const char* name,
                        const char* title,
-                       bool isAlone,
+                       bool isTRKActivated,
                        float rMinInnerPipe,
                        float innerThickness,
                        float innerLength,
                        float rMinOuterPipe,
                        float outerThickness,
                        float outerLength)
   : Alice3PassiveBase{name, title},
-    mIsAlone{isAlone},
+    mIsTRKActivated{isTRKActivated},
     mBeInnerPipeRmin{rMinInnerPipe},
     mBeInnerPipeThick{innerThickness},
     mInnerIpHLength{innerLength},
@@ -104,14 +104,14 @@ void Alice3Pipe::ConstructGeometry()
   TGeoVolume* outerBeTubeVolume = new TGeoVolume("OUT_PIPE", outerBeTube, kMedBe);
   outerBeTubeVolume->SetLineColor(kBlue);
 
-  TGeoTube* outerBerylliumTubeVacuumBase = new TGeoTube("OUT_PIPEVACUUM_BASEsh", 0., mBeOuterPipeRmin, mOuterIpHLength); // Vacuum filling for outer pipe
-  TGeoCompositeShape* outerBerylliumTubeVacuumComposite;                                                                 // Composite volume to subctract to vacuum
-  TGeoVolume* outerBerylliumTubeVacuumVolume;                                                                            // Final volume to be used
+  TGeoTube* outerBerylliumTubeVacuumBase = new TGeoTube("OUT_PIPEVACUUM_BASEsh", mBeInnerPipeRmin + mBeInnerPipeThick, mBeOuterPipeRmin, mOuterIpHLength); // Vacuum filling for outer pipe
+  TGeoCompositeShape* outerBerylliumTubeVacuumComposite;                                                                                                   // Composite volume to subctract to vacuum
+  TGeoVolume* outerBerylliumTubeVacuumVolume;                                                                                                              // Final volume to be used
 
   TString compositeFormula{"OUT_PIPEVACUUM_BASEsh"}; // If pipe is alone we won't subctract anything
   TString subtractorsFormula;
 
-  if (!mIsAlone) {
+  if (!mIsTRKActivated) {
     std::vector<TGeoTube*> trkLayerShapes;
     std::vector<std::array<float, 3>> layersQuotas = {std::array<float, 3>{0.5f, 15.f, 50.e-4}, // TODO: Set layers dynamically. {radius, zLen, thickness}
                                                       std::array<float, 3>{1.2f, 15.f, 50.e-4},
@@ -139,7 +139,8 @@ void Alice3Pipe::ConstructGeometry()
   outerBerylliumTubeVacuumVolume->SetTransparency(50);
   outerBerylliumTubeVacuumVolume->SetLineColor(kGreen);
 
-  outerBeTubeVolume->AddNode(outerBerylliumTubeVacuumVolume, 1, gGeoIdentity);
+  //  outerBeTubeVolume->AddNode(outerBerylliumTubeVacuumVolume, 1, gGeoIdentity);
+  barrel->AddNode(outerBerylliumTubeVacuumVolume, 1, new TGeoTranslation(0, 30.f, 0));
 
   barrel->AddNode(outerBeTubeVolume, 1, new TGeoTranslation(0, 30.f, 0)); // Add to surrounding geometry
 
