Merge pull request #31140 from bsunanda/Run3-TB60

Run3-TB60 Update and correct HCAL TB06 simulation
cms-sw · Aug 16, 2020 · 224af5f · 224af5f
2 parents b8123c3 + f04e49d
commit 224af5f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/SimG4CMS/HcalTestBeam/python/TB2006Analysis_cfi.py b/SimG4CMS/HcalTestBeam/python/TB2006Analysis_cfi.py
@@ -46,7 +46,7 @@ def testbeam2006(process):
     process.g4SimHits.NonBeamEvent = True
     process.g4SimHits.UseMagneticField = False
 
-    process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+    process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
     process.g4SimHits.Physics.Region = 'HcalRegion'
     process.g4SimHits.Physics.MaxTrackTime = cms.double(1000.0)
 
@@ -64,6 +64,7 @@ def testbeam2006(process):
 
     process.g4SimHits.CaloSD.EminHits = cms.vdouble(0.0,0.0,0.0,0.0)
     process.g4SimHits.CaloSD.TmaxHits = cms.vdouble(1000.0,1000.0,1000.0,1000.0)
+    process.g4SimHits.CaloTrkProcessing.TestBeam = True
 
     process.g4SimHits.HCalSD.UseShowerLibrary    = False
     process.g4SimHits.HCalSD.UseHF   = False

diff --git a/SimG4CMS/HcalTestBeam/test/python/anal_tb06_cfg.py b/SimG4CMS/HcalTestBeam/test/python/anal_tb06_cfg.py
@@ -28,6 +28,7 @@
 process.testbeam.MinE = process.common_beam_direction_parameters.MinE
 process.testbeam.MaxE = process.common_beam_direction_parameters.MaxE
 process.testbeam.PartID = process.common_beam_direction_parameters.PartID
+process.g4SimHits.CaloSD.BeamPosition = process.common_beam_direction_parameters.BeamPosition
 
 process.testbeam.TestBeamAnalysis.EcalFactor = cms.double(1.)
 process.testbeam.TestBeamAnalysis.HcalFactor = cms.double(100.)
@@ -38,4 +39,4 @@
 
 #process.Timing = cms.Service("Timing")
 
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py
@@ -101,7 +101,7 @@
 
 process.g4SimHits.NonBeamEvent = True
 process.g4SimHits.UseMagneticField = False
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
 process.g4SimHits.Physics.Region = 'HcalRegion'
 process.g4SimHits.Physics.DefaultCutValue = 1.
 

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py
@@ -101,7 +101,7 @@
 
 process.g4SimHits.NonBeamEvent = True
 process.g4SimHits.UseMagneticField = False
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
 process.g4SimHits.Physics.Region = 'HcalRegion'
 process.g4SimHits.Physics.DefaultCutValue = 1.
 

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py
@@ -101,7 +101,7 @@
 
 process.g4SimHits.NonBeamEvent = True
 process.g4SimHits.UseMagneticField = False
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
 process.g4SimHits.Physics.Region = 'HcalRegion'
 process.g4SimHits.Physics.DefaultCutValue = 1.
 

diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py
@@ -115,7 +115,7 @@
     )
 process.g4SimHits.NonBeamEvent = True
 process.g4SimHits.UseMagneticField = False
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML'
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
 process.g4SimHits.Physics.Region = 'HcalRegion'
 process.g4SimHits.Physics.DefaultCutValue = 1.