Merge pull request #26042 from CMSTrackerDPG/stuckTBM_from-CMSSW_10_6…

…_X_2019-02-28-1100 Add alias for PixelFEDChannelCollection.
cms-sw · Mar 7, 2019 · dc76f4a · dc76f4a
2 parents 2751089 + d7c4abf
commit dc76f4a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
@@ -22,12 +22,13 @@
 #)
 simHGCalUnsuppressedDigis = cms.EDAlias()
 simHFNoseUnsuppressedDigis = cms.EDAlias()
-simSiPixelDigis = cms.EDAlias(
-    mix = cms.VPSet(
-      cms.PSet(type = cms.string('PixelDigiedmDetSetVector')),
-      cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
-    )
+_pixelCommon = cms.VPSet(
+    cms.PSet(type = cms.string('PixelDigiedmDetSetVector')),
+    cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
+simSiPixelDigis = cms.EDAlias(
+    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
       cms.PSet(type = cms.string('SiStripDigiedmDetSetVector')),
@@ -48,11 +49,14 @@
     )
 )
 
+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) 
+
 # 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)
-
-from Configuration.Eras.Modifier_run3_common_cff import run3_common
-run3_common.toModify(simCastorDigis, mix = None)
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -22,12 +22,13 @@
       cms.PSet(type = cms.string('QIE11DataFrameHcalDataFrameContainer'))
     )
 )
-simSiPixelDigis = cms.EDAlias(
-    mix = cms.VPSet(
-      cms.PSet(type = cms.string('PixelDigiedmDetSetVector')),
-      cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
-    )
+_pixelCommon = cms.VPSet(
+    cms.PSet(type = cms.string('PixelDigiedmDetSetVector')),
+    cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
+simSiPixelDigis = cms.EDAlias(
+    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
       cms.PSet(type = cms.string('SiStripDigiedmDetSetVector')),
@@ -64,12 +65,6 @@
     )
 )
 
-# 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)
-
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(simCastorDigis, mix = None)
 
@@ -87,3 +82,12 @@
 
 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) 
+
+# 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)
diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc
@@ -115,11 +115,9 @@ namespace cms
         "which is not present in the configuration file.  You must add the service\n"
         "in the configuration file or remove the modules that require it.";
     }
-
+    
     _pixeldigialgo.reset(new SiPixelDigitizerAlgorithm(iConfig));
-    if (_pixeldigialgo->killBadFEDChannels()){
-      mixMod.produces<PixelFEDChannelCollection>();
-    }
+    mixMod.produces<PixelFEDChannelCollection>();
   }
 
   SiPixelDigitizer::~SiPixelDigitizer(){