Merge pull request #27824 from ghugo83/skewed_IT

Add Skewed Phase 2 Inner Tracker geometry (T16).
cms-sw · Aug 30, 2019 · d0001ef · d0001ef
2 parents 29e0d7f + 8d7d067
commit d0001ef
Show file tree

Hide file tree

Showing 9 changed files with 14,002 additions and 0 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -7,6 +7,7 @@ Tracker:
 * T6: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.4) (TEDD slighly rotated + Inner Tracker barrel has lower radii than TDR T5 geometry)
 * T14: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Based from T12. OT: reduced envelope. IT: new chip size, different radii, 2x2 modules everywhere in TEPX, new ring paradigm in TEPX)
 * T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.)
+* T16: Active geometry: skewed Inner Tracker geometry. Material Budget: same as T15.
 
 Calorimeters:
 * C4: HGCal (v9) + Phase2 HCAL and EB
@@ -39,5 +40,6 @@ Several detector combinations have been generated:
 * D45 = T15+C8+M3+I10+O3+F2
 * D46 = T15+C9+M3+I10+O3+F2
 * D47 = T15+C10+M3+I10+O3+F3
+* D48 = T16+C9+M3+I10+O3+F2
 
 D35 is the baseline for the MTD TDR, and D41 is the baseline for the L1T TDR.
diff --git a/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py
@@ -0,0 +1,60 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2026D48_cff import *
+
+# tracker
+from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = cms.bool(False)
+
+# calo
+from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = cms.bool(False)
+
diff --git a/Configuration/Geometry/python/GeometryExtended2026D48_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48_cff.py
@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D48XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -202,6 +202,41 @@
             'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
+    },
+    "T16" : {
+        1 : [
+            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+            'Geometry/TrackerCommonData/data/trackermaterial.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/Tracker_Skewed_IT_2019_08/pixel.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
+            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
+            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        ],
+        "sim" : [
+            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
+            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *',
+        ],
+        "reco" : [
+            'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
+            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
+            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
+            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
+            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
+            'trackerGeometry.applyAlignment = cms.bool(False)',
+        ],
+        "era" : "phase2_tracker, trackingPhase2PU140",
     }
 }
 
@@ -879,6 +914,7 @@
     ("O3","T15","C8","M3","F2","I10") : "D45",
     ("O3","T15","C9","M3","F2","I10") : "D46",
     ("O3","T15","C10","M3","F3","I10") : "D47",
+    ("O3","T16","C9","M3","F2","I10") : "D48",
 }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42" ])

diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py
@@ -24,5 +24,6 @@
 numWFIB.extend([21634.0]) #2026D45
 numWFIB.extend([22034.0]) #2026D46
 numWFIB.extend([22434.0]) #2026D47
+numWFIB.extend([22834.0]) #2026D48
 for numWF in numWFIB:
     workflows[numWF] = _upgrade_workflows[numWF]
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -38,6 +38,8 @@
     '2026D46PU',
     '2026D47',
     '2026D47PU',
+    '2026D48',
+    '2026D48PU',
 ]
 
 # pre-generation of WF numbers
@@ -368,6 +370,13 @@
         'Era' : 'Phase2C10_timing_layer_bar',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
+    '2026D48' : {
+        'Geom' : 'Extended2026D48',
+        'HLTmenu': '@fake2',
+        'GT' : 'auto:phase2_realistic_T15',
+        'Era' : 'Phase2C9_timing_layer_bar',
+        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
+    },
 }
 
 # standard PU sequences

diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
@@ -35,4 +35,5 @@
     'Extended2026D45' : 'Extended2026D45,Extended2026D45Reco',
     'Extended2026D46' : 'Extended2026D46,Extended2026D46Reco',
     'Extended2026D47' : 'Extended2026D47,Extended2026D47Reco',
+    'Extended2026D48' : 'Extended2026D48,Extended2026D48Reco',
     }
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
@@ -0,0 +1,127 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_Skewed_IT_2019_08/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
+        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)