diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Layer.h b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Layer.h index 282f8fd274ec0..512326949128b 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Layer.h +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Layer.h @@ -69,7 +69,7 @@ class FT3Layer : public TObject static TGeoMaterial* carbonFiberMat; static TGeoMedium* medCarbonFiber; - static TGeoMaterial* kaptonMat; + static TGeoMixture* kaptonMat; static TGeoMedium* kaptonMed; static TGeoMaterial* waterMat; diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h index 75c1cfb7210e3..5a60850460ba2 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h @@ -38,7 +38,7 @@ class FT3Module static TGeoMedium* siliconMed; static TGeoMaterial* copperMat; static TGeoMedium* copperMed; - static TGeoMaterial* kaptonMat; + static TGeoMixture* kaptonMat; static TGeoMedium* kaptonMed; static TGeoMaterial* epoxyMat; static TGeoMedium* epoxyMed; diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx index 7fce06e029764..080fcbdffa0d6 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx @@ -40,7 +40,7 @@ FT3Layer::~FT3Layer() = default; TGeoMaterial* FT3Layer::carbonFiberMat = nullptr; TGeoMedium* FT3Layer::medCarbonFiber = nullptr; -TGeoMaterial* FT3Layer::kaptonMat = nullptr; +TGeoMixture* FT3Layer::kaptonMat = nullptr; TGeoMedium* FT3Layer::kaptonMed = nullptr; TGeoMaterial* FT3Layer::waterMat = nullptr; @@ -97,7 +97,12 @@ void FT3Layer::initialize_mat() medFoam = new TGeoMedium("FT3_Foam", 1, itsFoam); foamMat = medFoam->GetMaterial(); - kaptonMat = new TGeoMaterial("Kapton (cooling pipe)", 13.84, 6.88, 1.346); + kaptonMat = new TGeoMixture("Kapton (cooling pipe)", 4, 1.346); // C22 H10 N2 O5 + + kaptonMat->DefineElement(0, 12.0107, 6, 0.5641); // Carbon + kaptonMat->DefineElement(1, 1.00794, 1, 0.2564); // Hydrogen + kaptonMat->DefineElement(2, 14.0067, 7, 0.0513); // Nitrogen + kaptonMat->DefineElement(3, 15.999, 8, 0.1282); // Oxygen kaptonMed = new TGeoMedium("Kapton (cooling pipe)", 1, kaptonMat); waterMat = new TGeoMaterial("Water", 18.01528, 8.0, 1.064); diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx index d91ca5f83168e..f659ff333d741 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx @@ -35,7 +35,7 @@ TGeoMedium* FT3Module::siliconMed = nullptr; TGeoMaterial* FT3Module::copperMat = nullptr; TGeoMedium* FT3Module::copperMed = nullptr; -TGeoMaterial* FT3Module::kaptonMat = nullptr; +TGeoMixture* FT3Module::kaptonMat = nullptr; TGeoMedium* FT3Module::kaptonMed = nullptr; TGeoMaterial* FT3Module::epoxyMat = nullptr; @@ -66,7 +66,12 @@ void FT3Module::initialize_materials() copperMat = new TGeoMaterial("FT3_Copper", 63.546, 29, 8.96); copperMed = new TGeoMedium("FT3_Copper", 2, copperMat); - kaptonMat = new TGeoMaterial("FT3_Kapton", 13.84, 6.88, 1.346); + TGeoMixture* kaptonMat = new TGeoMixture("FT3_Kapton", 4, 1.346); // C22 H10 N2 O5 + + kaptonMat->DefineElement(0, 12.0107, 6, 0.5641); // Carbon + kaptonMat->DefineElement(1, 1.00794, 1, 0.2564); // Hydrogen + kaptonMat->DefineElement(2, 14.0067, 7, 0.0513); // Nitrogen + kaptonMat->DefineElement(3, 15.999, 8, 0.1282); // Oxygen kaptonMed = new TGeoMedium("FT3_Kapton", 3, kaptonMat); // TODO: Check with Rene the exact type of carbon fiber