Skip to content

Commit c73961c

Browse files
committed
Merge pull request #12422 from davidlange6/755deadlockfix
implement fix for mayconsumes race condition in L1MuDTSectorReceiver
2 parents 4079148 + cd2c882 commit c73961c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

L1Trigger/DTTrackFinder/src/L1MuDTSectorReceiver.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ using namespace std;
5454
//----------------
5555
L1MuDTSectorReceiver::L1MuDTSectorReceiver(L1MuDTSectorProcessor& sp, edm::ConsumesCollector && iC) :
5656
m_sp(sp),
57-
m_DTDigiToken(iC.consumes<L1MuDTChambPhContainer>(L1MuDTTFConfig::getDTDigiInputTag())),
58-
m_CSCTrSToken(iC.mayConsume<CSCTriggerContainer<csctf::TrackStub> >(L1MuDTTFConfig::getCSCTrSInputTag())) {
57+
m_DTDigiToken(iC.consumes<L1MuDTChambPhContainer>(L1MuDTTFConfig::getDTDigiInputTag()))
58+
{
59+
if (L1MuDTTFConfig::getCSCTrSInputTag().label() != "none" )
60+
m_CSCTrSToken=iC.consumes<CSCTriggerContainer<csctf::TrackStub> >(L1MuDTTFConfig::getCSCTrSInputTag());
5961
}
6062

6163

0 commit comments

Comments
 (0)