Merge pull request #34162 from bsunanda/Run2-TB61

Run2-TB61 Modify the cfg's for testbeam simulation of the combined calorimeter ECAL+HCAL
cms-sw · Jun 18, 2021 · 714b1a1 · 714b1a1
2 parents f8187be + 44c9495
commit 714b1a1
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 9 deletions.
diff --git a/Geometry/HcalTestBeamData/test/python/run2004_cfg.py b/Geometry/HcalTestBeamData/test/python/run2004_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("PROD")
+from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
+process = cms.Process("PROD", dd4hep)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
@@ -98,8 +99,10 @@
 process.outpath = cms.EndPath(process.o1)
 process.common_maximum_timex = cms.PSet(
     MaxTrackTime  = cms.double(1000.0),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -111,9 +114,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 process.hcalParameters.fromDD4Hep = True
 process.caloSimulationParameters.fromDD4Hep = True
-process.hcalTB02XtalParameters.fromDD4Hep = True
-process.hcalTB02HcalParameters.fromDD4Hep = True
-process.hcalTB06BeamParameters.fromDD4Hep = True
 
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -131,6 +131,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -168,13 +174,20 @@
 )
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
     EkinParticles           = cms.vstring()
 )
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("PROD")
+from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
+process = cms.Process("PROD", dd4hep)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
@@ -93,9 +94,5 @@
                                   Mode = cms.untracked.int32(0)
 )
 
-process.hcalTB02XtalParameters.fromDD4Hep = True
-process.hcalTB02HcalParameters.fromDD4Hep = True
-process.hcalTB06BeamParameters.fromDD4Hep = True
-
 process.p1 = cms.Path(process.generator*process.VtxSmeared*process.generatorSmeared*process.testH4)
 #process.p1 = cms.Path(process.generator*process.VtxSmeared*process.generatorSmeared*process.testH2EE*process.testH2HC)
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2002_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2002_cfg.py
@@ -109,9 +109,21 @@
 process.g4SimHits.NonBeamEvent = True
 process.g4SimHits.UseMagneticField = False
 process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2003_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2003_cfg.py
@@ -123,6 +123,8 @@
     MaxTrackTime  = cms.double(1000.0),
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -149,6 +151,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -185,6 +193,7 @@
 )
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     KillBeamPipe            = cms.bool(True),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
@@ -194,6 +203,12 @@
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py
@@ -93,6 +93,8 @@
     MaxTrackTime  = cms.double(1000.0),
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -119,6 +121,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -156,13 +164,20 @@
 )
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
     EkinParticles           = cms.vstring()
 )
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py
@@ -121,10 +121,22 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py
@@ -121,10 +121,22 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py
@@ -121,10 +121,22 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py
@@ -109,6 +109,8 @@
     MaxTrackTime  = cms.double(1000.0),
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -135,6 +137,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -173,6 +181,7 @@
 
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
     EkinParticles           = cms.vstring()
@@ -181,6 +190,12 @@
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py
@@ -110,6 +110,8 @@
     MaxTrackTime  = cms.double(1000.0),
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -136,6 +138,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -174,13 +182,20 @@
 
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
     EkinParticles           = cms.vstring()
     )
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py
@@ -110,6 +110,8 @@
     MaxTrackTime  = cms.double(1000.0),
     MaxTimeNames  = cms.vstring(),
     MaxTrackTimes = cms.vdouble(),
+    MaxTrackTimeForward = cms.double(2000.0), # ns
+    MaxZCentralCMS = cms.double(50.0), # m
     DeadRegions   = cms.vstring(),
     CriticalEnergyForVacuum = cms.double(2.0),
     CriticalDensity         = cms.double(1e-15)
@@ -136,6 +138,12 @@
 process.g4SimHits.HCalSD.UseHF   = False
 process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
+process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
+                             'EcalTBH4BeamDetector',
+                             'HcalTB02SensitiveDetector',
+                             'HcalTB06BeamDetector',
+                             'EcalSensitiveDetector',
+                             'HcalSensitiveDetector']
 process.g4SimHits.StackingAction = cms.PSet(
     process.common_heavy_suppression1,
     process.common_maximum_timex,
@@ -174,6 +182,7 @@
 
 process.g4SimHits.SteppingAction = cms.PSet(
     process.common_maximum_timex,
+    MaxNumberOfSteps        = cms.int32(50000),
     EkinNames               = cms.vstring(),
     EkinThresholds          = cms.vdouble(),
     EkinParticles           = cms.vstring()
@@ -182,6 +191,12 @@
 process.g4SimHits.CaloSD = cms.PSet(
     process.common_beam_direction_parameters,
     process.common_heavy_suppression1,
+    DoFineCalo     = cms.bool(False),
+    SaveCaloBoundaryInformation = cms.bool(False),
+    EminFineTrack  = cms.double(10000.0),
+    FineCaloNames  = cms.vstring(),
+    FineCaloLevels = cms.vint32(),
+    UseFineCalo    = cms.vint32(),
     EminTrack      = cms.double(1.0),
     TmaxHit        = cms.double(1000.0),
     EminHits       = cms.vdouble(0.0,0.0,0.0,0.0),

diff --git a/SimG4CMS/HcalTestBeam/test/python/run_tb06_all_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run_tb06_all_cfg.py
@@ -135,6 +135,7 @@
   pfile.write('  input = cms.untracked.int32(' + stat + ') \n')
   pfile.write(') \n\n')
   pfile.write('process.g4SimHits.Physics.type = "SimG4Core/Physics/' + phys + '" \n\n')
+  pfile.write('process.g4SimHits.OnlySDs = ["CaloTrkProcessing", "EcalTBH4BeamDetector", "HcalTB02SensitiveDetector", "HcalTB06BeamDetector", "EcalSensitiveDetector", "HcalSensitiveDetector"] \n\n')
   pfile.close()
   cmd2 = 'cmsRun ' + fnametmp + ' >> ' + outf 
   os.system(cmd2)