Merge pull request #14713 from bsunanda/Phase2-hgx55

bsunanda:Phase2-hgx55 Debugging fine BH scenario

Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py

@@ -233,9 +233,8 @@
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
         'Geometry/MuonCommonData/data/v6/mf.xml',
         'Geometry/MuonCommonData/data/v2/rpcf.xml',
-        'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v7/gem11.xml',
-        'Geometry/MuonCommonData/data/v7/gem21.xml',
+        'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
         'Geometry/MuonCommonData/data/v2/mfshield.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
@@ -255,7 +254,6 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
         'Geometry/MuonCommonData/data/v6/muonGemNumbering.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',

Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py

@@ -103,13 +103,13 @@
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
         'Geometry/MuonCommonData/data/PhaseII/mf.xml',
-        'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
-        'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v7/gem11.xml',
-        'Geometry/MuonCommonData/data/v7/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
+        'Geometry/MuonCommonData/data/PhaseII/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/PhaseII/TDR_BaseLine/me0.xml',
         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
-        'Geometry/MuonCommonData/data/v8/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',

Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py

@@ -230,13 +230,13 @@
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
         'Geometry/MuonCommonData/data/PhaseII/mf.xml',
-        'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
-        'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v7/gem11.xml',
-        'Geometry/MuonCommonData/data/v7/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
+        'Geometry/MuonCommonData/data/PhaseII/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/PhaseII/TDR_BaseLine/me0.xml',
         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
-        'Geometry/MuonCommonData/data/PhaseII/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',

SimGeneral/MixingModule/python/hcalDigitizer_cfi.py

@@ -15,6 +15,15 @@
     190.94, 190.94, 190.94, 190.94, 190.94,
     190.94, 190.94, 190.94, 190.94, 190.94,
     190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
+    190.94, 190.94, 190.94, 190.94, 190.94,
     190.94, 190.94, 190.94, 190.94, 190.94 )
 
 from Configuration.StandardSequences.Eras import eras

Validation/HGCalValidation/test/digiValidation_cfg.py

@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIM')
+process = cms.Process('SIM',eras.Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
@@ -117,10 +118,16 @@
 for path in process.paths:
         getattr(process,path)._seq = process.generator * getattr(process,path)._seq
 
-	# customisation of the process.
-	# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
-	from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023HGCalV6Muon
-
-#call to customisation function cust_2023HGCalMuon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
-process = cust_2023HGCalV6Muon(process)
+# customisation of the process.
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023LReco
+
+#call to customisation function cust_2023LReco imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023LReco(process)
 
+# End of customisation functions
+for label, prod in process.producers_().iteritems():
+        if prod.type_() == "OscarMTProducer":
+            # ugly hack
+            prod.__dict__['_TypedParameterizable__type'] = "OscarProducer"

Validation/HGCalValidation/test/rechitValidation_cfg.py

@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIMDIGIRECO')
+process = cms.Process('SIMDIGIRECO',eras.Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
@@ -134,12 +135,13 @@
 # customisation of the process.
 
 # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
-from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023HGCalMuon
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023LReco
 
-#call to customisation function cust_2023HGCalMuon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
-process = cust_2023HGCalMuon(process)
+#call to customisation function cust_2023LReco imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023LReco(process)
 
 # End of customisation functions
-
-#outfile = open("EdmDumpPyhon.py","w")
-#outfile.write(process.dumpPython())
+for label, prod in process.producers_().iteritems():
+        if prod.type_() == "OscarMTProducer":
+            # ugly hack
+            prod.__dict__['_TypedParameterizable__type'] = "OscarProducer"

Validation/HGCalValidation/test/simHitValidation_cfg.py

@@ -1,6 +1,8 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.StandardSequences.Eras import eras
+
+process = cms.Process("SIM",eras.Phase2)
 
-process = cms.Process("SIM")
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load("Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff")
@@ -81,3 +83,17 @@
 process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
 process.g4SimHits.Physics.DefaultCutValue   = 0.1
 process.g4SimHits.HCalSD.TestNumberingScheme = True
+
+# customisation of the process.
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023LReco
+
+#call to customisation function cust_2023LReco imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023LReco(process)
+
+# End of customisation functions
+for label, prod in process.producers_().iteritems():
+        if prod.type_() == "OscarMTProducer":
+            # ugly hack
+            prod.__dict__['_TypedParameterizable__type'] = "OscarProducer"

Validation/HGCalValidation/test/testHGCalBHValid_cfg.py

@@ -1,16 +1,18 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("testHGCalRecoLocal",eras.Run2_25ns)
+process = cms.Process("testHGCalRecoLocal",eras.Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('SimGeneral.MixingModule.mixNoPU_cfi')
-process.load('Configuration.Geometry.GeometryExtended2023DevReco_cff')
-process.load('Configuration.Geometry.GeometryExtended2023Dev_cff')
+#process.load('Configuration.Geometry.GeometryExtended2023Reco_cff')
+#process.load('Configuration.Geometry.GeometryExtended2023_cff')
+process.load('Geometry.HcalCommonData.testPhase2GeometryFineReco_cff')
+process.load('Geometry.HcalCommonData.testPhase2GeometryFine_cff')
 process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi')
@@ -141,19 +143,19 @@
 process.out_step = cms.EndPath(process.output)
 
 # Schedule definition
-#process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.digi2raw_step,process.recotest_step,process.analysis_step)
-process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.L1simulation_step,process.digi2raw_step,process.recotest_step,process.analysis_step)
+process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.digi2raw_step,process.recotest_step,process.analysis_step)
+#process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.L1simulation_step,process.digi2raw_step,process.recotest_step,process.analysis_step)
 # filter all path with the production filter sequence
 for path in process.paths:
         getattr(process,path)._seq = process.generator * getattr(process,path)._seq
 
 # customisation of the process.
 
 # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
-from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023HGCal
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023LReco
 
-#call to customisation function cust_2023HGCalMuon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
-process = cust_2023HGCal(process)
+#call to customisation function cust_2023LReco imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023LReco(process)
 
 # End of customisation functions
 for label, prod in process.producers_().iteritems():

Validation/HGCalValidation/test/testHGCalSimWatcher_cfg.py

@@ -1,16 +1,16 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("testHGCalRecoLocal",eras.Run2_25ns)
+process = cms.Process("testHGCalRecoLocal",eras.Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 #process.load('Configuration.EventContent.EventContent_cff')
 process.load('SimGeneral.MixingModule.mixNoPU_cfi')
-process.load('Configuration.Geometry.GeometryExtended2023DevReco_cff')
-process.load('Configuration.Geometry.GeometryExtended2023Dev_cff')
+process.load('Configuration.Geometry.GeometryExtended2023Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023_cff')
 process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi')
@@ -175,9 +175,9 @@
 # customisation of the process.
 
 # Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
-from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023HGCal
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023LReco
 
-#call to customisation function cust_2023HGCalMuon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
-process = cust_2023HGCal(process)
+#call to customisation function cust_2023LReco imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023LReco(process)
 
 # End of customisation functions