Merge pull request #36865 from bsunanda/Run3-TB65

Run3-TB65 Add selection of SD's for TB application
cms-sw · Feb 3, 2022 · 0fcea77 · 0fcea77
2 parents e6dbdaf + c384c84
commit 0fcea77
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 51 deletions.
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2003_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2003_cfg.py
@@ -101,12 +101,7 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 
 #process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
 #    HcalTB04Analysis = cms.PSet(

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py
@@ -108,13 +108,7 @@
 process.g4SimHits.HCalSD.UseShowerLibrary = False
 process.g4SimHits.HCalSD.TestNumberingScheme = True
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
     HcalTB04Analysis = cms.PSet(
         process.common_beam_direction_parameters,

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py
@@ -109,7 +109,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 
 process.g4SimHits.StackingAction.KillGamma = False
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.CaloSD.BeamPosition = beamPosition
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -125,9 +124,4 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py
@@ -3,8 +3,6 @@
 
 process = cms.Process("PROD", h2tb)
 
-process = cms.Process("PROD")
-
 process.load('SimG4CMS.HcalTestBeam.TB2006Geometry37XML_cfi')
 process.load('SimGeneral.HepPDTESSource.pdt_cfi')
 process.load('Configuration.StandardSequences.Services_cff')
@@ -111,7 +109,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 
 process.g4SimHits.StackingAction.KillGamma = False
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.CaloSD.BeamPosition = beamPosition
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -127,9 +124,4 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py
@@ -3,8 +3,6 @@
 
 process = cms.Process("PROD", h2tb)
 
-process = cms.Process("PROD")
-
 process.load('SimG4CMS.HcalTestBeam.TB2006Geometry77XML_cfi')
 process.load('SimGeneral.HepPDTESSource.pdt_cfi')
 process.load('Configuration.StandardSequences.Services_cff')
@@ -111,7 +109,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 
 process.g4SimHits.StackingAction.KillGamma = False
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.CaloSD.BeamPosition = beamPosition
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -127,9 +124,4 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py
@@ -110,7 +110,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 
 process.g4SimHits.StackingAction.KillGamma = False
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.CaloSD.BeamPosition = beamPosition
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -126,9 +125,4 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py
@@ -3,8 +3,6 @@
 
 process = cms.Process("PROD", h2tb)
 
-process = cms.Process("PROD")
-
 process.load('SimG4CMS.HcalTestBeam.TB2007GeometryNoESXML_cfi')
 process.load('SimGeneral.HepPDTESSource.pdt_cfi')
 process.load('Configuration.StandardSequences.Services_cff')
@@ -112,7 +110,6 @@
 process.g4SimHits.Physics.DefaultCutValue = 1.
 
 process.g4SimHits.StackingAction.KillGamma = False
-process.g4SimHits.CaloTrkProcessing.TestBeam = True
 process.g4SimHits.CaloSD.BeamPosition = beamPosition
 process.g4SimHits.ECalSD.UseBirkLaw = True
 process.g4SimHits.ECalSD.BirkL3Parametrization = True
@@ -128,10 +125,4 @@
 process.g4SimHits.HCalSD.UseShowerLibrary    = False
 process.g4SimHits.HCalSD.TestNumberingScheme = False
 process.g4SimHits.HCalSD.UseHF   = False
-process.g4SimHits.HCalSD.ForTBHCAL = True
 process.g4SimHits.HCalSD.ForTBH2 = True
-process.g4SimHits.OnlySDs = ['CaloTrkProcessing',
-                             'HcalTB06BeamDetector',
-                             'EcalSensitiveDetector',
-                             'HcalSensitiveDetector']
-
diff --git a/SimG4Core/Application/python/g4SimHits_cfi.py b/SimG4Core/Application/python/g4SimHits_cfi.py
@@ -654,9 +654,15 @@
 ## Change CALO Thresholds
 ##
 from Configuration.Eras.Modifier_h2tb_cff import h2tb
-h2tb.toModify(g4SimHits, CaloSD = dict(
-              EminHits  = [0.0, 0.0, 0.0, 0.0, 0.0],
-              TmaxHits  = [1000.0, 1000.0, 1000.0, 1000.0, 2000.0] )
+h2tb.toModify(g4SimHits,
+              OnlySDs = ['EcalSensitiveDetector', 'CaloTrkProcessing', 'HcalTB06BeamDetector', 'HcalSensitiveDetector'],
+              CaloSD = dict(
+                  EminHits  = [0.0, 0.0, 0.0, 0.0, 0.0],
+                  TmaxHits  = [1000.0, 1000.0, 1000.0, 1000.0, 2000.0] ),
+              CaloTrkProcessing = dict(
+                  TestBeam = True ),
+              HCalSD = dict(
+                  ForTBHCAL = True )
 )
 
 ##