Merge pull request #16066 from smuzaffar/from-CMSSW_8_1_X_2016-10-01-…

…1100 use v4 of HFShowerLibrary_npmt_noatt_eta4_16en
cms-sw · Oct 1, 2016 · 97edd3e · 97edd3e
2 parents fa90229 + 472b9a7
commit 97edd3e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/FastSimulation/Calorimetry/python/Calorimetry_cff.py b/FastSimulation/Calorimetry/python/Calorimetry_cff.py
@@ -299,4 +299,4 @@
 FamosCalorimetryBlock.Calorimetry.HCAL.Digitizer = True
 
 from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify(FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' )
+run2_common.toModify(FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root' )
diff --git a/SLHCUpgradeSimulations/Configuration/python/fastSimCustoms.py b/SLHCUpgradeSimulations/Configuration/python/fastSimCustoms.py
@@ -11,7 +11,7 @@ def customise_fastSimPostLS1(process):
 def customise_fastSimProducer(process): 
 
     # enable 2015 HF shower library
-    process.famosSimHits.Calorimetry.HFShowerLibrary.FileName = cms.FileInPath('SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root')
+    process.famosSimHits.Calorimetry.HFShowerLibrary.FileName = cms.FileInPath('SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root')
 
     return process
 

diff --git a/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py b/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
@@ -231,7 +231,7 @@ def customise_Validation(process):
 
 def customise_Sim(process):
     # enable 2015 HF shower library
-    process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root'
+    process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root'
     return process
 
 def customise_Digi_Common(process):

diff --git a/Validation/CaloTowers/test/CaloScan/template.py b/Validation/CaloTowers/test/CaloScan/template.py
@@ -89,7 +89,7 @@
 process.mix.digitizers.hcal.ho.doSiPMSmearing = cms.bool(False)
 process.mix.digitizers.hcal.hf1.samplingFactor = cms.double(0.67)
 process.mix.digitizers.hcal.hf2.samplingFactor = cms.double(0.67)
-process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root'
+process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root'
 
 
 

diff --git a/Validation/CaloTowers/test/CaloScan/template.py_since760pre6 b/Validation/CaloTowers/test/CaloScan/template.py_since760pre6
@@ -88,7 +88,7 @@ process.mix.digitizers.hcal.ho.pixels = cms.int32(2500)
 process.mix.digitizers.hcal.ho.doSiPMSmearing = cms.bool(False)
 process.mix.digitizers.hcal.hf1.samplingFactor = cms.double(0.67)
 process.mix.digitizers.hcal.hf2.samplingFactor = cms.double(0.67)
-process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root'
+process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root'
 
 
 

diff --git a/Validation/CaloTowers/test/CaloScan/template.py_since760pre6_forGEN_760pre6 b/Validation/CaloTowers/test/CaloScan/template.py_since760pre6_forGEN_760pre6
@@ -88,7 +88,7 @@ process.mix.digitizers.hcal.ho.pixels = cms.int32(2500)
 process.mix.digitizers.hcal.ho.doSiPMSmearing = cms.bool(False)
 process.mix.digitizers.hcal.hf1.samplingFactor = cms.double(0.67)
 process.mix.digitizers.hcal.hf2.samplingFactor = cms.double(0.67)
-process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root'
+process.g4SimHits.HFShowerLibrary.FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root'