Skip to content

Commit f9a6bb3

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45736 from bsunanda/Phase2-hgx359P
Phase2-hgx359P Prepare the material file to be updated later once the composition known for materials for the silicon component of HGCal
2 parents ede9a56 + 0d07b80 commit f9a6bb3

File tree

3 files changed

+96
-61
lines changed

3 files changed

+96
-61
lines changed

‎Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml‎

Lines changed: 94 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
<MaterialSection label="hgcalMaterial.xml">
55
<CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
6-
<MaterialFraction fraction="0.75">
7-
<rMaterial name="materials:Tungsten"/>
8-
</MaterialFraction>
9-
<MaterialFraction fraction="0.25">
10-
<rMaterial name="materials:Copper"/>
11-
</MaterialFraction>
6+
<MaterialFraction fraction="0.75">
7+
<rMaterial name="materials:Tungsten"/>
8+
</MaterialFraction>
9+
<MaterialFraction fraction="0.25">
10+
<rMaterial name="materials:Copper"/>
11+
</MaterialFraction>
1212
</CompositeMaterial>
1313
<CompositeMaterial name="HGC_G10-FR4" density="1.70*g/cm3" symbol=" " method="mixture by weight">
1414
<MaterialFraction fraction="0.18077359">
@@ -28,78 +28,113 @@
2828
</MaterialFraction>
2929
</CompositeMaterial>
3030
<CompositeMaterial name="PyrexGlass" density="2.230*g/cm3" symbol=" " method="mixture by weight">
31-
<MaterialFraction fraction="0.040061">
32-
<rMaterial name="materials:Bor 10"/>
33-
</MaterialFraction>
34-
<MaterialFraction fraction="0.539564">
35-
<rMaterial name="materials:Oxygen"/>
36-
</MaterialFraction>
37-
<MaterialFraction fraction="0.028191">
38-
<rMaterial name="materials:Sodium"/>
39-
</MaterialFraction>
40-
<MaterialFraction fraction="0.011644">
41-
<rMaterial name="materials:Aluminium"/>
42-
</MaterialFraction>
43-
<MaterialFraction fraction="0.377220">
44-
<rMaterial name="materials:Silicon"/>
45-
</MaterialFraction>
46-
<MaterialFraction fraction="0.003321">
47-
<rMaterial name="materials:Potassium"/>
48-
</MaterialFraction>
31+
<MaterialFraction fraction="0.040061">
32+
<rMaterial name="materials:Bor 10"/>
33+
</MaterialFraction>
34+
<MaterialFraction fraction="0.539564">
35+
<rMaterial name="materials:Oxygen"/>
36+
</MaterialFraction>
37+
<MaterialFraction fraction="0.028191">
38+
<rMaterial name="materials:Sodium"/>
39+
</MaterialFraction>
40+
<MaterialFraction fraction="0.011644">
41+
<rMaterial name="materials:Aluminium"/>
42+
</MaterialFraction>
43+
<MaterialFraction fraction="0.377220">
44+
<rMaterial name="materials:Silicon"/>
45+
</MaterialFraction>
46+
<MaterialFraction fraction="0.003321">
47+
<rMaterial name="materials:Potassium"/>
48+
</MaterialFraction>
4949
</CompositeMaterial>
5050
<CompositeMaterial name="LeadGlass" density="2.230*g/cm3" symbol=" " method="mixture by weight">
51-
<MaterialFraction fraction="0.156453">
52-
<rMaterial name="materials:Oxygen"/>
53-
</MaterialFraction>
54-
<MaterialFraction fraction="0.080866">
55-
<rMaterial name="materials:Silicon"/>
56-
</MaterialFraction>
57-
<MaterialFraction fraction="0.008092">
58-
<rMaterial name="materials:Titanium"/>
59-
</MaterialFraction>
60-
<MaterialFraction fraction="0.002651">
61-
<rMaterial name="materials:Arsenic"/>
62-
</MaterialFraction>
63-
<MaterialFraction fraction="0.751938">
64-
<rMaterial name="materials:Lead"/>
65-
</MaterialFraction>
51+
<MaterialFraction fraction="0.156453">
52+
<rMaterial name="materials:Oxygen"/>
53+
</MaterialFraction>
54+
<MaterialFraction fraction="0.080866">
55+
<rMaterial name="materials:Silicon"/>
56+
</MaterialFraction>
57+
<MaterialFraction fraction="0.008092">
58+
<rMaterial name="materials:Titanium"/>
59+
</MaterialFraction>
60+
<MaterialFraction fraction="0.002651">
61+
<rMaterial name="materials:Arsenic"/>
62+
</MaterialFraction>
63+
<MaterialFraction fraction="0.751938">
64+
<rMaterial name="materials:Lead"/>
65+
</MaterialFraction>
6666
</CompositeMaterial>
6767
<CompositeMaterial name="HGC_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
68-
<MaterialFraction fraction="1.0">
69-
<rMaterial name="materials:Air"/>
70-
</MaterialFraction>
68+
<MaterialFraction fraction="1.0">
69+
<rMaterial name="materials:Air"/>
70+
</MaterialFraction>
7171
</CompositeMaterial>
7272
<CompositeMaterial name="HGC_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
73-
<MaterialFraction fraction="1.0">
74-
<rMaterial name="materials:Air"/>
75-
</MaterialFraction>
73+
<MaterialFraction fraction="1.0">
74+
<rMaterial name="materials:Air"/>
75+
</MaterialFraction>
7676
</CompositeMaterial>
7777
<CompositeMaterial name="HGC_Cables" density="2.68*g/cm3" symbol=" " method="mixture by weight">
78-
<MaterialFraction fraction="1.0">
79-
<rMaterial name="materials:Cables"/>
80-
</MaterialFraction>
78+
<MaterialFraction fraction="1.0">
79+
<rMaterial name="materials:Cables"/>
80+
</MaterialFraction>
81+
</CompositeMaterial>
82+
<CompositeMaterial name="HGC_EEServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
83+
<MaterialFraction fraction="1.0">
84+
<rMaterial name="materials:Air"/>
85+
</MaterialFraction>
86+
</CompositeMaterial>
87+
<CompositeMaterial name="HGC_HEServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
88+
<MaterialFraction fraction="1.0">
89+
<rMaterial name="materials:Air"/>
90+
</MaterialFraction>
91+
</CompositeMaterial>
92+
<CompositeMaterial name="HGC_TileServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
93+
<MaterialFraction fraction="1.0">
94+
<rMaterial name="materials:Air"/>
95+
</MaterialFraction>
96+
</CompositeMaterial>
97+
<CompositeMaterial name="HGC_Kapton" density="1.11*g/cm3" symbol=" " method="mixture by weight">
98+
<MaterialFraction fraction="1.0">
99+
<rMaterial name="materials:Kapton"/>
100+
</MaterialFraction>
101+
</CompositeMaterial>
102+
<CompositeMaterial name="HGC_Epoxy" density="1.30*g/cm3" symbol=" " method="mixture by weight">
103+
<MaterialFraction fraction="1.0">
104+
<rMaterial name="materials:Epoxy"/>
105+
</MaterialFraction>
106+
</CompositeMaterial>
107+
<CompositeMaterial name="HGC_Hexaboard" density="1.70*g/cm3" symbol=" " method="mixture by weight">
108+
<MaterialFraction fraction="1.0">
109+
<rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
110+
</MaterialFraction>
111+
</CompositeMaterial>
112+
<CompositeMaterial name="HGC_HEBasePlate" density="1.70*g/cm3" symbol=" " method="mixture by weight">
113+
<MaterialFraction fraction="1.0">
114+
<rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
115+
</MaterialFraction>
81116
</CompositeMaterial>
82117
<CompositeMaterial name="HFN_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
83-
<MaterialFraction fraction="1.0">
84-
<rMaterial name="materials:Air"/>
85-
</MaterialFraction>
118+
<MaterialFraction fraction="1.0">
119+
<rMaterial name="materials:Air"/>
120+
</MaterialFraction>
86121
</CompositeMaterial>
87122
<CompositeMaterial name="HFN_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
88-
<MaterialFraction fraction="1.0">
89-
<rMaterial name="materials:Air"/>
90-
</MaterialFraction>
123+
<MaterialFraction fraction="1.0">
124+
<rMaterial name="materials:Air"/>
125+
</MaterialFraction>
91126
</CompositeMaterial>
92127
<CompositeMaterial name="HFN_CarbonFib" density="1.69*g/cm3" symbol=" " method="mixture by weight">
93128
<MaterialFraction fraction="0.84491305">
94129
<rMaterial name="materials:Carbon"/>
95-
</MaterialFraction>
130+
</MaterialFraction>
96131
<MaterialFraction fraction="0.042542086">
97132
<rMaterial name="materials:Hydrogen"/>
98-
</MaterialFraction>
133+
</MaterialFraction>
99134
<MaterialFraction fraction="0.11254487">
100135
<rMaterial name="materials:Oxygen"/>
101-
</MaterialFraction>
102-
</CompositeMaterial>
103-
</MaterialSection>
136+
</MaterialFraction>
137+
</CompositeMaterial>
138+
</MaterialSection>
104139

105140
</DDDefinition>

‎Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'Geometry/CMSCommonData/data/cmsMother.xml',
1111
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
1212
'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
13-
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
13+
'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
1414
'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
1515
'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
1616
'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalpos.xml'),

‎Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
5656
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
5757
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
58-
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
58+
'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
5959
'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
6060
'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
6161
'Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml',

0 commit comments

Comments
 (0)