Merge pull request #26636 from CMSTrackerDPG/from_CMSSW_10_6_0_pre4_s…

…tuckTBMPhase0 Output BadFED Channel only for Phase 1
cms-sw · May 8, 2019 · 1818d6e · 1818d6e
2 parents f092629 + 3fff847
commit 1818d6e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
@@ -27,7 +27,7 @@
     cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
 simSiPixelDigis = cms.EDAlias(
-    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+    mix = _pixelCommon
 ) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
@@ -52,8 +52,8 @@
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(simCastorDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toModify(simSiPixelDigis, mix = _pixelCommon) 
+from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
+phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))])
 
 # no castor,pixel,strip digis in fastsim
 from Configuration.Eras.Modifier_fastSim_cff import fastSim

diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -27,7 +27,7 @@
     cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
 simSiPixelDigis = cms.EDAlias(
-    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+    mix = _pixelCommon
 ) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
@@ -83,8 +83,8 @@
 from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
 (~phase2_hfnose).toModify(simHFNoseUnsuppressedDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toModify(simSiPixelDigis, mix = _pixelCommon) 
+from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
+phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))])
 
 # no castor,pixel,strip digis in fastsim
 from Configuration.Eras.Modifier_fastSim_cff import fastSim

diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc
@@ -117,7 +117,8 @@ namespace cms
     }
 
     _pixeldigialgo.reset(new SiPixelDigitizerAlgorithm(iConfig));
-    mixMod.produces<PixelFEDChannelCollection>();
+    if (NumberOfEndcapDisks != 2)
+      mixMod.produces<PixelFEDChannelCollection>();
   }
 
   SiPixelDigitizer::~SiPixelDigitizer(){