Merge pull request #34625 from fabiocos/fc-etlv6only

MTD geometry: fix scenario I14 for material budget studies
cms-sw · Jul 27, 2021 · 0dbab80 · 0dbab80
2 parents 2d4666f + 74bec7e
commit 0dbab80
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/Geometry/MTDCommonData/data/etl/v6/etl.xml b/Geometry/MTDCommonData/data/etl/v6/etl.xml
@@ -214,7 +214,7 @@
     </LogicalPart>
     <LogicalPart name="FrontModerator" category="unspecified">
       <rSolid name="etl:FrontModerator"/>
-      <rMaterial name="materials:Borated Polyethyl."/>
+      <rMaterial name="mtdMaterial:Borated_Polyethyl."/>
     </LogicalPart>
     <LogicalPart name="Cables" category="unspecified">
       <rSolid name="etl:Cables"/>

diff --git a/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml b/Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml
@@ -154,6 +154,11 @@
         <rMaterial name="materials:Air"/>
       </MaterialFraction>
     </CompositeMaterial>
+    <CompositeMaterial name="Borated_Polyethyl." density="950*mg/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Borated Polyethyl."/>
+      </MaterialFraction>
+    </CompositeMaterial>
   </MaterialSection>
 
 </DDDefinition>
diff --git a/Validation/Geometry/data/mtdMaterials.l0 b/Validation/Geometry/data/mtdMaterials.l0
@@ -97,3 +97,25 @@ ServiceHybrid_PCB                                        0.000 0.000 0.000 0.000
 Aluminium_Nitride                                        0.000 0.000 0.000 0.000 1.000
 
 ThermalScreenComposite                                   0.000 0.000 0.000 1.000 0.000
+
+ETLPatchPanel                                            0.000 0.000 0.000 0.000 1.000
+
+Tin                                                      0.000 0.000 0.000 0.000 1.000
+
+Cables1                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables2                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables3                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables4                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables5                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables6                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables7                                                  0.000 0.000 0.000 0.000 1.000
+
+Carbon_fibre_str_Upgrade                                 0.000 0.000 0.000 1.000 0.000
+
+Borated_Polyethyl.                                       0.000 0.000 0.000 1.000 0.000
diff --git a/Validation/Geometry/data/mtdMaterials.x0 b/Validation/Geometry/data/mtdMaterials.x0
@@ -97,3 +97,25 @@ ServiceHybrid_PCB                                        0.000 0.000 0.000 0.000
 Aluminium_Nitride                                        0.000 0.000 0.000 0.000 1.000
 
 ThermalScreenComposite                                   0.000 0.000 0.000 1.000 0.000
+
+ETLPatchPanel                                            0.000 0.000 0.000 0.000 1.000
+
+Tin                                                      0.000 0.000 0.000 0.000 1.000
+
+Cables1                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables2                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables3                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables4                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables5                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables6                                                  0.000 0.000 0.000 0.000 1.000
+
+Cables7                                                  0.000 0.000 0.000 0.000 1.000
+
+Carbon_fibre_str_Upgrade                                 0.000 0.000 0.000 1.000 0.000
+
+Borated_Polyethyl.                                       0.000 0.000 0.000 1.000 0.000
diff --git a/Validation/Geometry/macros/MaterialBudgetMtd.C b/Validation/Geometry/macros/MaterialBudgetMtd.C
@@ -99,15 +99,15 @@ void createPlots(TString plot) {
     abscissaName = TString("#eta");
     ordinateName = TString("t/#lambda_{I}");
     ymin = 0.0;
-    ymax = 0.08;
+    ymax = 0.18;
     xmin = -4.0;
     xmax = 4.0;
   } else if (plot.CompareTo("l_vs_phi") == 0) {
     plotNumber = 1020;
     abscissaName = TString("#varphi [rad]");
     ordinateName = TString("t/#lambda_{I}");
     ymin = 0.0;
-    ymax = 0.08;
+    ymax = 0.18;
     xmin = -3.2;
     xmax = 3.2;
   } else {