Merge pull request #5189 from ianna/extended-test2014-scenario

Geometry -- Extended Test 2014 Scenario
cms-sw · Sep 6, 2014 · 6722d64 · 6722d64
2 parents 310c588 + 219b0bc
commit 6722d64
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtendedTest2014_cff.py b/Configuration/Geometry/python/GeometryExtendedTest2014_cff.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryTest2014XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+
diff --git a/Geometry/TrackerCommonData/data/pixfwdMaterials.xml b/Geometry/TrackerCommonData/data/pixfwdMaterials.xml
@@ -237,7 +237,7 @@
         <rMaterial name="trackermaterial:T_Aluminium" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_Servi_Cylind" density="0.261469*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_Servi_Cylind" density="0.20113*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.96427">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_CF" />
       </MaterialFraction>
@@ -305,7 +305,7 @@
         <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_End_Coil_Fiber" density="0.259779*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_End_Coil_Fiber" density="0.19983*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.55642">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester" />
       </MaterialFraction>
@@ -350,7 +350,7 @@
         <rMaterial name="pixfwdMaterials:FPix_Cylind_POLIAX" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_Port_Cards" density="1.59614*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_Port_Cards" density="1.2278*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.54216">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_G10" />
       </MaterialFraction>

diff --git a/Geometry/TrackerCommonData/data/test2014/pixfwdMaterials.xml b/Geometry/TrackerCommonData/data/test2014/pixfwdMaterials.xml
@@ -237,7 +237,7 @@
         <rMaterial name="trackermaterial:T_Aluminium" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_Servi_Cylind" density="0.261469*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_Servi_Cylind" density="0.20113*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.96427">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_CF" />
       </MaterialFraction>
@@ -305,7 +305,7 @@
         <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_End_Coil_Fiber" density="0.259779*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_End_Coil_Fiber" density="0.19983*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.55642">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester" />
       </MaterialFraction>
@@ -350,7 +350,7 @@
         <rMaterial name="pixfwdMaterials:FPix_Cylind_POLIAX" />
       </MaterialFraction>
     </CompositeMaterial>
-    <CompositeMaterial name="Pix_Fwd_Port_Cards" density="1.59614*g/cm3" method="mixture by weight"  symbol=" ">
+    <CompositeMaterial name="Pix_Fwd_Port_Cards" density="1.2278*g/cm3" method="mixture by weight" pork="true" symbol=" ">
       <MaterialFraction fraction="0.54216">
         <rMaterial name="pixfwdMaterials:FPix_Cylind_G10" />
       </MaterialFraction>