Skip to content

Commit 12fcd79

Browse files
committed
ALICE3-TRK: correctly setting the path to retrieve matrices from the geometry
1 parent 1aa2c14 commit 12fcd79

File tree

2 files changed

+28
-52
lines changed

2 files changed

+28
-52
lines changed

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
7373
void setOwner(bool v) { mOwner = v; }
7474

7575
void Print(Option_t* opt = "") const;
76-
void PrintChipID(int index, int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int indexRetrieved) const;
76+
void PrintChipID(int index, int subDetID, int petalcase, int disk, int lay, int stave, int halfstave) const;
7777

7878
int getLayer(int index) const;
7979
int getStave(int index) const;

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -263,58 +263,35 @@ bool GeometryTGeo::getChipID(int index, int& subDetID, int& petalcase, int& disk
263263
TString GeometryTGeo::getMatrixPath(int index) const
264264
{
265265

266-
int subDetID, petalcase, disk, lay, stave, halfstave; //// TODO: add chips in a second step
267-
getChipID(index, subDetID, petalcase, disk, lay, stave, halfstave);
266+
int subDetID, petalcase, disk, layer, stave, halfstave; //// TODO: add chips in a second step
267+
getChipID(index, subDetID, petalcase, disk, layer, stave, halfstave);
268268

269-
int indexRetrieved = getChipIndex(subDetID, petalcase, disk, lay, stave, halfstave);
269+
PrintChipID(index, subDetID, petalcase, disk, layer, stave, halfstave);
270270

271-
PrintChipID(index, subDetID, petalcase, disk, lay, stave, halfstave, indexRetrieved);
271+
// TString path = "/cave_1/barrel_1/TRKV_2/TRKLayer0_1/TRKStave0_1/TRKChip0_1/TRKSensor0_1/"; /// dummy path, to be used for tests
272+
TString path = Form("/cave_1/barrel_1/%s_2/", GeometryTGeo::getTRKVolPattern());
272273

273-
// TString path = Form("/cave_1/barrel_1/%s_2/", GeometryTGeo::getTRKVolPattern());
274-
TString path = "/cave_1/barrel_1/TRKV_2/TRKLayer0_1/TRKStave0_1/TRKChip0_1/TRKSensor0_1/"; /// dummy path, to be replaced
275-
276-
// if (wrID >= 0) {
277-
// path += Form("%s%d_1/", getITSWrapVolPattern(), wrID);
278-
// }
279-
280-
// if (isVD) {
281-
// path += Form("%s%d_1/", getTRKPetalPattern(), index);
282-
283-
// } else {
284-
// path += Form("%s%d_1/", getTRKLayerPattern(), index);
285-
// }
286-
287-
// if (!mIsLayerITS3[lay]) {
288-
// path +=
289-
// Form("%s%d_1/", getITSLayerPattern(), lay);
290-
// if (mNumberOfHalfBarrels > 0) {
291-
// path += Form("%s%d_%d/", getITSHalfBarrelPattern(), lay, hba);
292-
// }
293-
// path +=
294-
// Form("%s%d_%d/", getITSStavePattern(), lay, stav);
295-
296-
// if (mNumberOfHalfStaves[lay] > 0) {
297-
// path += Form("%s%d_%d/", getITSHalfStavePattern(), lay, sstav);
298-
// }
299-
// if (mNumberOfModules[lay] > 0) {
300-
// path += Form("%s%d_%d/", getITSModulePattern(), lay, mod);
301-
// }
302-
// path += Form("%s%d_%d/%s%d_1", getITSChipPattern(), lay, chipInMod, getITSSensorPattern(), lay);
303-
// } else {
304-
// // hba = carbonform
305-
// // stav = 0
306-
// // sstav = segment
307-
// // mod = rsu
308-
// // chipInMod = tile
309-
// // sensor = pixelarray
310-
// path += Form("%s_0/", getITS3LayerPattern(lay));
311-
// path += Form("%s_%d/", getITS3CarbonFormPattern(lay), hba);
312-
// path += Form("%s_0/", getITS3ChipPattern(lay));
313-
// path += Form("%s_%d/", getITS3SegmentPattern(lay), sstav);
314-
// path += Form("%s_%d/", getITS3RSUPattern(lay), mod);
315-
// path += Form("%s_%d/", getITS3TilePattern(lay), chipInMod);
316-
// path += Form("%s_0", getITS3PixelArrayPattern(lay));
317-
// }
274+
if (subDetID == 0) { // VD
275+
if (disk >= 0) {
276+
path += Form("%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalDiskPattern(), disk); // PETALCASEx_DISKy_1
277+
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalDiskPattern(), disk, getTRKChipPattern(), disk); // PETALCASEx_DISKy_TRKChipy_1
278+
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalDiskPattern(), disk, getTRKSensorPattern(), disk); // PETALCASEx_DISKy_TRKSensory_1
279+
} else if (layer >= 0) {
280+
path += Form("%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer); // PETALCASEx_LAYERy_1
281+
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKStavePattern(), layer); // PETALCASEx_LAYERy_TRKStavey_1
282+
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKChipPattern(), layer); // PETALCASEx_LAYERy_TRKChipy_1
283+
path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKSensorPattern(), layer); // PETALCASEx_LAYERy_TRKSensory_1
284+
}
285+
} else if (subDetID == 1) { // MLOT
286+
path += Form("%s%d_1/", getTRKLayerPattern(), layer); // TRKLayerx_1
287+
path += Form("%s%d_%d/", getTRKStavePattern(), layer, stave); // TRKStavex_y
288+
if (mNumberOfHalfStaves[layer] == 2) { // staggered geometry
289+
path += Form("%s%d_%d/", getTRKChipPattern(), layer, halfstave); // TRKChipx_0/1
290+
} else if (mNumberOfHalfStaves[layer] == 1) { // turbo geometry
291+
path += Form("%s%d_1/", getTRKChipPattern(), layer); // TRKChipx_1
292+
}
293+
path += Form("%s%d_1/", getTRKSensorPattern(), layer); // TRKSensorx_1
294+
}
318295
return path;
319296
}
320297

@@ -672,7 +649,7 @@ int GeometryTGeo::extractNumberOfHalfStavesMLOT(int lay) const
672649
}
673650

674651
//__________________________________________________________________________
675-
void GeometryTGeo::PrintChipID(int index, int subDetID, int petalcase, int disk, int lay, int stave, int halfstave, int indexRetrieved) const
652+
void GeometryTGeo::PrintChipID(int index, int subDetID, int petalcase, int disk, int lay, int stave, int halfstave) const
676653
{
677654
std::cout << "\nindex = " << index << std::endl;
678655
std::cout << "subDetID = " << subDetID << std::endl;
@@ -682,7 +659,6 @@ void GeometryTGeo::PrintChipID(int index, int subDetID, int petalcase, int disk,
682659
std::cout << "first chip index = " << getFirstChipIndex(lay, petalcase, subDetID) << std::endl;
683660
std::cout << "stave = " << stave << std::endl;
684661
std::cout << "halfstave = " << halfstave << std::endl;
685-
std::cout << "check index Retrieved = " << indexRetrieved << std::endl;
686662
}
687663

688664
//__________________________________________________________________________

0 commit comments

Comments
 (0)