[10.6.X] Activate SiStrip Dynamical APV gain simulation for 2016 UL MC

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_v7',
     # 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_v4',
     # 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

Configuration/Eras/python/Era_Run2_2016_cff.py

@@ -12,7 +12,8 @@
 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_run2_ECAL_2016_cff import run2_ECAL_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_ECAL_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_ECAL_2016, run2_muon_2016, run2_egamma_2016,
+                              run2_tau_ul_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)

Configuration/Eras/python/Era_Run2_2017_cff.py

@@ -22,8 +22,8 @@
 from Configuration.Eras.Modifier_pixel_2016_cff import pixel_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
+from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016
 
-Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_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_ECAL_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)
-

Configuration/Eras/python/Modifier_strips_vfp30_2016_cff.py

@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+strips_vfp30_2016 =  cms.Modifier()

PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py

@@ -144,6 +144,10 @@
                                         'keep L1GtTriggerMenuLite_l1GtTriggerMenuLite__*'
                                       ]
 
+from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016
+strips_vfp30_2016.toModify(MicroEventContentMC, outputCommands = MicroEventContentMC.outputCommands + [
+    'keep *_simAPVsaturation_SimulatedAPVDynamicGain_*'
+])
 
 MiniAODOverrideBranchesSplitLevel = cms.untracked.VPSet( [
 cms.untracked.PSet(branch = cms.untracked.string("patPackedCandidates_packedPFCandidates__*"),splitLevel=cms.untracked.int32(99)),

SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py

@@ -123,14 +123,31 @@
     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.0 ), # fraction of events to simulate APV saturation
 )
 
+#################################################
+# activate APV simulation for 2016 Strip detector (UL 2016)
+# According to this document https://indico.cern.ch/event/560226/contributions/2277448/attachments/1324704/1988050/wgm_vfp_change_ebutz.pdf
+# the first LHC fill taken with vfp=0 settings is https://cmswbm.cern.ch/cmsdb/servlet/FillReport?FILL=5198 (run 278801)
+# cf Prompt-Reco DQM: https://tinyurl.com/y2gybwx7
+# pre-VFP  runs: 273150-278800 lumi: 19480.4566773 /pb
+# post-VFP runs: 278801-284044 lumi: 16755.0362868 /pb
+# ~53.8% of luminosity is affected by APV saturation
+#################################################
+
+from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016
+tracker_apv_vfp30_2016.toModify(SiStripSimBlock,
+                                includeAPVSimulation = True,
+                                fracOfEventsToSimAPV = 1.0
+                                )
+
 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

SimGeneral/MixingModule/python/aliases_PreMix_cfi.py

@@ -49,14 +49,28 @@
     )
 )
 
+simAPVsaturation = cms.EDAlias(
+    mixData = cms.VPSet(
+        cms.PSet(
+            type = cms.string('bool'),
+            fromProductInstance = cms.string('siStripDigisDMSimulatedAPVDynamicGain'),
+            toProductInstance = cms.string('SimulatedAPVDynamicGain'),
+        )
+    )
+)
+
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(simCastorDigis, mix = None)
 
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))])
 
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(simAPVsaturation, mixData = None)
+
 # no castor,pixel,strip digis in fastsim
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toModify(simCastorDigis, mix = None)
 fastSim.toModify(simSiPixelDigis, mix = None)
 fastSim.toModify(simSiStripDigis, mix = None)
+fastSim.toModify(simAPVsaturation, mixData = None)

SimGeneral/MixingModule/python/aliases_cfi.py

@@ -65,6 +65,12 @@
     )
 )
 
+simAPVsaturation = cms.EDAlias(
+    mix = cms.VPSet(
+        cms.PSet(type = cms.string('bool'))
+    )
+)
+
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(simCastorDigis, mix = None)
 
@@ -91,3 +97,4 @@
 fastSim.toModify(simCastorDigis, mix = None)
 fastSim.toModify(simSiPixelDigis, mix = None)
 fastSim.toModify(simSiStripDigis, mix = None)
+fastSim.toModify(simAPVsaturation, mix = None)

SimGeneral/MixingModule/python/stripDigitizer_cfi.py

@@ -23,6 +23,7 @@
     Noise = False, # will be added in DataMixer
     PreMixingMode = True, #Special mode to save all hit strips
     FedAlgorithm = 5, # special ZS mode: accept adc>0
+    includeAPVSimulation = False  # APV simulation is off for the MixingModule configuration in premix stage2
 )
 
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker

SimTracker/Configuration/python/SimTracker_EventContent_cff.py

@@ -62,3 +62,9 @@
         'keep *_*_Phase2OTDigiSimLink_*',
         'keep *_simSiPixelDigis_*_*', # covers digis and digiSimLinks
 ])
+
+from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016
+for _entry in [SimTrackerFEVTDEBUG,SimTrackerDEBUG,SimTrackerRAW,SimTrackerRECO,SimTrackerAOD,SimTrackerPREMIX]:
+    strips_vfp30_2016.toModify(_entry, outputCommands = _entry.outputCommands + [
+        'keep *_simAPVsaturation_SimulatedAPVDynamicGain_*'
+    ])