Skip to content

TRK: IRIS service aluminium from the MaterialManager #15912

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

TRK: IRIS service aluminium from the MaterialManager #15912

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
2 changes: 2 additions & 0 deletions Detectors/Upgrades/ALICE3/TRKFT3/TRK/simulation/src/TRKServices.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ void TRKServices::createMaterials()
matmgr.Mixture("ALICE3_TRKSERVICES", 74, "ALUMINIUM5083", aAl5083, zAl5083, dAl5083, 9, wAl5083); // AL5083 - Candidate for IRIS vacuum vessel
matmgr.Mixture("ALICE3_TRKSERVICES", 75, "ALUMINIUMBERYLLIUMMETAL", aAlBeMet, zAlBeMet, dAlBeMet, 2, wAlBeMet); // Aluminium-Beryllium metal - Candidate for IRIS vacuum vessel
matmgr.Material("ALICE3_TRKSERVICES", 76, "CARBONFIBERM55J6K", 12.0107, 6, 1.92, 22.4, 45.4); // Carbon Fiber M55J
matmgr.Material("ALICE3_TRKSERVICES", 78, "ALUMINIUM", 26.9815, 13, 2.70, 8.897, 39.70); // Aluminium for the IRIS service modules
matmgr.Mixture("ALICE3_PIPE", 77, "VACUUM", aAir, zAir, dAir1, 4, wAir);

matmgr.Medium("ALICE3_TRKSERVICES", 1, "CERAMIC", 66, 0, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); // Ceramic for cold plate
Expand All @@ -127,6 +128,7 @@ void TRKServices::createMaterials()
matmgr.Medium("ALICE3_TRKSERVICES", 10, "ALUMINIUMBERYLLIUMMETAL", 75, 0, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); // AlBeMet for IRIS vacuum vessel
matmgr.Medium("ALICE3_TRKSERVICES", 11, "CARBONFIBERM55J6K", 76, 0, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); // Carbon Fiber M55J
matmgr.Medium("ALICE3_PIPE", 12, "VACUUM", 77, 0, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); // Vacuum inside the beam pipe
matmgr.Medium("ALICE3_TRKSERVICES", 13, "ALUMINIUM", 78, 0, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); // Aluminium for the IRIS service modules
}

void TRKServices::createServices(TGeoVolume* motherVolume)
Expand Down
12 changes: 6 additions & 6 deletions Detectors/Upgrades/ALICE3/TRKFT3/TRK/simulation/src/VDGeometryBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,11 @@ static void addIRISServiceModules(TGeoVolume* petalAsm, int nPetals)
return;
}

auto* matAl = new TGeoMaterial("ALUMINUM", 26.9815, 13, 2.70);
const TGeoMedium* med = new TGeoMedium("ALUMINUM", 4, matAl);
auto& matmgr = o2::base::MaterialManager::Instance();
const TGeoMedium* med = matmgr.getTGeoMedium("ALICE3_TRKSERVICES_ALUMINIUM");

if (!med) {
LOGP(error, "addIRISServiceModules: ALUMINUM medium not found.");
LOGP(error, "addIRISServiceModules: ALICE3_TRKSERVICES_ALUMINIUM medium not found.");
return;
}

Expand Down Expand Up @@ -617,11 +617,11 @@ static void addIRISServiceModulesSegmented(TGeoVolume* petalAsm, int nPetals)
// --- Petal φ-span (segment)
const double halfPhi = 0.5 * (360.0 / double(nPetals));

auto* matAl = new TGeoMaterial("ALUMINUM", 26.9815, 13, 2.70);
const TGeoMedium* med = new TGeoMedium("ALUMINUM", 4, matAl);
auto& matmgr = o2::base::MaterialManager::Instance();
const TGeoMedium* med = matmgr.getTGeoMedium("ALICE3_TRKSERVICES_ALUMINIUM");

if (!med) {
LOGP(error, "addIRISServiceModules: ALUMINUM medium not found.");
LOGP(error, "addIRISServiceModulesSegmented: ALICE3_TRKSERVICES_ALUMINIUM medium not found.");
return;
}

Expand Down
Loading