From 477ccd861337903f5e446717ba497e7b2faefc51 Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 5 Nov 2019 17:06:37 +0100 Subject: [PATCH] modified: Configuration/AlCa/python/autoCond.py - update 2016 Global Tags to include SiStripApvSimulationParametersRcd modified: Configuration/Eras/python/Era_Run2_2016_cff.py - introduce strips_vfp30_2016 modifier modified: Configuration/Eras/python/Era_Run2_2016_pA_cff.py - remove strips_vfp30_2016 modifier from era modified: Configuration/Eras/python/Era_Run2_2017_cff.py - remove strips_vfp30_2016 modifier from era new file: Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py - introduce strips_vfp30_2016 modifier modified: SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py - activate APV simulation for 2016 pre-VFP change era --- Configuration/AlCa/python/autoCond.py | 4 ++-- Configuration/Eras/python/Era_Run2_2016_cff.py | 3 ++- Configuration/Eras/python/Era_Run2_2016_pA_cff.py | 3 ++- Configuration/Eras/python/Era_Run2_2017_cff.py | 3 ++- .../Eras/python/Modifier_strips_vfp30_2016_cff.py | 3 +++ SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py | 7 ++++++- 6 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 292c54415d592..e6d28e0e6c23e 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -16,9 +16,9 @@ # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2 'run2_design' : '106X_mcRun2_design_v6', #GlobalTag for MC production with optimistic alignment and calibrations for Run2 - 'run2_mc' : '106X_mcRun2_asymptotic_v6', + 'run2_mc' : '106X_mcRun2_asymptotic_Candidate_2019_11_29_09_29_56', # GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode - 'run2_mc_cosmics' : '106X_mcRun2cosmics_startup_deco_v3', + 'run2_mc_cosmics' : '106X_mcRun2cosmics_startup_deco_Candidate_2019_11_29_09_32_59', # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2 'run2_mc_hi' : '106X_mcRun2_HeavyIon_v4', # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2 diff --git a/Configuration/Eras/python/Era_Run2_2016_cff.py b/Configuration/Eras/python/Era_Run2_2016_cff.py index f79ba62ac194b..09813ad6b42e1 100644 --- a/Configuration/Eras/python/Era_Run2_2016_cff.py +++ b/Configuration/Eras/python/Era_Run2_2016_cff.py @@ -11,7 +11,8 @@ from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring from Configuration.Eras.Modifier_pixel_2016_cff import pixel_2016 from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016 +from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016 Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific, - stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_muon_2016, run2_egamma_2016, run2_tau_ul_2016, run2_L1prefiring, pixel_2016, run2_jme_2016) + stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_muon_2016, run2_egamma_2016, run2_tau_ul_2016, run2_L1prefiring, pixel_2016, strips_vfp30_2016) diff --git a/Configuration/Eras/python/Era_Run2_2016_pA_cff.py b/Configuration/Eras/python/Era_Run2_2016_pA_cff.py index 06b736d256f12..a368bae9b9331 100644 --- a/Configuration/Eras/python/Era_Run2_2016_pA_cff.py +++ b/Configuration/Eras/python/Era_Run2_2016_pA_cff.py @@ -2,6 +2,7 @@ from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 +from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016 -Run2_2016_pA = cms.ModifierChain(Run2_2016, pA_2016) +Run2_2016_pA = cms.ModifierChain(Run2_2016.copyAndExclude([strips_vfp30_2016]), pA_2016) diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index 090001aa451ac..ef337b95f0a79 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -19,10 +19,11 @@ from Configuration.Eras.Modifier_run2_tau_ul_2016_cff import run2_tau_ul_2016 from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017 from Configuration.Eras.Modifier_pixel_2016_cff import pixel_2016 +from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016 from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017 from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016 -Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016,run2_egamma_2016,run2_tau_ul_2016,pixel_2016,run2_jme_2016]), +Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016,run2_egamma_2016,run2_tau_ul_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016]), phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017) diff --git a/Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py b/Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py new file mode 100644 index 0000000000000..ba030f7dfac26 --- /dev/null +++ b/Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +strips_vfp30_2016 = cms.Modifier() diff --git a/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py b/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py index 083bb16f1f6a5..65c09c28c597c 100644 --- a/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py +++ b/SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py @@ -123,14 +123,19 @@ apv_rate = cms.double( 66.2 ), apv_mVPerQ = cms.double( 5.5 ), apvfCPerElectron = cms.double( 1.602e-4 ), - fracOfEventsToSimAPV = cms.double( 0.5376 ), + fracOfEventsToSimAPV = cms.double( 0.5376 ), # 53% of luminosity is affected by APV saturation ) +# activate APV simulation for 2016 Strip detector (UL 2016) +from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016 +strips_vfp30_2016.toModify(SiStripSimBlock,includeAPVSimulation=True) + from Configuration.ProcessModifiers.premix_stage1_cff import premix_stage1 premix_stage1.toModify(SiStripSimBlock, Noise = False, PreMixingMode = True, FedAlgorithm = 5, # special ZS mode: accept adc>0 + includeAPVSimulation = False # APV simulation is off for premix stage1 ) from Configuration.Eras.Modifier_run2_common_cff import run2_common