Merge pull request #16204 from bsunanda/Run2-TB15

bsunanda:Run2-TB15 Changes due to modification of names in materials.xml
cms-sw · Oct 14, 2016 · 8a0cea1 · 8a0cea1
2 parents 857818d + 897f122
commit 8a0cea1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/Geometry/ForwardCommonData/data/totemt2.xml b/Geometry/ForwardCommonData/data/totemt2.xml
@@ -66,9 +66,9 @@
         </LogicalPart>
         <LogicalPart name="TotemT2gem_driftspace7r" category="unspecified">
             <rSolid name="TotemT2gem_driftspace7r"/>
-            <!-- <rMaterial name="materials:80% Argon + 20% CO_2"/> -->
+            <!-- <rMaterial name="materials:80pct Argon plus 20pct CO_2"/> -->
             <rMaterial name="totemMaterials:Ar(70%)+CO_2(30%)"/>
-            <!-- <rMaterial name="totemMaterials:Ar(50%)+CO_2(50%)"/> -->
+            <!-- <rMaterial name="totemMaterials:Ar 50pct plus CO_2 50pct"/> -->
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GEMa7r" category="unspecified">
             <rSolid name="TotemT2gem_GEMa7r"/>
@@ -84,9 +84,9 @@
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GAS7r" category="unspecified">
             <rSolid name="TotemT2gem_GAS7r"/>
-            <!-- <rMaterial name="materials:80% Argon + 20% CO_2"/> -->
+            <!-- <rMaterial name="materials:80pct Argon plus 20pct CO_2"/> -->
             <rMaterial name="totemMaterials:Ar(70%)+CO_2(30%)"/>
-            <!--  <rMaterial name="totemMaterials:Ar(50%)+CO_2(50%)"/> -->
+            <!--  <rMaterial name="totemMaterials:Ar 50pct plus CO_2 50pct"/> -->
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GEMa17r" category="unspecified">
             <rSolid name="TotemT2gem_GEMa17r"/>
@@ -102,9 +102,9 @@
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GAS17r" category="unspecified">
             <rSolid name="TotemT2gem_GAS17r"/>
-            <!-- <rMaterial name="materials:80% Argon + 20% CO_2"/> -->
+            <!-- <rMaterial name="materials:80pct Argon plus 20pct CO_2"/> -->
             <rMaterial name="totemMaterials:Ar(70%)+CO_2(30%)"/>
-            <!--  <rMaterial name="totemMaterials:Ar(50%)+CO_2(50%)"/> -->
+            <!--  <rMaterial name="totemMaterials:Ar 50pct plus CO_2 50pct"/> -->
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GEMa27r" category="unspecified">
             <rSolid name="TotemT2gem_GEMa27r"/>
@@ -120,9 +120,9 @@
         </LogicalPart>
         <LogicalPart name="TotemT2gem_GAS27r" category="unspecified">
             <rSolid name="TotemT2gem_GAS27r"/>
-            <!-- <rMaterial name="materials:80% Argon + 20% CO_2"/> -->
+            <!-- <rMaterial name="materials:80pct Argon plus 20pct CO_2"/> -->
             <rMaterial name="totemMaterials:Ar(70%)+CO_2(30%)"/>
-            <!--  <rMaterial name="totemMaterials:Ar(50%)+CO_2(50%)"/> -->
+            <!--  <rMaterial name="totemMaterials:Ar 50pct plus CO_2 50pct"/> -->
         </LogicalPart>
         <LogicalPart name="TotemT2gem_strips7r" category="unspecified">
             <rSolid name="TotemT2gem_strips7r"/>

diff --git a/Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml b/Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml
@@ -91,7 +91,7 @@
   </LogicalPart>
   <LogicalPart name="HGCGasChamb" category="unspecified">
     <rSolid name="HGCGasChamb"/>
-    <rMaterial name="materials:80% Argon + 20% CO_2"/>
+    <rMaterial name="materials:80pct Argon plus 20pct CO_2"/>
   </LogicalPart>
   <LogicalPart name="HGCScint1" category="unspecified">
     <rSolid name="HGCScint1"/>

diff --git a/Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml b/Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml
@@ -93,7 +93,7 @@
   </LogicalPart>
   <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
     <rSolid name="HGCalBeamWChambGas"/>
-    <rMaterial name="materials:Ar(50%)+CO_2(50%)"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
   </LogicalPart>
   <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
     <rSolid name="HGCalBeamWChambVet"/>

diff --git a/Geometry/HcalTestBeamData/data/TBHcal04BeamLine.xml b/Geometry/HcalTestBeamData/data/TBHcal04BeamLine.xml
@@ -82,7 +82,7 @@
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambGas" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambGas"/>
-			<rMaterial name="materials:Ar(50%)+CO_2(50%)"/>
+			<rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambVet" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambVet"/>

diff --git a/Geometry/HcalTestBeamData/data/TBHcal06BeamLine.xml b/Geometry/HcalTestBeamData/data/TBHcal06BeamLine.xml
@@ -98,7 +98,7 @@
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambGas" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambGas"/>
-			<rMaterial name="materials:Ar(50%)+CO_2(50%)"/>
+			<rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambVet" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambVet"/>

diff --git a/Geometry/HcalTestBeamData/data/TBHcal07BeamLine.xml b/Geometry/HcalTestBeamData/data/TBHcal07BeamLine.xml
@@ -98,7 +98,7 @@
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambGas" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambGas"/>
-			<rMaterial name="materials:Ar(50%)+CO_2(50%)"/>
+			<rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambVet" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambVet"/>

diff --git a/Geometry/HcalTestBeamData/data/TBHcal10BeamLine.xml b/Geometry/HcalTestBeamData/data/TBHcal10BeamLine.xml
@@ -94,7 +94,7 @@
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambGas" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambGas"/>
-			<rMaterial name="materials:Ar(50%)+CO_2(50%)"/>
+			<rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
 		</LogicalPart>
 		<LogicalPart name="HcalTestBeamLineWChambVet" category="unspecified">
 			<rSolid name="HcalTestBeamLineWChambVet"/>