bsunanda:Phase2-hgx73 Add a new scenario with TDR version for HGCal

Configuration/Geometry/README.md

@@ -37,6 +37,7 @@ Several detector combinations have been generated with O1+F1:
 * D10 = T4+C1+M1+I1
 * D11 = T5+C2+M1+I1
 * D12 = T3+C2+M2+I1+O2+F2 
+* D13 = T3+C3+M2+I1+O1+F1
 
 Currently, D4 is considered to be the baseline for the Phase 2 Tracker TDR.
 

Configuration/Geometry/python/GeometryExtended2023D13Reco_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.GeometryExtended2023D13_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/GeometryExtended2023D13_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.cmsExtendedGeometry2023D13XML_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

@@ -568,7 +568,8 @@
     ("O1","T3","C2","M1","F1","I2") : "D8",
     ("O1","T3","C1","M2","F1","I1") : "D9",
     ("O1","T5","C2","M1","F1","I1") : "D11",
-    ("O2","T3","C2","M2","F2","I1") : "D12"
+    ("O2","T3","C2","M2","F2","I1") : "D12",
+    ("O1","T3","C3","M2","F1","I1") : "D13"
 }
 
 deprecatedDets = [ "D1", "D2", "D3", "D5", "D6" ]

Configuration/PyReleaseValidation/python/relval_2023.py

@@ -20,6 +20,7 @@
 numWFIB.extend([23621.0,23634.0,23646.0,23653.0]) #2023D9
 numWFIB.extend([24034.0])#2023D11 TTbar only
 numWFIB.extend([24434.0])#2023D12 TTbar only
+numWFIB.extend([24834.0])#2023D13 TTbar only
 for i,key in enumerate(upgradeKeys[2023]):
     numWF=numWFAll[2023][i]
     for frag in upgradeFragments:

Configuration/PyReleaseValidation/python/relval_steps.py

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

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -35,8 +35,9 @@
     '2023D11',
     '2023D11PU',
     '2023D12',
-    '2023D12PU'
-
+    '2023D12PU',
+    '2023D13',
+    '2023D13PU',
 ]
 
 # pre-generation of WF numbers
@@ -182,8 +183,14 @@
         'GT' : 'auto:phase2_realistic',
         'Era' : 'Phase2C2',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
-     }
-
+     },
+    '2023D13' : {
+        'Geom' : 'Extended2023D13',
+        'HLTmenu': '@fake2',
+        'GT' : 'auto:phase2_realistic',
+        'Era' : 'Phase2C2',
+        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
+     },
 }
 
 
@@ -211,6 +218,8 @@
 upgradeProperties[2023]['2023D11PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D12PU'] = deepcopy(upgradeProperties[2023]['2023D12'])
 upgradeProperties[2023]['2023D12PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
+upgradeProperties[2023]['2023D13PU'] = deepcopy(upgradeProperties[2023]['2023D13'])
+upgradeProperties[2023]['2023D13PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 
 
 #Timing PU (for now copy ScenToRun of standard PU)

Configuration/StandardSequences/python/GeometryConf.py

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

Geometry/CMSCommonData/python/cmsExtendedGeometry2023D13XML_cfi.py

@@ -0,0 +1,117 @@
+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
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/cmsextent.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/muonBase/2023/v1/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.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/PhaseII/escon.xml',
+        'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/SSAbsorber/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HGCalCommonData/data/v8/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v8/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v8/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/v8/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/design/muonYoke.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',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem21.xml',
+        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/me0.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2015/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',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/PhaseII/TDR_Dev/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/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/hgcsensv8.xml',
+        'Geometry/HGCalSimData/data/hgccons.xml',
+        'Geometry/HGCalSimData/data/hgcProdCuts.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/PhaseII/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/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)