@@ -275,13 +275,15 @@ TString GeometryTGeo::getMatrixPath(int index) const
275275
276276 if (subDetID == 0 ) { // VD
277277 if (disk >= 0 ) {
278- path += Form (" %s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalDiskPattern (), disk); // PETALCASEx_DISKy_1
279- path += Form (" %s%d_%s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalDiskPattern (), disk, getTRKChipPattern (), disk); // PETALCASEx_DISKy_TRKChipy_1
278+ path += Form (" %s_%d_%d/" , getTRKPetalAssemblyPattern (), petalcase, petalcase + 1 ); // PETAL_n
279+ path += Form (" %s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalDiskPattern (), disk); // PETALCASEx_DISKy_1
280+ // path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalDiskPattern(), disk, getTRKChipPattern(), disk); // PETALCASEx_DISKy_TRKChipy_1
280281 path += Form (" %s%d_%s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalDiskPattern (), disk, getTRKSensorPattern (), disk); // PETALCASEx_DISKy_TRKSensory_1
281282 } else if (layer >= 0 ) {
282- path += Form (" %s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalLayerPattern (), layer); // PETALCASEx_LAYERy_1
283- path += Form (" %s%d_%s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalLayerPattern (), layer, getTRKStavePattern (), layer); // PETALCASEx_LAYERy_TRKStavey_1
284- path += Form (" %s%d_%s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalLayerPattern (), layer, getTRKChipPattern (), layer); // PETALCASEx_LAYERy_TRKChipy_1
283+ path += Form (" %s_%d_%d/" , getTRKPetalAssemblyPattern (), petalcase, petalcase + 1 ); // PETAL_n
284+ path += Form (" %s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalLayerPattern (), layer); // PETALCASEx_LAYERy_1
285+ // path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKStavePattern(), layer); // PETALCASEx_LAYERy_TRKStavey_1
286+ // path += Form("%s%d_%s%d_%s%d_1/", getTRKPetalPattern(), petalcase, getTRKPetalLayerPattern(), layer, getTRKChipPattern(), layer); // PETALCASEx_LAYERy_TRKChipy_1
285287 path += Form (" %s%d_%s%d_%s%d_1/" , getTRKPetalPattern (), petalcase, getTRKPetalLayerPattern (), layer, getTRKSensorPattern (), layer); // PETALCASEx_LAYERy_TRKSensory_1
286288 }
287289 } else if (subDetID == 1 ) { // MLOT
0 commit comments