Merge pull request #12422 from davidlange6/755deadlockfix

implement fix for mayconsumes race condition in L1MuDTSectorReceiver
cms-sw · Nov 15, 2015 · c73961c · c73961c
2 parents 4079148 + cd2c882
commit c73961c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/L1Trigger/DTTrackFinder/src/L1MuDTSectorReceiver.cc b/L1Trigger/DTTrackFinder/src/L1MuDTSectorReceiver.cc
@@ -54,8 +54,10 @@ using namespace std;
 //----------------
 L1MuDTSectorReceiver::L1MuDTSectorReceiver(L1MuDTSectorProcessor& sp, edm::ConsumesCollector && iC) : 
         m_sp(sp),
-        m_DTDigiToken(iC.consumes<L1MuDTChambPhContainer>(L1MuDTTFConfig::getDTDigiInputTag())),
-        m_CSCTrSToken(iC.mayConsume<CSCTriggerContainer<csctf::TrackStub> >(L1MuDTTFConfig::getCSCTrSInputTag())) {
+        m_DTDigiToken(iC.consumes<L1MuDTChambPhContainer>(L1MuDTTFConfig::getDTDigiInputTag()))
+{
+	if (L1MuDTTFConfig::getCSCTrSInputTag().label() != "none" ) 
+	  m_CSCTrSToken=iC.consumes<CSCTriggerContainer<csctf::TrackStub> >(L1MuDTTFConfig::getCSCTrSInputTag()); 
 }