Merge pull request #11916 from lveldere/fastsim-hf-sl-run1-take2

Fastsim: HF: use shower library also for run1
cms-sw · Oct 22, 2015 · f8ad597 · f8ad597
2 parents 720eb29 + 56e5573
commit f8ad597
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/FastSimulation/Calorimetry/python/Calorimetry_cff.py b/FastSimulation/Calorimetry/python/Calorimetry_cff.py
@@ -268,9 +268,9 @@
             OnlyLong          = cms.bool(True)
             ),
         HFShowerLibrary    = cms.PSet(
-            useShowerLibrary = cms.untracked.bool(False),
+            useShowerLibrary = cms.untracked.bool(True),
             useCorrectionSL  = cms.untracked.bool(True),
-            FileName = cms.FileInPath('SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root'),
+            FileName = cms.FileInPath('SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en_v3.root'),
             BackProbability  = cms.double(0.2),
             TreeEMID         = cms.string('emParticles'),
             TreeHadID        = cms.string('hadParticles'),
@@ -299,7 +299,4 @@
 FamosCalorimetryBlock.Calorimetry.ECAL.Digitizer = True
 FamosCalorimetryBlock.Calorimetry.HCAL.Digitizer = True
 
-#
-# Modify for running in Run 2
-#
-eras.run2_common.toModify( FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, useShowerLibrary=True )
+eras.run2_common.toModify(FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' )
diff --git a/FastSimulation/Event/python/ParticleFilter_cfi.py b/FastSimulation/Event/python/ParticleFilter_cfi.py
@@ -6,17 +6,11 @@
         EProton = cms.double(5000.0),
         # Particles with |eta| > etaMax (momentum direction at primary vertex) 
         # are not simulated 
-        etaMax = cms.double(5.1),
+        etaMax = cms.double(5.3),
         # Charged particles with pT < pTMin (GeV/c) are not simulated
-        pTMin = cms.double(0.2),
+        pTMin = cms.double(0.1),
         # Particles with energy smaller than EMin (GeV) are not simulated
         EMin = cms.double(0.1)
     )
 )
 
-#
-# Modify for running in Run 2
-#
-from Configuration.StandardSequences.Eras import eras
-eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, pTMin = 0.1 )
-eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, etaMax = 5.300 )
diff --git a/SLHCUpgradeSimulations/Configuration/python/fastSimCustoms.py b/SLHCUpgradeSimulations/Configuration/python/fastSimCustoms.py
@@ -11,13 +11,8 @@ def customise_fastSimPostLS1(process):
 def customise_fastSimProducer(process): 
 
     # enable 2015 HF shower library
-    process.famosSimHits.Calorimetry.HFShowerLibrary.useShowerLibrary = True
-
-    # change default parameters
-    process.famosSimHits.ParticleFilter.pTMin  = 0.1
-    process.famosSimHits.TrackerSimHits.pTmin  = 0.1
-    process.famosSimHits.ParticleFilter.etaMax = 5.300
-
+    process.famosSimHits.Calorimetry.HFShowerLibrary.FileName = cms.FileInPath('SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root')
+
     return process