1st commit. Scenario D57 implementing etl/v5 added

cms-sw · Jun 18, 2020 · df1e818 · df1e818
1 parent 296f7f1
commit df1e818
Show file tree

Hide file tree

Showing 4 changed files with 3,460 additions and 0 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -35,6 +35,7 @@ Fast Timing system:
 * I10: Same as I9 w/ material adjustments
 * I11: Same as I10, xml reorganized, comparison base for new ETL and DD4hep migration
 * I12: Starting from I11, new ETL layout from MTD TDR
+* I13: Starting from I12, new ETL layout implementing half-disks instead of quarters
 
 The script also handles the common and forward elements of the geometry:
 * O2: detailed cavern description

diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1479,6 +1479,34 @@
         ],
         "era" : "phase2_timing, phase2_timing_layer",
     },
+    "I13" : {
+        1 : [
+            'Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml',
+            'Geometry/MTDCommonData/data/btl/v1/btl.xml',
+            'Geometry/MTDCommonData/data/etl/v5/etl.xml',
+            'Geometry/MTDCommonData/data/mtdParameters/v2/mtdStructureTopology.xml',
+            'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
+            ],
+        3 : [
+            'Geometry/MTDSimData/data/v2/mtdsens.xml'
+            ],
+        4 : [
+            'Geometry/MTDSimData/data/v2/mtdProdCuts.xml'
+            ],
+        "sim" : [
+            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *',
+        ],
+        "reco" :[
+            'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
+            'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *',
+            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *',
+            'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
+            'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
+            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
+            'mtdGeometry.applyAlignment = cms.bool(False)'
+        ],
+        "era" : "phase2_timing, phase2_timing_layer",
+    },
 }
 
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ]

diff --git a/Geometry/MTDCommonData/data/dd4hep/cms-mtdD57-geometry.xml b/Geometry/MTDCommonData/data/dd4hep/cms-mtdD57-geometry.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_materials/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+    <debug_specpars/>
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <ConstantsSection label="" eval="true">
+    <Constant name="world_x" value="100*m"/>
+    <Constant name="world_y" value="100*m"/>
+    <Constant name="world_z" value="100*m"/>
+    <Constant name="fm"      value="1e-12*m"/>
+    <Constant name="mum"     value="1.e-3*mm"/>
+    <Constant name="Air"     value="materials:Air"     type="string"/>
+    <Constant name="Vacuum"  value="materials:Vacuum"  type="string"/>
+  </ConstantsSection>
+
+  <IncludeSection>
+    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/> -->
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
+    <!-- <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/> -->
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml'/> -->
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml'/> -->
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/> -->
+    <Include ref='Geometry/MTDCommonData/data/dd4hep/tracker.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdStructureTopology.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v2/mtdsens.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
+  </IncludeSection>
+
+  <!-- <PosPartSection label=""> -->
+  <!--   <PosPart copyNumber="1"> -->
+  <!--     <rParent name=":world_volume"/> -->
+  <!--     <rChild name="cms:OCMS"/> -->
+  <!--   </PosPart> -->
+  <!-- </PosPartSection> -->
+</DDDefinition>