From 3c1be08555ce47ce5e063bcb10c5448f0bb7b84e Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 12 Nov 2019 19:21:08 +0100 Subject: [PATCH] use Run2_2016_HIPM in lieu of SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain customization in relvals --- .../python/relval_steps.py | 8 +++---- ...ustomizeSiStripAPVDynamicGainSimulation.py | 23 ------------------- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 SimTracker/SiStripDigitizer/python/customizeSiStripAPVDynamicGainSimulation.py diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b2fefd1c0f655..c7ef74b5b6690 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1526,7 +1526,7 @@ def lhegensim2018(fragment,howMuch): } step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step2Upg2015Defaults]) -step2Upg2015DefaultsAPVSimu = merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},step2Upg2015Defaults]) +step2Upg2015DefaultsAPVSimu = merge([{'--era': 'Run2_2016_HIPM'},step2Upg2015Defaults]) #for 2017 step2Upg2017Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2017', @@ -1550,7 +1550,7 @@ def lhegensim2018(fragment,howMuch): steps['DIGIUP15']=merge([step2Upg2015Defaults]) -steps['DIGIUP15APVSimu']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},step2Upg2015Defaults]) +steps['DIGIUP15APVSimu']=merge([{'--era': 'Run2_2016_HIPM'},step2Upg2015Defaults]) steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2016','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults]) steps['DIGIUP15_PU25']=merge([PU25,step2Upg2015Defaults]) @@ -1688,9 +1688,9 @@ def lhegensim2018(fragment,howMuch): digiPremixUp2018Defaults25ns]) steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns]) -steps['DIGIPRMXUP15APVSimu_PU25']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},digiPremixUp2015Defaults25ns]) +steps['DIGIPRMXUP15APVSimu_PU25']=merge([{'--era': 'Run2_2016_HIPM'},digiPremixUp2015Defaults25ns]) steps['DIGIPRMXLOCALUP15_PU25']=merge([digiPremixLocalPileupUp2015Defaults25ns]) -steps['DIGIPRMXLOCALUP15APVSimu_PU25']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},digiPremixLocalPileupUp2015Defaults25ns]) +steps['DIGIPRMXLOCALUP15APVSimu_PU25']=merge([{'--era': 'Run2_2016_HIPM'},digiPremixLocalPileupUp2015Defaults25ns]) steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns]) steps['DIGIPRMXUP17_PU25']=merge([digiPremixUp2017Defaults25ns]) diff --git a/SimTracker/SiStripDigitizer/python/customizeSiStripAPVDynamicGainSimulation.py b/SimTracker/SiStripDigitizer/python/customizeSiStripAPVDynamicGainSimulation.py deleted file mode 100644 index 25900bf72631c..0000000000000 --- a/SimTracker/SiStripDigitizer/python/customizeSiStripAPVDynamicGainSimulation.py +++ /dev/null @@ -1,23 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# -# activate the SiStrip AVP dynamic gain simulation and loads from DB the corresponding conditions -# -def activateSiStripAPVDynamicGain(process): - - if hasattr(process,'mix') and hasattr(process.mix,'digitizers') and hasattr(process.mix.digitizers,'strip'): - print("activating SiStrip APV Dynamic Gain simulation") - process.mix.digitizers.strip.includeAPVSimulation = True - if hasattr(process, "mixData") and hasattr(process.mixData, "workers") and hasattr(process.mixData.workers, "strip"): - print("activating SiStrip APV Dynamic Gain simulation (premixing)") - process.mixData.workers.strip.includeAPVSimulation = True - - if not hasattr(process.GlobalTag,'toGet'): - process.GlobalTag.toGet=cms.VPSet() - - process.GlobalTag.toGet.extend(cms.VPSet(cms.PSet(record = cms.string('SiStripApvSimulationParametersRcd'), - tag = cms.string('SiStripApvSimulationParameters_2016preVFP_v1'), - connect = cms.string('frontier://FrontierPrep/CMS_CONDITIONS')) - ) - ) - return process