Merge pull request #17944 from ianna/2023D12-overlap-fixes-v1

2023 Scenario and Workflow with Detailed Cavern

Configuration/Geometry/README.md

@@ -22,15 +22,21 @@ Fast Timing system:
 * I1: No Fast Timing detector
 * I2: Fast Timing detector (LYSO barrel, silicon endcap)
 
-The script also handles the common and forward elements of the geometry, which are not expected to change.
+The script also handles the common and forward elements of the geometry:
+* O1: which is not expected to change
+* O2: detailed cavern description
 
-Several detector combinations have been generated:
+* F1: which is not expected to change
+* F2: modifications needed to accomodate detailed cavern, ZDC description is removed.
+
+Several detector combinations have been generated with O1+F1:
 * D7 = T3+C1+M1+I1
 * D4 = T3+C2+M1+I1
 * D8 = T3+C2+M1+I2
 * D9 = T3+C1+M2+I1
 * D10 = T4+C1+M1+I1
 * D11 = T5+C2+M1+I1
+* D12 = T3+C2+M2+I1+O2+F2 
 
 Currently, D4 is considered to be the baseline for the Phase 2 Tracker TDR.
 

Configuration/Geometry/python/GeometryExtended2023D12Reco_cff.py

@@ -0,0 +1,50 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2023Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2023D12_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.HGCalV6Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_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" 
+    )
+)
+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 *
+

Configuration/Geometry/python/GeometryExtended2023D12_cff.py

@@ -0,0 +1,12 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2023Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2023D12XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkTilted4021_cff import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *

Configuration/Geometry/python/dict2023Geometry.py

@@ -9,13 +9,13 @@
             'Geometry/CMSCommonData/data/materials.xml',
             'Geometry/CMSCommonData/data/rotations.xml',
             'Geometry/CMSCommonData/data/extend/cmsextent.xml',
-            'Geometry/CMSCommonData/data/PostLS2/cms.xml',
+            'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
             'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
+            'Geometry/CMSCommonData/data/muonBase/2023/v1/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
             'Geometry/CMSCommonData/data/PostLS2/beampipe.xml',
@@ -28,7 +28,34 @@
             'Geometry/CMSCommonData/data/FieldParameters.xml',
         ],
         "era" : "run2_common, phase2_common",
-    }
+    },
+    "O2" : {
+        1 : [
+            'Geometry/CMSCommonData/data/materials.xml',
+            'Geometry/CMSCommonData/data/rotations.xml',
+            'Geometry/CMSCommonData/data//extend/v2/cmsextent.xml',
+            'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',
+            'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
+            'Geometry/CMSCommonData/data/cmsMother.xml',
+            'Geometry/CMSCommonData/data/cmsTracker.xml',
+            'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
+            'Geometry/CMSCommonData/data/cmsCalo.xml',
+            'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml',
+            'Geometry/CMSCommonData/data/cmsMuon.xml',
+            'Geometry/CMSCommonData/data/mgnt.xml',
+            'Geometry/CMSCommonData/data/PostLS2/beampipe.xml',
+            'Geometry/CMSCommonData/data/PostLS2/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',
+        ],
+        5 : [
+            'Geometry/CMSCommonData/data/FieldParameters.xml',
+        ],
+        "era" : "run2_common, phase2_common",
+    }    
 }
 
 trackerDict = {
@@ -368,7 +395,7 @@
             'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
             'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
             'Geometry/MuonCommonData/data/design/muonYoke.xml',
-            'Geometry/MuonCommonData/data/PhaseII/mf.xml',
+            'Geometry/MuonCommonData/data/mf/2023/v1/mf.xml',
             'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
             'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
@@ -404,13 +431,13 @@
     },
     "M2" : {
         1 : [
-            'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.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/design/muonYoke.xml',
-            'Geometry/MuonCommonData/data/PhaseII/mf.xml',
+            'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml',
             'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
             'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
@@ -475,7 +502,32 @@
         "reco" :[
             'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
         ]
-    }
+    },
+    "F2" : {
+        1 : [
+            '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',
+        ],
+        3 : [
+            'Geometry/ForwardCommonData/data/brmsens.xml',
+            'Geometry/ForwardSimData/data/zdcsens.xml',
+        ],
+        4 : [
+            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        ],
+        "reco" :[
+            'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
+        ]
+    }    
 }
 
 timingDict = {
@@ -515,7 +567,8 @@
     ("O1","T3","C2","M1","F1","I1") : "D4",
     ("O1","T3","C2","M1","F1","I2") : "D8",
     ("O1","T3","C1","M2","F1","I1") : "D9",
-    ("O1","T5","C2","M1","F1","I1") : "D11",    
+    ("O1","T5","C2","M1","F1","I1") : "D11",
+    ("O2","T3","C2","M2","F2","I1") : "D12"
 }
 
 deprecatedDets = [ "D1", "D2", "D3", "D5", "D6" ]

Configuration/PyReleaseValidation/python/relval_2023.py

@@ -18,7 +18,8 @@
 numWFIB.extend([21221.0,21234.0,21246.0,21253.0]) #2023D4
 numWFIB.extend([23221.0,23234.0,23246.0,23253.0]) #2023D8
 numWFIB.extend([23621.0,23634.0,23646.0,23653.0]) #2023D9
-numWFIB.extend([24034.0])#2023D11 TTbar only 
+numWFIB.extend([24034.0])#2023D11 TTbar only
+numWFIB.extend([24434.0])#2023D12 TTbar only
 for i,key in enumerate(upgradeKeys[2023]):
     numWF=numWFAll[2023][i]
     for frag in upgradeFragments:

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1719,6 +1719,7 @@ def lhegensim(fragment,howMuch):
 defaultDataSets['2023D8']=''
 defaultDataSets['2023D9']=''
 defaultDataSets['2023D11']=''
+defaultDataSets['2023D12']=''
 
 keys=defaultDataSets.keys()
 for key in keys:

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -33,7 +33,9 @@
     '2023D9',
     '2023D9PU',
     '2023D11',
-    '2023D11PU'
+    '2023D11PU',
+    '2023D12',
+    '2023D12PU'
 
 ]
 
@@ -172,8 +174,15 @@
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic',
         'Era' : 'Phase2C2',
+        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal']
+     },
+    '2023D12' : {
+        'Geom' : 'Extended2023D12',
+        'HLTmenu': '@fake2',
+        'GT' : 'auto:phase2_realistic',
+        'Era' : 'Phase2C2',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
-    }
+     }
 
 }
 
@@ -200,6 +209,8 @@
 upgradeProperties[2023]['2023D9PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D11PU'] = deepcopy(upgradeProperties[2023]['2023D11'])
 upgradeProperties[2023]['2023D11PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
+upgradeProperties[2023]['2023D12PU'] = deepcopy(upgradeProperties[2023]['2023D12'])
+upgradeProperties[2023]['2023D12PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 
 
 #Timing PU (for now copy ScenToRun of standard PU)

Configuration/StandardSequences/python/GeometryConf.py

@@ -37,5 +37,6 @@
     'Extended2023D8' : 'Extended2023D8,Extended2023D8Reco',
     'Extended2023D9' : 'Extended2023D9,Extended2023D9Reco',
     'Extended2023D11' : 'Extended2023D11,Extended2023D11Reco',
-
+    'Extended2023D12' : 'Extended2023D12,Extended2023D12Reco'
+
     }