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
cms-sw · Aug 21, 2024 · f9a6bb3 · f9a6bb3
2 parents ede9a56 + 0d07b80
commit f9a6bb3
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 61 deletions.
diff --git a/Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml b/Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml
@@ -3,12 +3,12 @@
 
 <MaterialSection label="hgcalMaterial.xml">
   <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="0.75">
-      <rMaterial name="materials:Tungsten"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.25">
-      <rMaterial name="materials:Copper"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="0.75">
+    <rMaterial name="materials:Tungsten"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.25">
+    <rMaterial name="materials:Copper"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HGC_G10-FR4" density="1.70*g/cm3" symbol=" " method="mixture by weight">
    <MaterialFraction fraction="0.18077359">
@@ -28,78 +28,113 @@
    </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="PyrexGlass" density="2.230*g/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="0.040061">
-      <rMaterial name="materials:Bor 10"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.539564">
-      <rMaterial name="materials:Oxygen"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.028191">
-      <rMaterial name="materials:Sodium"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.011644">
-      <rMaterial name="materials:Aluminium"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.377220">
-      <rMaterial name="materials:Silicon"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.003321">
-      <rMaterial name="materials:Potassium"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="0.040061">
+    <rMaterial name="materials:Bor 10"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.539564">
+    <rMaterial name="materials:Oxygen"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.028191">
+    <rMaterial name="materials:Sodium"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.011644">
+    <rMaterial name="materials:Aluminium"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.377220">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.003321">
+    <rMaterial name="materials:Potassium"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="LeadGlass" density="2.230*g/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="0.156453">
-      <rMaterial name="materials:Oxygen"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.080866">
-      <rMaterial name="materials:Silicon"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.008092">
-      <rMaterial name="materials:Titanium"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.002651">
-      <rMaterial name="materials:Arsenic"/>
-    </MaterialFraction>
-    <MaterialFraction fraction="0.751938">
-      <rMaterial name="materials:Lead"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="0.156453">
+    <rMaterial name="materials:Oxygen"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.080866">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.008092">
+    <rMaterial name="materials:Titanium"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.002651">
+    <rMaterial name="materials:Arsenic"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.751938">
+    <rMaterial name="materials:Lead"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HGC_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="1.0">
-      <rMaterial name="materials:Air"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HGC_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="1.0">
-      <rMaterial name="materials:Air"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HGC_Cables" density="2.68*g/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="1.0">
-      <rMaterial name="materials:Cables"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Cables"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_EEServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_HEServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_TileServicess" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_Kapton" density="1.11*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Kapton"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_Epoxy" density="1.30*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Epoxy"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_Hexaboard" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_HEBasePlate" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HFN_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="1.0">
-      <rMaterial name="materials:Air"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HFN_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
-    <MaterialFraction fraction="1.0">
-      <rMaterial name="materials:Air"/>
-    </MaterialFraction>
+   <MaterialFraction fraction="1.0">
+    <rMaterial name="materials:Air"/>
+   </MaterialFraction>
   </CompositeMaterial>
   <CompositeMaterial name="HFN_CarbonFib" density="1.69*g/cm3" symbol=" " method="mixture by weight">
    <MaterialFraction fraction="0.84491305">
     <rMaterial name="materials:Carbon"/>
-  </MaterialFraction>
+   </MaterialFraction>
    <MaterialFraction fraction="0.042542086">
     <rMaterial name="materials:Hydrogen"/>
-  </MaterialFraction>
+   </MaterialFraction>
    <MaterialFraction fraction="0.11254487">
     <rMaterial name="materials:Oxygen"/>
-  </MaterialFraction>
-</CompositeMaterial>
- </MaterialSection>
+   </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
 
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalPassiveV19XML_cfi.py
@@ -10,7 +10,7 @@
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalpos.xml'),

diff --git a/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py
@@ -55,7 +55,7 @@
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
         'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml',