From 92818f75bea4771f7480c6f8a35c984876474114 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Thu, 29 Feb 2024 20:29:11 +0100 Subject: [PATCH 1/2] disabled creation of PixelFEDChannelCollection by MixingModule in premix stage2 The PixelFEDChannelCollection produced by the MixingModule in premix stage2 is not used at all so there is no point is creating it. Another PixelFEDChannelCollection is produced later by the DataMixer and propagated to tracking (after undergoing DigiToRaw and RawToDigi steps). --- SimGeneral/MixingModule/python/pixelDigitizer_cfi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py b/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py index bb0bd83bd13a4..da76ee8ea334c 100644 --- a/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py +++ b/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py @@ -20,7 +20,8 @@ # customization applies only to phase0/1 pixel. from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 premix_stage2.toModify(pixelDigitizer, - AddPixelInefficiency = False # will be added in DataMixer + AddPixelInefficiency = False, # will be added in DataMixer + KillBadFEDChannels = False # will be added in DataMixer ) from SimTracker.SiPhase2Digitizer.phase2TrackerDigitizer_cfi import phase2TrackerDigitizer as _phase2TrackerDigitizer, _premixStage1ModifyDict From 7b6407e2d8f0b0db2e9e089a35a31043122f1a47 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Mon, 4 Mar 2024 09:51:38 +0100 Subject: [PATCH 2/2] kill both permanently and transiently bad pixel components in DataMixer Up to now permanently bad components were killed prior to the DataMixer and separately for signal and pileup. For pileup this was happening in the MixingModule in stage 1 premixing and for signal in the MixingModule in stage 2 premixing. Instead, killing of transiently bad components was deferred to the last step in the DataMixer where signal and pileup digis are mixed. With this commit both permanently and transiently bad pixel components are killed in one place, in the DataMixer. This way premixed pileup library can be produced even before the list of bad components has been finalized and can later be reused with different bad component scenarios. --- SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py | 1 + SimGeneral/MixingModule/python/pixelDigitizer_cfi.py | 3 ++- SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py index 817422a6a1e79..57a495a894255 100644 --- a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py +++ b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py @@ -136,6 +136,7 @@ def _modifyPixelDigitizerForRun3( digitizer ): AddNoisyPixels = False, AddPixelInefficiency = False, #done in second step KillBadFEDChannels = False, #done in second step + killModules = False #done in second step ) # Threshold in electrons are the Official CRAFT09 numbers: diff --git a/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py b/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py index da76ee8ea334c..febe320e19777 100644 --- a/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py +++ b/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py @@ -21,7 +21,8 @@ from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 premix_stage2.toModify(pixelDigitizer, AddPixelInefficiency = False, # will be added in DataMixer - KillBadFEDChannels = False # will be added in DataMixer + KillBadFEDChannels = False, # will be added in DataMixer + killModules = False # will be added in DataMixer ) from SimTracker.SiPhase2Digitizer.phase2TrackerDigitizer_cfi import phase2TrackerDigitizer as _phase2TrackerDigitizer, _premixStage1ModifyDict diff --git a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py index d23680a5a9a34..35327531990b5 100644 --- a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py +++ b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py @@ -51,7 +51,6 @@ # To preserve the behaviour of copy-pasted version of premix worker # All these are done in stage1 (for both signal and pileup) AddNoise = False, - killModules = False, MissCalibrate = False, ), workerType = cms.string("PreMixingSiPixelWorker"),