Merge pull request #1489 from davidlange6/fixPR1409

Fix pr1409

Configuration/Geometry/python/GeometryExtendedPhase1TkBEForwardReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtendedPhase1TkBEForward_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerSLHCGeometry.applyAlignment = cms.bool(False)
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+

Configuration/Geometry/python/GeometryExtendedPhase1TkBEForward_cff.py

@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryPhaseIPixelForwardXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *

Configuration/Geometry/python/GeometryExtendedPhase2TkBEForwardReco_cff.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtendedPhase2TkBEForward_cff import *
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerSLHCGeometry.applyAlignment = cms.bool(False)
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+

Configuration/Geometry/python/GeometryExtendedPhase2TkBEForward_cff.py

@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryPhaseIIPixelForwardXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1339,7 +1339,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                            '--eventcontent':'FEVTDEBUGHLT,DQM',
                            '--datatier':'GEN-SIM-DIGI-RECO,DQM',
                            '--conditions':'auto:upgradePLS3', 
-			   '--geometry' : 'Phase2Forward',
+			   '--geometry' : 'ExtendedPhase2TkBEForward',
 			   '--fast':'',
 			   '--customise' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.fastsimDefault',
                            '--relval':'27000,3000'},
@@ -2574,6 +2574,33 @@ def genvalid(fragment,d,suffix='all',fi=''):
 
 
 
+########################### split be5d into three steps
+
+step2Up2023_BE5D_Defaults = {'-s':'DIGI,L1,L1TrackTrigger,DIGI2RAW',
+                 '--conditions':'auto:upgradePLS3', 
+                 '--datatier':'GEN-SIM-DIGI-RAW',
+                 '-n':'10',
+                 '--magField' : '38T_PostLS1',
+                 '--eventcontent':'FEVTDEBUGHLT',
+                 '--customise' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5D',
+                 '--geometry' : 'ExtendedPhase2TkBE5D'
+                 }
+
+steps['DIGIUP23_BE5D']=merge([step2Up2023_BE5D_Defaults])
+
+step3NUp2023_BE5D_Defaults = {'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM',
+                 '--conditions':'auto:upgradePLS3', 
+                 '--datatier':'GEN-SIM-RECO,DQM',
+                 '-n':'10',
+                 '--magField' : '38T_PostLS1',
+                 '--eventcontent':'FEVTDEBUGHLT,DQM',
+                 '--customise' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_phase2_BE5D',
+                 '--geometry' : 'ExtendedPhase2TkBE5D'
+                 }
+
+steps['NRECOUP23_BE5D']=merge([step3NUp2023_BE5D_Defaults])
+
+
 #add this line when testing from an input file that is not strictly GEN-SIM
 #addForAll(step3,{'--hltProcess':'DIGI'})
 
@@ -2684,7 +2711,15 @@ def genvalid(fragment,d,suffix='all',fi=''):
                    '--customise' : 'SLHCUpgradeSimulations/Configuration/phase1TkCustoms.customise',
 		   '--geometry' : 'Extended2019'
                    }
-
+
+steps['HARVESTUPBE5D']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
+                   '--conditions':'auto:upgradePLS3', 
+                   '--mc':'',
+                   '--magField' : '38T_PostLS1',
+                   '--customise' : 'SLHCUpgradeSimulations/Configuration/phase1TkCustoms.customise',
+		   '--geometry' : 'ExtendedPhase2TkBE5D'
+                   }
+
 ####HARVEST AGING VALIDATION - DESIGN set of reference
 steps['HARVESTUP17DES']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
                    '--conditions':'DES17_61_V5::All', 
@@ -2845,7 +2880,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
 steps['HARVESTFSP2Forw']={'-s':'HARVESTING:validationHarvestingFS',
                    '--conditions':'auto:upgradePLS3',
                    '--mc':'',
-		   '--geometry' : 'Phase2Forward',
+		   '--geometry' : 'ExtendedPhase2TkBEForward',
                    '--scenario':'pp'}