From 511f51221bc9cf5595979555b6a6ba6cfed55773 Mon Sep 17 00:00:00 2001 From: Matteo Concas Date: Mon, 24 Jul 2023 16:57:19 +0200 Subject: [PATCH 1/2] ALICE3: Excavate outer pipe vacuum to host coldplate --- Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx b/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx index 8fa58d079a116..17618b1b04561 100644 --- a/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx +++ b/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx @@ -109,11 +109,12 @@ void Alice3Pipe::ConstructGeometry() 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 compositeFormula{"OUT_PIPEVACUUM_BASEsh"}; // If pipe is alone we won't subctract anything TString subtractorsFormula; if (!mIsTRKActivated) { std::vector trkLayerShapes; + std::vector> layersQuotas = {std::array{0.5f, 50.f, 50.e-4}, // TODO: Set layers dynamically. {radius, zLen, thickness} std::array{1.2f, 50.f, 50.e-4}, std::array{2.5f, 50.f, 50.e-4}}; @@ -126,9 +127,14 @@ void Alice3Pipe::ConstructGeometry() subtractorsFormula += Form("+TRKLAYER_%dsh", iLayer); } } - LOG(debug) << "Subtractors formula before: " << subtractorsFormula; + + // Escavate vacuum for hosting cold plate + TGeoTube* coldPlate = new TGeoTube("TRK_COLDPLATEsh", 2.6f, 2.6f + 150.e-3, 50.f); + subtractorsFormula += "+TRK_COLDPLATEsh"; + + LOG(info) << "Subtractors formula before : " << subtractorsFormula; subtractorsFormula = Form("-(%s)", subtractorsFormula.Data()); - LOG(debug) << "Subtractors formula after: " << subtractorsFormula; + LOG(info) << "Subtractors formula after: " << subtractorsFormula; outerBerylliumTubeVacuumComposite = new TGeoCompositeShape("OUT_PIPEVACUUMsh", (compositeFormula + subtractorsFormula).Data()); outerBerylliumTubeVacuumVolume = new TGeoVolume("OUT_PIPEVACUUM", outerBerylliumTubeVacuumComposite, kMedVac); From 01ba4bf6de025533096736a9bc3b573de44f8642 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Mon, 24 Jul 2023 17:01:47 +0200 Subject: [PATCH 2/2] Please consider the following formatting changes (#59) --- Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx b/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx index 17618b1b04561..319f21a71f9f8 100644 --- a/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx +++ b/Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx @@ -109,7 +109,7 @@ void Alice3Pipe::ConstructGeometry() 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 compositeFormula{"OUT_PIPEVACUUM_BASEsh"}; // If pipe is alone we won't subctract anything TString subtractorsFormula; if (!mIsTRKActivated) {