Skip to content

Commit a5a6318

Browse files
rliotino99alibuild
andauthored
[ALICE3] FT3: fix kapton fractional Z (#15753)
* Update kaptonMat to use TGeoMixture Changed kaptonMat from TGeoMaterial to TGeoMixture and defined its elements. * Change kaptonMat to TGeoMixture and define elements Updated kaptonMat from TGeoMaterial to TGeoMixture and defined its elements. * Change kaptonMat type from TGeoMaterial to TGeoMixture * Change kaptonMat type from TGeoMaterial to TGeoMixture * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 9d5742d commit a5a6318

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Layer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class FT3Layer : public TObject
6969
static TGeoMaterial* carbonFiberMat;
7070
static TGeoMedium* medCarbonFiber;
7171

72-
static TGeoMaterial* kaptonMat;
72+
static TGeoMixture* kaptonMat;
7373
static TGeoMedium* kaptonMed;
7474

7575
static TGeoMaterial* waterMat;

Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class FT3Module
3838
static TGeoMedium* siliconMed;
3939
static TGeoMaterial* copperMat;
4040
static TGeoMedium* copperMed;
41-
static TGeoMaterial* kaptonMat;
41+
static TGeoMixture* kaptonMat;
4242
static TGeoMedium* kaptonMed;
4343
static TGeoMaterial* epoxyMat;
4444
static TGeoMedium* epoxyMed;

Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FT3Layer::~FT3Layer() = default;
4040
TGeoMaterial* FT3Layer::carbonFiberMat = nullptr;
4141
TGeoMedium* FT3Layer::medCarbonFiber = nullptr;
4242

43-
TGeoMaterial* FT3Layer::kaptonMat = nullptr;
43+
TGeoMixture* FT3Layer::kaptonMat = nullptr;
4444
TGeoMedium* FT3Layer::kaptonMed = nullptr;
4545

4646
TGeoMaterial* FT3Layer::waterMat = nullptr;
@@ -97,7 +97,12 @@ void FT3Layer::initialize_mat()
9797
medFoam = new TGeoMedium("FT3_Foam", 1, itsFoam);
9898
foamMat = medFoam->GetMaterial();
9999

100-
kaptonMat = new TGeoMaterial("Kapton (cooling pipe)", 13.84, 6.88, 1.346);
100+
kaptonMat = new TGeoMixture("Kapton (cooling pipe)", 4, 1.346); // C22 H10 N2 O5
101+
102+
kaptonMat->DefineElement(0, 12.0107, 6, 0.5641); // Carbon
103+
kaptonMat->DefineElement(1, 1.00794, 1, 0.2564); // Hydrogen
104+
kaptonMat->DefineElement(2, 14.0067, 7, 0.0513); // Nitrogen
105+
kaptonMat->DefineElement(3, 15.999, 8, 0.1282); // Oxygen
101106
kaptonMed = new TGeoMedium("Kapton (cooling pipe)", 1, kaptonMat);
102107

103108
waterMat = new TGeoMaterial("Water", 18.01528, 8.0, 1.064);

Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TGeoMedium* FT3Module::siliconMed = nullptr;
3535
TGeoMaterial* FT3Module::copperMat = nullptr;
3636
TGeoMedium* FT3Module::copperMed = nullptr;
3737

38-
TGeoMaterial* FT3Module::kaptonMat = nullptr;
38+
TGeoMixture* FT3Module::kaptonMat = nullptr;
3939
TGeoMedium* FT3Module::kaptonMed = nullptr;
4040

4141
TGeoMaterial* FT3Module::epoxyMat = nullptr;
@@ -66,7 +66,12 @@ void FT3Module::initialize_materials()
6666
copperMat = new TGeoMaterial("FT3_Copper", 63.546, 29, 8.96);
6767
copperMed = new TGeoMedium("FT3_Copper", 2, copperMat);
6868

69-
kaptonMat = new TGeoMaterial("FT3_Kapton", 13.84, 6.88, 1.346);
69+
TGeoMixture* kaptonMat = new TGeoMixture("FT3_Kapton", 4, 1.346); // C22 H10 N2 O5
70+
71+
kaptonMat->DefineElement(0, 12.0107, 6, 0.5641); // Carbon
72+
kaptonMat->DefineElement(1, 1.00794, 1, 0.2564); // Hydrogen
73+
kaptonMat->DefineElement(2, 14.0067, 7, 0.0513); // Nitrogen
74+
kaptonMat->DefineElement(3, 15.999, 8, 0.1282); // Oxygen
7075
kaptonMed = new TGeoMedium("FT3_Kapton", 3, kaptonMat);
7176

7277
// TODO: Check with Rene the exact type of carbon fiber

0 commit comments

Comments
 (0)