Skip to content

Commit eaf9fc7

Browse files
iarspideriarspider
committed
[LLVM][L1] Remove dead code
1 parent 26a5101 commit eaf9fc7

File tree

35 files changed

+77
-130
lines changed

35 files changed

+77
-130
lines changed

‎L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -241,25 +241,24 @@ void DTTSCand::setBitsTsm() {
241241
std::cout << "DTTSCand::DTTSCand(): masking not correct: ";
242242
std::cout << config()->TssMasking(itk);
243243
std::cout << " All bits set to 1" << std::endl;
244-
245-
// Masking:
246-
bool enaH = config()->TsmHtrigEna(itk);
247-
bool enaI = config()->TsmInOutEna(itk);
248-
bool enaC = config()->TsmCorrEna(itk);
249-
if (isCarry()) {
250-
// Special setting for carry
251-
enaH = config()->TsmHtrigEnaCarry();
252-
enaI = config()->TsmInOutEnaCarry();
253-
enaC = config()->TsmCorrEnaCarry();
254-
}
255-
// Bits set to 0 give higher priority:
256-
if (isHtrig() && enaH && posH > 0)
257-
_dataword.unset(posH);
258-
if (isInner() && enaI && posI > 0)
259-
_dataword.unset(posI);
260-
if (isCorr() && enaC && posC > 0)
261-
_dataword.unset(posC);
262244
}
245+
// Masking:
246+
bool enaH = config()->TsmHtrigEna(itk);
247+
bool enaI = config()->TsmInOutEna(itk);
248+
bool enaC = config()->TsmCorrEna(itk);
249+
if (isCarry()) {
250+
// Special setting for carry
251+
enaH = config()->TsmHtrigEnaCarry();
252+
enaI = config()->TsmInOutEnaCarry();
253+
enaC = config()->TsmCorrEnaCarry();
254+
}
255+
// Bits set to 0 give higher priority:
256+
if (isHtrig() && enaH && posH > 0)
257+
_dataword.unset(posH);
258+
if (isInner() && enaI && posI > 0)
259+
_dataword.unset(posI);
260+
if (isCorr() && enaC && posC > 0)
261+
_dataword.unset(posC);
263262
}
264263
}
265264
void DTTSCand::print() const {

‎L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ void DTTSPhi::runTSPhi() {
222222

223223
for (int is = DTConfigTSPhi::NSTEPF; is < DTConfigTSPhi::NSTEPL + 1; is++) {
224224
// loop on DTTSSs
225-
i_tsmd = 0;
226225
ntsm[is - DTConfigTSPhi::NSTEPF][0] = 0; // counter to make sector collector run if at least a tsm
227226
ntsm[is - DTConfigTSPhi::NSTEPF][1] = 0;
228227
std::vector<DTTSS *>::iterator p;

‎L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ void L1GlobalTriggerFDL::run(edm::Event &iEvent,
231231
//<< std::endl;
232232

233233
if (triggerMaskVetoTechTrigBit && techDecisionWord[iBit]) {
234-
daqPartitionFinalOR = false;
235234
vetoTechTrig = true;
236235

237236
// LogTrace("L1GlobalTrigger")

‎L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,6 @@ void L1GlobalTriggerGTL::run(edm::Event &iEvent,
216216

217217
LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
218218
}
219-
220-
// set convertScale to false to avoid executing the conversion
221-
// more than once - in case the scales change it will be set to true
222-
// in the cache check
223-
convertScale = false;
224219
}
225220

226221
// loop over condition maps (one map per condition chip)

‎L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ void L1GlobalTriggerPSB::fillPsbBlock(edm::Event &iEvent,
11101110
}
11111111
}
11121112
} else {
1113-
iHf = nHfBitCounts % hfPerWord;
1113+
// iHf = nHfBitCounts % hfPerWord;
11141114
// LogTrace("L1GlobalTrigger")
11151115
// << "\n No HfBitCounts collection - skip "
11161116
// << iHf*hfBits << " bits "

‎L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ const bool L1GtCorrelationCondition::evaluateCondition() const {
249249
}
250250

251251
// second object
252-
reqObjResult = false;
253-
254252
switch (cond1Categ) {
255253
case CondMuon: {
256254
corrMuon = static_cast<const L1GtMuonTemplate *>(m_gtCond1);
@@ -688,7 +686,6 @@ const bool L1GtCorrelationCondition::evaluateCondition() const {
688686
<< std::endl;
689687
}
690688

691-
reqEtaPhiResult = false;
692689
continue;
693690

694691
} else {

‎L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,6 @@ const bool L1GtEtaPhiConversions::convertPhiIndex(const unsigned int pairIndex,
489489
// could be outside the scale size if there are hardware errors
490490
// or wrong scale conversions
491491
if (initialIndex >= (*(m_pairPhiConvVec.at(pairIndex))).size()) {
492-
conversionStatus = false;
493-
494492
if (m_verbosity && m_isDebugEnabled) {
495493
LogTrace("L1GlobalTrigger") << (positionPair ? " Second" : "\n First") << " object from pair " << pairIndex
496494
<< ": initial phi index " << initialIndex

‎L1Trigger/GlobalTriggerAnalyzer/src/L1GtAnalyzer.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu
10031003
// retrieve L1GlobalTriggerObjectMapRecord and L1GlobalTriggerObjectMaps products
10041004
// the module returns an error code only if both payloads are missing
10051005

1006-
int iErrorRecord = 0;
1007-
10081006
bool validRecord = false;
10091007
bool gtObjectMapRecordValid = false;
10101008

@@ -1015,7 +1013,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu
10151013
validRecord = true;
10161014

10171015
} else {
1018-
iErrorRecord = 10;
10191016
LogDebug("L1GtAnalyzer") << "\nL1GlobalTriggerObjectMaps with \n " << m_l1GtObjectMapsInputTag
10201017
<< "\nnot found in the event." << std::endl;
10211018
}
@@ -1028,7 +1025,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu
10281025
validRecord = true;
10291026

10301027
} else {
1031-
iErrorRecord = iErrorRecord + 100;
10321028
LogDebug("L1GtAnalyzer") << "\nL1GlobalTriggerObjectMapRecord with \n " << m_l1GtObjectMapTag
10331029
<< "\nnot found in the event." << std::endl;
10341030
}

‎L1Trigger/HardwareValidation/interface/DEutils.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ inline L1DataEmulDigi DEutils<CSCCorrelatedLCTDigiCollection_>::DEDigi(col_cit i
484484
dw += (itd->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kHalfstripBitWidth);
485485
dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kBendBitWidth);
486486
dw += (itd->getMPCLink() & ((1 << kMPCLinkBitWidth) - 1)) << (shift += kBxBitWidth);
487-
dw += (itd->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift += kMPCLinkBitWidth);
487+
dw += (itd->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift + kMPCLinkBitWidth);
488488
shift = 0;
489489
ew = itm->isValid() & ((1 << kValidBitWidth) - 1);
490490
ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth);
@@ -494,7 +494,7 @@ inline L1DataEmulDigi DEutils<CSCCorrelatedLCTDigiCollection_>::DEDigi(col_cit i
494494
ew += (itm->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kHalfstripBitWidth);
495495
ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kBendBitWidth);
496496
ew += (itm->getMPCLink() & ((1 << kMPCLinkBitWidth) - 1)) << (shift += kBxBitWidth);
497-
ew += (itm->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift += kMPCLinkBitWidth);
497+
ew += (itm->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift + kMPCLinkBitWidth);
498498
digi.setData(dw, ew);
499499
return digi;
500500
}
@@ -523,14 +523,14 @@ inline L1DataEmulDigi DEutils<CSCALCTDigiCollection_>::DEDigi(col_cit itd, col_c
523523
dw += (itd->getAccelerator() & ((1 << kAccelBitWidth) - 1)) << (shift += kQualityBitWidth);
524524
dw += (itd->getCollisionB() & ((1 << kPatternBBitWidth) - 1)) << (shift += kAccelBitWidth);
525525
dw += (itd->getKeyWG() & ((1 << kWireGroupBitWidth) - 1)) << (shift += kPatternBBitWidth);
526-
dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kWireGroupBitWidth);
526+
dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kWireGroupBitWidth);
527527
shift = 0;
528528
ew = itm->isValid() & ((1 << kValidBitWidth) - 1);
529529
ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth);
530530
ew += (itm->getAccelerator() & ((1 << kAccelBitWidth) - 1)) << (shift += kQualityBitWidth);
531531
ew += (itm->getCollisionB() & ((1 << kPatternBBitWidth) - 1)) << (shift += kAccelBitWidth);
532532
ew += (itm->getKeyWG() & ((1 << kWireGroupBitWidth) - 1)) << (shift += kPatternBBitWidth);
533-
ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kWireGroupBitWidth);
533+
ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kWireGroupBitWidth);
534534
digi.setData(dw, ew);
535535
return digi;
536536
}
@@ -560,15 +560,15 @@ inline L1DataEmulDigi DEutils<CSCCLCTDigiCollection_>::DEDigi(col_cit itd, col_c
560560
dw += (itd->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kPatternBitWidth);
561561
dw += (itd->getStrip() & ((1 << kHalfstripBitWidth) - 1)) << (shift += kBendBitWidth);
562562
dw += (itd->getCFEB() & ((1 << kCFEBBitWidth) - 1)) << (shift += kHalfstripBitWidth);
563-
dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kCFEBBitWidth);
563+
dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kCFEBBitWidth);
564564
shift = 0;
565565
ew = itm->isValid() & ((1 << kValidBitWidth) - 1);
566566
ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth);
567567
ew += (itm->getPattern() & ((1 << kPatternBitWidth) - 1)) << (shift += kQualityBitWidth);
568568
ew += (itm->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kPatternBitWidth);
569569
ew += (itm->getStrip() & ((1 << kHalfstripBitWidth) - 1)) << (shift += kBendBitWidth);
570570
ew += (itm->getCFEB() & ((1 << kCFEBBitWidth) - 1)) << (shift += kHalfstripBitWidth);
571-
ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kCFEBBitWidth);
571+
ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kCFEBBitWidth);
572572
digi.setData(dw, ew);
573573
return digi;
574574
}

‎L1Trigger/HardwareValidation/plugins/L1DummyProducer.h‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,16 @@ inline void L1DummyProducer::SimpleDigi(int,
310310
Phi_Container tracks(ntrk);
311311
int ubx, uwh, usc, ust, uphr, uphb, uqua, utag, ucnt;
312312
for (int i = 0; i < ntrk; i++) {
313-
ubx = 0; //bxNum() - bx
314-
uwh = 0; //whNum() - wheel
315-
usc = 0; //scNum() - sector
316-
ust = 0; //stNum() - station
317-
uphr = 0; //phi() - radialAngle
318-
uphb = 0; //phiB() - bendingAngle
319-
uqua = 0; //code() - qualityCode
320-
utag = 0; //Ts2Tag() - Ts2TagCode
321-
ucnt = 0; //BxCnt() - BxCntCode
322-
uwh = (int)(-2 + 5 * engine->flat());
323-
usc = (int)(12 * engine->flat());
324-
ust = (int)(1. + 4 * engine->flat());
325-
uqua = (int)(8 * engine->flat());
313+
ubx = 0; //bxNum() - bx
314+
uwh = (int)(-2 + 5 * engine->flat()); //whNum() - wheel
315+
usc = (int)(12 * engine->flat()); //scNum() - sector
316+
ust = (int)(1. + 4 * engine->flat()); //stNum() - station
317+
uphr = 0; //phi() - radialAngle
318+
uphb = 0; //phiB() - bendingAngle
319+
uqua = (int)(8 * engine->flat()); //code() - qualityCode
320+
utag = 0; //Ts2Tag() - Ts2TagCode
321+
ucnt = 0; //BxCnt() - BxCntCode
322+
326323
L1MuDTChambPhDigi cand(ubx, uwh, usc, ust, uphr, uphb, uqua, utag, ucnt);
327324
tracks.push_back(cand);
328325
}

0 commit comments

Comments
 (0)