Skip to content

Fix some of the ALICE 3 geometry issues #6562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 3 commits into from
Jul 8, 2021
Merged

Fix some of the ALICE 3 geometry issues #6562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaf3be1
Fix length and thickness of TRK
mconcas Jun 30, 2021
7d8619c
Update ALICE 3 beam pipe default length
mconcas Jun 30, 2021
b366d97
Dummy trigger for CI
mconcas Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,21 @@ void Detector::configITS(Detector* its)

std::vector<std::array<double, 2>> layers;
const int nLayers{12};
layers.emplace_back(std::array<double, 2>{0.5f, 15.f});
layers.emplace_back(std::array<double, 2>{1.2f, 15.f});
layers.emplace_back(std::array<double, 2>{2.5f, 15.f});
layers.emplace_back(std::array<double, 2>{3.75f, 62.f});
layers.emplace_back(std::array<double, 2>{7.f, 62.f});
layers.emplace_back(std::array<double, 2>{12.f, 62.f});
layers.emplace_back(std::array<double, 2>{20.f, 62.f});
layers.emplace_back(std::array<double, 2>{30.f, 62.f});
layers.emplace_back(std::array<double, 2>{45.f, 132.f});
layers.emplace_back(std::array<double, 2>{60.f, 132.f});
layers.emplace_back(std::array<double, 2>{80.f, 132.f});
layers.emplace_back(std::array<double, 2>{100.f, 132.f});

std::array<float, 12> 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<double, 2>{0.5f, 30.f});
layers.emplace_back(std::array<double, 2>{1.2f, 30.f});
layers.emplace_back(std::array<double, 2>{2.5f, 30.f});
layers.emplace_back(std::array<double, 2>{3.75f, 124.f});
layers.emplace_back(std::array<double, 2>{7.f, 124.f});
layers.emplace_back(std::array<double, 2>{12.f, 124.f});
layers.emplace_back(std::array<double, 2>{20.f, 124.f});
layers.emplace_back(std::array<double, 2>{30.f, 124.f});
layers.emplace_back(std::array<double, 2>{45.f, 264.f});
layers.emplace_back(std::array<double, 2>{60.f, 264.f});
layers.emplace_back(std::array<double, 2>{80.f, 264.f});
layers.emplace_back(std::array<double, 2>{100.f, 264.f});

std::array<float, 12> 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) {
Expand Down
2 changes: 1 addition & 1 deletion macro/build_geometry.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down