Skip to content

ALICE 3 feat: Configurable VD design, set def to IRIS 4, remove IRIS disks #15055

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
plariono wants to merge 1 commit into
base: dev
Choose a base branch
from
+34 −5
Open

ALICE 3 feat: Configurable VD design, set def to IRIS 4, remove IRIS disks #15055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/TRKBaseParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ enum eLayout {
kStaggered,
};

enum eVDLayout {
kIRIS4 = 0,
kIRISFullCyl,
kIRIS5,
kIRIS4a,
};

struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
std::string configFile = "";
float serviceTubeX0 = 0.02f; // X0 Al2O3
Expand All @@ -40,9 +47,11 @@ struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {

eLayout layoutML = kTurboStaves; // Type of segmentation for the middle layers
eLayout layoutOL = kStaggered; // Type of segmentation for the outer layers
eVDLayout layoutVD = kIRIS4; // VD detector layout design

eLayout getLayoutML() const { return layoutML; }
eLayout getLayoutOL() const { return layoutOL; }
eVDLayout getLayoutVD() const { return layoutVD; }

O2ParamDef(TRKBaseParam, "TRKBase");
};
Expand Down
28 changes: 24 additions & 4 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 @@ -261,12 +261,32 @@ void Detector::createGeometry()
mServices.createServices(vTRK);

// Build the VD using the petal builder
// Choose the VD design (here: IRIS4 by default).
// You can wire this to a parameter in TRKBaseParam if desired.
// Alternatives: createIRIS5Geometry(vTRK); createIRIS4aGeometry(vTRK);
// Choose the VD design based on TRKBaseParam.layoutVD
auto& trkPars = TRKBaseParam::Instance();

o2::trk::clearVDSensorRegistry();
o2::trk::createIRISGeometryFullCyl(vTRK);

switch (trkPars.layoutVD) {
case kIRIS4:
LOG(info) << "Building VD with IRIS4 layout";
o2::trk::createIRIS4Geometry(vTRK);
break;
case kIRISFullCyl:
LOG(info) << "Building VD with IRIS fully cylindrical layout";
o2::trk::createIRISGeometryFullCyl(vTRK);
break;
case kIRIS5:
LOG(info) << "Building VD with IRIS5 layout";
o2::trk::createIRIS5Geometry(vTRK);
break;
case kIRIS4a:
LOG(info) << "Building VD with IRIS4a layout";
o2::trk::createIRIS4aGeometry(vTRK);
break;
default:
LOG(fatal) << "Unknown VD layout option: " << static_cast<int>(trkPars.layoutVD);
break;
}

// Fill sensor names from registry right after geometry creation
const auto& regs = o2::trk::vdSensorRegistry();
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ALICE3/TRK/simulation/src/VDGeometryBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ static TGeoVolume* buildPetalAssembly(int nPetals,
/*fullCylindricalRadialWalls=*/fullCylinders);

addBarrelLayers(petalAsm, nPetals, petalID, rectangularL0, fullCylinders);
addDisks(petalAsm, nPetals, petalID, fullCylinders);
// addDisks(petalAsm, nPetals, petalID, fullCylinders); // disks removed according to the v3b layout

addColdPlate(petalAsm, nPetals, petalID, /*fullCylinders=*/false);
addIRISServiceModulesSegmented(petalAsm, nPetals);
Expand Down