Skip to content

[ALICE 3] Fix cylindrical MLOT layout #15168

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

Open
scannito wants to merge 3 commits into
base: dev
Choose a base branch
from
+59 −41
Open

[ALICE 3] Fix cylindrical MLOT layout #15168

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
32bae57
Fix cylindrical version
scannito Mar 16, 2026
b64d6d6
Fix print
scannito Mar 16, 2026
4b85bce
Remove commented lines
scannito Mar 16, 2026
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
46 changes: 23 additions & 23 deletions Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,17 @@ void GeometryTGeo::Build(int loadTrans)
mLastChipIndexMLOT.resize(mNumberOfLayersMLOT); /// ML and OT are part of TRK as the same detector, without disks

for (int i = 0; i < mNumberOfLayersMLOT; i++) {
mNumberOfStaves[i] = extractNumberOfStavesMLOT(i);
mNumberOfHalfStaves[i] = extractNumberOfHalfStavesMLOT(i);
mNumberOfModules[i] = extractNumberOfModulesMLOT(i);
mNumberOfChips[i] = extractNumberOfChipsMLOT(i);
if (mLayoutMLOT == eMLOTLayout::kCylindrical) {
mNumberOfStaves[i] = 1;
mNumberOfHalfStaves[i] = 1;
mNumberOfModules[i] = 1;
mNumberOfChips[i] = 1;
} else {
mNumberOfStaves[i] = extractNumberOfStavesMLOT(i);
mNumberOfHalfStaves[i] = extractNumberOfHalfStavesMLOT(i);
mNumberOfModules[i] = extractNumberOfModulesMLOT(i);
mNumberOfChips[i] = extractNumberOfChipsMLOT(i);
}
}

int numberOfChipsTotal = 0;
Expand Down Expand Up @@ -398,19 +405,8 @@ TString GeometryTGeo::getMatrixPath(int index) const

// PrintChipID(index, subDetID, petalcase, disk, layer, stave, halfstave, mod, chip);

// TString path = "/cave_1/barrel_1/TRKV_2/TRKLayer0_1/TRKStave0_1/TRKChip0_1/TRKSensor0_1/"; /// dummy path, to be used for tests
TString path = Form("/cave_1/barrel_1/%s_2/", GeometryTGeo::getTRKVolPattern());

// handling cylindrical configuration for ML and/or OT
// needed because of the different numbering scheme in the geometry for the cylindrical case wrt the staggered and turbo ones
if (subDetID == 1) {
if ((layer < 4 && mLayoutMLOT == eMLOTLayout::kCylindrical) || (layer > 3 && mLayoutMLOT == eMLOTLayout::kCylindrical)) {
stave = 1;
mod = 1;
chip = 1;
}
}

// build the path
if (subDetID == 0) { // VD
if (disk >= 0) {
Expand All @@ -425,15 +421,19 @@ TString GeometryTGeo::getMatrixPath(int index) const
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKChipPattern(), layer); // PETALCASEx_LAYERy_TRKChipy_1
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKSensorPattern(), layer); // PETALCASEx_LAYERy_TRKSensory_1
}
} else if (subDetID == 1) { // MLOT
path += Form("%s%d_1/", getTRKLayerPattern(), layer); // TRKLayerx_1
path += Form("%s%d_%d/", getTRKStavePattern(), layer, stave); // TRKStavex_y
if (mNumberOfHalfStaves[layer] == 2) { // staggered geometry
path += Form("%s%d_%d/", getTRKHalfStavePattern(), layer, halfstave); // TRKHalfStavex_y
} else if (subDetID == 1) { // MLOT
Copy link
Collaborator

@njacazio njacazio Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ciao @scannito at some point these indices should be defined in the header as constexprs

path += Form("%s%d_1/", getTRKLayerPattern(), layer); // TRKLayerx_1
if (mLayoutMLOT == eMLOTLayout::kCylindrical) {
path += Form("%s%d_1/", getTRKSensorPattern(), layer); // TRKSensorx_1
} else {
path += Form("%s%d_%d/", getTRKStavePattern(), layer, stave); // TRKStavex_y
if (mNumberOfHalfStaves[layer] == 2) { // staggered geometry
path += Form("%s%d_%d/", getTRKHalfStavePattern(), layer, halfstave); // TRKHalfStavex_y
}
path += Form("%s%d_%d/", getTRKModulePattern(), layer, mod); // TRKModulx_y
path += Form("%s%d_%d/", getTRKChipPattern(), layer, chip); // TRKChipx_y
path += Form("%s%d_1/", getTRKSensorPattern(), layer); // TRKSensorx_1
}
path += Form("%s%d_%d/", getTRKModulePattern(), layer, mod); // TRKModulx_y
path += Form("%s%d_%d/", getTRKChipPattern(), layer, chip); // TRKChipx_y
path += Form("%s%d_1/", getTRKSensorPattern(), layer); // TRKSensorx_1
}
return path;
}
Expand Down
54 changes: 36 additions & 18 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 @@ -475,18 +475,24 @@ bool Detector::ProcessHits(FairVolume* vol)
if (stopHit) {
TLorentzVector positionStop;
fMC->TrackPosition(positionStop);

// Retrieve the indices with the volume path
int stave(0), halfstave(0), mod(0), chip(0);

auto& trkPars = TRKBaseParam::Instance();

if (subDetID == 1) {
fMC->CurrentVolOffID(1, chip);
fMC->CurrentVolOffID(2, mod);
if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 2) {
fMC->CurrentVolOffID(3, halfstave);
fMC->CurrentVolOffID(4, stave);
} else if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 1) {
fMC->CurrentVolOffID(3, stave);
} else {
LOGP(fatal, "Wrong number of halfstaves for layer {}", layer);
if (trkPars.layoutMLOT == o2::trk::eMLOTLayout::kSegmented) {
fMC->CurrentVolOffID(1, chip);
fMC->CurrentVolOffID(2, mod);
if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 2) {
fMC->CurrentVolOffID(3, halfstave);
fMC->CurrentVolOffID(4, stave);
} else if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 1) {
fMC->CurrentVolOffID(3, stave);
} else {
LOGP(fatal, "Wrong number of halfstaves for layer {}", layer);
}
}
} /// if VD, for the moment the volume is the "chipID" so no need to retrieve other elments

Expand Down Expand Up @@ -522,18 +528,30 @@ void Detector::Print(FairVolume* vol, int volume, int subDetID, int layer, int s
int currentVol(0);
LOG(info) << "Current volume name: " << fMC->CurrentVolName() << " and ID " << fMC->CurrentVolID(currentVol);
LOG(info) << "volume: " << volume << "/" << mNumberOfVolumes - 1;
LOG(info) << "off volume name 1 " << fMC->CurrentVolOffName(1) << " chip: " << chip;
LOG(info) << "off volume name 2 " << fMC->CurrentVolOffName(2) << " module: " << mod;
if (subDetID == 1 && mGeometryTGeo->getNumberOfHalfStaves(layer) == 2) { // staggered geometry
LOG(info) << "off volume name 3 " << fMC->CurrentVolOffName(3) << " halfstave: " << halfstave;
LOG(info) << "off volume name 4 " << fMC->CurrentVolOffName(4) << " stave: " << stave;
LOG(info) << "SubDetector ID: " << subDetID << " Layer: " << layer << " staveinLayer: " << stave << " Chip ID: " << chipID;
} else if (subDetID == 1 && mGeometryTGeo->getNumberOfHalfStaves(layer) == 1) { // turbo geometry
LOG(info) << "off volume name 3 " << fMC->CurrentVolOffName(3) << " stave: " << stave;
LOG(info) << "SubDetector ID: " << subDetID << " Layer: " << layer << " staveinLayer: " << stave << " Chip ID: " << chipID;

auto& trkPars = TRKBaseParam::Instance();

if (subDetID == 1) { // MLOT
if (trkPars.layoutMLOT == o2::trk::eMLOTLayout::kCylindrical) {
LOG(info) << "off volume name 1 " << fMC->CurrentVolOffName(1) << " chip: " << chip;
LOG(info) << "SubDetector ID: " << subDetID << " Layer: " << layer << " Chip ID: " << chipID;
} else {
LOG(info) << "off volume name 1 " << fMC->CurrentVolOffName(1) << " chip: " << chip;
LOG(info) << "off volume name 2 " << fMC->CurrentVolOffName(2) << " module: " << mod;
if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 2) { // staggered geometry
LOG(info) << "off volume name 3 " << fMC->CurrentVolOffName(3) << " halfstave: " << halfstave;
LOG(info) << "off volume name 4 " << fMC->CurrentVolOffName(4) << " stave: " << stave;
LOG(info) << "SubDetector ID: " << subDetID << " Layer: " << layer << " staveinLayer: " << stave << " Chip ID: " << chipID;
} else if (mGeometryTGeo->getNumberOfHalfStaves(layer) == 1) { // turbo geometry
LOG(info) << "off volume name 3 " << fMC->CurrentVolOffName(3) << " stave: " << stave;
LOG(info) << "SubDetector ID: " << subDetID << " Layer: " << layer << " staveinLayer: " << stave << " Chip ID: " << chipID;
}
}
} else {
// VD
LOG(info) << "SubDetector ID: " << subDetID << " Chip ID: " << chipID;
}

LOG(info);
}

Expand Down
Loading