From eaf3be1b837c4b852e9702758e53d853c841d87f Mon Sep 17 00:00:00 2001 From: Matteo Concas Date: Wed, 30 Jun 2021 14:58:11 +0200 Subject: [PATCH 1/3] Fix length and thickness of TRK --- .../ALICE3/TRK/simulation/src/Detector.cxx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx index b998050f9440d..b53bc5384a464 100644 --- a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx +++ b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx @@ -111,20 +111,20 @@ void Detector::configITS(Detector* its) std::vector> layers; const int nLayers{12}; - layers.emplace_back(std::array{0.5f, 15.f}); - layers.emplace_back(std::array{1.2f, 15.f}); - layers.emplace_back(std::array{2.5f, 15.f}); - layers.emplace_back(std::array{3.75f, 62.f}); - layers.emplace_back(std::array{7.f, 62.f}); - layers.emplace_back(std::array{12.f, 62.f}); - layers.emplace_back(std::array{20.f, 62.f}); - layers.emplace_back(std::array{30.f, 62.f}); - layers.emplace_back(std::array{45.f, 132.f}); - layers.emplace_back(std::array{60.f, 132.f}); - layers.emplace_back(std::array{80.f, 132.f}); - layers.emplace_back(std::array{100.f, 132.f}); - - std::array sensorThicknesses = {50.e-4, 50.e-4, 50.e-4, 50.e-4, 50.e-3, 50.e-3, 50.e-3, 50.e-3, 50.e-3, 50.e-3, 50.e-3, 50.e-3}; + layers.emplace_back(std::array{0.5f, 30.f}); + layers.emplace_back(std::array{1.2f, 30.f}); + layers.emplace_back(std::array{2.5f, 30.f}); + layers.emplace_back(std::array{3.75f, 124.f}); + layers.emplace_back(std::array{7.f, 124.f}); + layers.emplace_back(std::array{12.f, 124.f}); + layers.emplace_back(std::array{20.f, 124.f}); + layers.emplace_back(std::array{30.f, 124.f}); + layers.emplace_back(std::array{45.f, 264.f}); + layers.emplace_back(std::array{60.f, 264.f}); + layers.emplace_back(std::array{80.f, 264.f}); + layers.emplace_back(std::array{100.f, 264.f}); + + std::array sensorThicknesses = {100.e-4, 100.e-4, 100.e-4, 100.e-4, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3}; its->setStaveModelOB(o2::trk::Detector::kOBModel2); // its->createOuterBarrel(false); From 7d8619c38c495a2a7a8850243fd8fec554c98cee Mon Sep 17 00:00:00 2001 From: Matteo Concas Date: Wed, 30 Jun 2021 15:04:48 +0200 Subject: [PATCH 2/3] Update ALICE 3 beam pipe default length --- macro/build_geometry.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macro/build_geometry.C b/macro/build_geometry.C index fc3e02f2099b1..0f6e749bfb407 100644 --- a/macro/build_geometry.C +++ b/macro/build_geometry.C @@ -144,7 +144,7 @@ void build_geometry(FairRunSim* run = nullptr) #ifdef ENABLE_UPGRADES // upgraded beampipe at the interaction point (IP) if (isActivated("A3IP")) { - run->AddModule(new o2::passive::Alice3Pipe("A3IP", "Alice 3 beam pipe", !isActivated("TRK"), 0.48f, 0.015f, 44.4f, 3.7f, 0.05f, 44.4f)); + run->AddModule(new o2::passive::Alice3Pipe("A3IP", "Alice 3 beam pipe", !isActivated("TRK"), 0.48f, 0.015f, 1000.f, 3.7f, 0.05f, 1000.f)); } #endif From b366d97474d02d00ec2d2ecaf8661e3658dd104d Mon Sep 17 00:00:00 2001 From: Matteo Concas Date: Fri, 2 Jul 2021 10:30:40 +0200 Subject: [PATCH 3/3] Dummy trigger for CI --- Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx index b53bc5384a464..482ee207f37b8 100644 --- a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx +++ b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx @@ -126,7 +126,6 @@ void Detector::configITS(Detector* its) std::array sensorThicknesses = {100.e-4, 100.e-4, 100.e-4, 100.e-4, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3, 100.e-3}; its->setStaveModelOB(o2::trk::Detector::kOBModel2); - // its->createOuterBarrel(false); auto idLayer{0}; for (auto& layerData : layers) {