diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc index cd3b376689354..d4971a042ab69 100644 --- a/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc +++ b/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc @@ -241,25 +241,24 @@ void DTTSCand::setBitsTsm() { std::cout << "DTTSCand::DTTSCand(): masking not correct: "; std::cout << config()->TssMasking(itk); std::cout << " All bits set to 1" << std::endl; - - // Masking: - bool enaH = config()->TsmHtrigEna(itk); - bool enaI = config()->TsmInOutEna(itk); - bool enaC = config()->TsmCorrEna(itk); - if (isCarry()) { - // Special setting for carry - enaH = config()->TsmHtrigEnaCarry(); - enaI = config()->TsmInOutEnaCarry(); - enaC = config()->TsmCorrEnaCarry(); - } - // Bits set to 0 give higher priority: - if (isHtrig() && enaH && posH > 0) - _dataword.unset(posH); - if (isInner() && enaI && posI > 0) - _dataword.unset(posI); - if (isCorr() && enaC && posC > 0) - _dataword.unset(posC); } + // Masking: + bool enaH = config()->TsmHtrigEna(itk); + bool enaI = config()->TsmInOutEna(itk); + bool enaC = config()->TsmCorrEna(itk); + if (isCarry()) { + // Special setting for carry + enaH = config()->TsmHtrigEnaCarry(); + enaI = config()->TsmInOutEnaCarry(); + enaC = config()->TsmCorrEnaCarry(); + } + // Bits set to 0 give higher priority: + if (isHtrig() && enaH && posH > 0) + _dataword.unset(posH); + if (isInner() && enaI && posI > 0) + _dataword.unset(posI); + if (isCorr() && enaC && posC > 0) + _dataword.unset(posC); } } void DTTSCand::print() const { diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc index abeea339b1622..d27ff1363b7ec 100644 --- a/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc +++ b/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc @@ -222,7 +222,6 @@ void DTTSPhi::runTSPhi() { for (int is = DTConfigTSPhi::NSTEPF; is < DTConfigTSPhi::NSTEPL + 1; is++) { // loop on DTTSSs - i_tsmd = 0; ntsm[is - DTConfigTSPhi::NSTEPF][0] = 0; // counter to make sector collector run if at least a tsm ntsm[is - DTConfigTSPhi::NSTEPF][1] = 0; std::vector::iterator p; diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc index 2ec5de530a154..92f9e4577a795 100644 --- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc +++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc @@ -231,7 +231,6 @@ void L1GlobalTriggerFDL::run(edm::Event &iEvent, //<< std::endl; if (triggerMaskVetoTechTrigBit && techDecisionWord[iBit]) { - daqPartitionFinalOR = false; vetoTechTrig = true; // LogTrace("L1GlobalTrigger") diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc index 670698c3e01a3..25767e28fce07 100644 --- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc +++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc @@ -216,11 +216,6 @@ void L1GlobalTriggerGTL::run(edm::Event &iEvent, LogTrace("L1GlobalTrigger") << myCout.str() << std::endl; } - - // set convertScale to false to avoid executing the conversion - // more than once - in case the scales change it will be set to true - // in the cache check - convertScale = false; } // loop over condition maps (one map per condition chip) diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc index 0e2d6d5b4b2a7..49faa37b96d54 100644 --- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc +++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc @@ -1110,7 +1110,7 @@ void L1GlobalTriggerPSB::fillPsbBlock(edm::Event &iEvent, } } } else { - iHf = nHfBitCounts % hfPerWord; + // iHf = nHfBitCounts % hfPerWord; // LogTrace("L1GlobalTrigger") // << "\n No HfBitCounts collection - skip " // << iHf*hfBits << " bits " diff --git a/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc index 872edec939779..bfebe36b6eec1 100644 --- a/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc +++ b/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc @@ -249,8 +249,6 @@ const bool L1GtCorrelationCondition::evaluateCondition() const { } // second object - reqObjResult = false; - switch (cond1Categ) { case CondMuon: { corrMuon = static_cast(m_gtCond1); @@ -688,7 +686,6 @@ const bool L1GtCorrelationCondition::evaluateCondition() const { << std::endl; } - reqEtaPhiResult = false; continue; } else { diff --git a/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc b/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc index 47dfd12bfa3c0..0958a6ed275f7 100644 --- a/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc +++ b/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc @@ -489,8 +489,6 @@ const bool L1GtEtaPhiConversions::convertPhiIndex(const unsigned int pairIndex, // could be outside the scale size if there are hardware errors // or wrong scale conversions if (initialIndex >= (*(m_pairPhiConvVec.at(pairIndex))).size()) { - conversionStatus = false; - if (m_verbosity && m_isDebugEnabled) { LogTrace("L1GlobalTrigger") << (positionPair ? " Second" : "\n First") << " object from pair " << pairIndex << ": initial phi index " << initialIndex diff --git a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtAnalyzer.cc b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtAnalyzer.cc index 160bc54c32017..06ead0025fa9d 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/src/L1GtAnalyzer.cc +++ b/L1Trigger/GlobalTriggerAnalyzer/src/L1GtAnalyzer.cc @@ -1003,8 +1003,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu // retrieve L1GlobalTriggerObjectMapRecord and L1GlobalTriggerObjectMaps products // the module returns an error code only if both payloads are missing - int iErrorRecord = 0; - bool validRecord = false; bool gtObjectMapRecordValid = false; @@ -1015,7 +1013,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu validRecord = true; } else { - iErrorRecord = 10; LogDebug("L1GtAnalyzer") << "\nL1GlobalTriggerObjectMaps with \n " << m_l1GtObjectMapsInputTag << "\nnot found in the event." << std::endl; } @@ -1028,7 +1025,6 @@ void L1GtAnalyzer::analyzeTrigger(const edm::Event& iEvent, const edm::EventSetu validRecord = true; } else { - iErrorRecord = iErrorRecord + 100; LogDebug("L1GtAnalyzer") << "\nL1GlobalTriggerObjectMapRecord with \n " << m_l1GtObjectMapTag << "\nnot found in the event." << std::endl; } diff --git a/L1Trigger/HardwareValidation/interface/DEutils.h b/L1Trigger/HardwareValidation/interface/DEutils.h index cd81dd18d6ce3..b4c0a681aabe4 100644 --- a/L1Trigger/HardwareValidation/interface/DEutils.h +++ b/L1Trigger/HardwareValidation/interface/DEutils.h @@ -484,7 +484,7 @@ inline L1DataEmulDigi DEutils::DEDigi(col_cit i dw += (itd->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kHalfstripBitWidth); dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kBendBitWidth); dw += (itd->getMPCLink() & ((1 << kMPCLinkBitWidth) - 1)) << (shift += kBxBitWidth); - dw += (itd->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift += kMPCLinkBitWidth); + dw += (itd->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift + kMPCLinkBitWidth); shift = 0; ew = itm->isValid() & ((1 << kValidBitWidth) - 1); ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth); @@ -494,7 +494,7 @@ inline L1DataEmulDigi DEutils::DEDigi(col_cit i ew += (itm->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kHalfstripBitWidth); ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kBendBitWidth); ew += (itm->getMPCLink() & ((1 << kMPCLinkBitWidth) - 1)) << (shift += kBxBitWidth); - ew += (itm->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift += kMPCLinkBitWidth); + ew += (itm->getCSCID() & ((1 << kCSCIdBitWidth) - 1)) << (shift + kMPCLinkBitWidth); digi.setData(dw, ew); return digi; } @@ -523,14 +523,14 @@ inline L1DataEmulDigi DEutils::DEDigi(col_cit itd, col_c dw += (itd->getAccelerator() & ((1 << kAccelBitWidth) - 1)) << (shift += kQualityBitWidth); dw += (itd->getCollisionB() & ((1 << kPatternBBitWidth) - 1)) << (shift += kAccelBitWidth); dw += (itd->getKeyWG() & ((1 << kWireGroupBitWidth) - 1)) << (shift += kPatternBBitWidth); - dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kWireGroupBitWidth); + dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kWireGroupBitWidth); shift = 0; ew = itm->isValid() & ((1 << kValidBitWidth) - 1); ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth); ew += (itm->getAccelerator() & ((1 << kAccelBitWidth) - 1)) << (shift += kQualityBitWidth); ew += (itm->getCollisionB() & ((1 << kPatternBBitWidth) - 1)) << (shift += kAccelBitWidth); ew += (itm->getKeyWG() & ((1 << kWireGroupBitWidth) - 1)) << (shift += kPatternBBitWidth); - ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kWireGroupBitWidth); + ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kWireGroupBitWidth); digi.setData(dw, ew); return digi; } @@ -560,7 +560,7 @@ inline L1DataEmulDigi DEutils::DEDigi(col_cit itd, col_c dw += (itd->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kPatternBitWidth); dw += (itd->getStrip() & ((1 << kHalfstripBitWidth) - 1)) << (shift += kBendBitWidth); dw += (itd->getCFEB() & ((1 << kCFEBBitWidth) - 1)) << (shift += kHalfstripBitWidth); - dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kCFEBBitWidth); + dw += (itd->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kCFEBBitWidth); shift = 0; ew = itm->isValid() & ((1 << kValidBitWidth) - 1); ew += (itm->getQuality() & ((1 << kQualityBitWidth) - 1)) << (shift += kValidBitWidth); @@ -568,7 +568,7 @@ inline L1DataEmulDigi DEutils::DEDigi(col_cit itd, col_c ew += (itm->getBend() & ((1 << kBendBitWidth) - 1)) << (shift += kPatternBitWidth); ew += (itm->getStrip() & ((1 << kHalfstripBitWidth) - 1)) << (shift += kBendBitWidth); ew += (itm->getCFEB() & ((1 << kCFEBBitWidth) - 1)) << (shift += kHalfstripBitWidth); - ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift += kCFEBBitWidth); + ew += (itm->getBX() & ((1 << kBxBitWidth) - 1)) << (shift + kCFEBBitWidth); digi.setData(dw, ew); return digi; } diff --git a/L1Trigger/HardwareValidation/plugins/L1DummyProducer.h b/L1Trigger/HardwareValidation/plugins/L1DummyProducer.h index fb79751c45058..0e479323680b7 100644 --- a/L1Trigger/HardwareValidation/plugins/L1DummyProducer.h +++ b/L1Trigger/HardwareValidation/plugins/L1DummyProducer.h @@ -310,19 +310,16 @@ inline void L1DummyProducer::SimpleDigi(int, Phi_Container tracks(ntrk); int ubx, uwh, usc, ust, uphr, uphb, uqua, utag, ucnt; for (int i = 0; i < ntrk; i++) { - ubx = 0; //bxNum() - bx - uwh = 0; //whNum() - wheel - usc = 0; //scNum() - sector - ust = 0; //stNum() - station - uphr = 0; //phi() - radialAngle - uphb = 0; //phiB() - bendingAngle - uqua = 0; //code() - qualityCode - utag = 0; //Ts2Tag() - Ts2TagCode - ucnt = 0; //BxCnt() - BxCntCode - uwh = (int)(-2 + 5 * engine->flat()); - usc = (int)(12 * engine->flat()); - ust = (int)(1. + 4 * engine->flat()); - uqua = (int)(8 * engine->flat()); + ubx = 0; //bxNum() - bx + uwh = (int)(-2 + 5 * engine->flat()); //whNum() - wheel + usc = (int)(12 * engine->flat()); //scNum() - sector + ust = (int)(1. + 4 * engine->flat()); //stNum() - station + uphr = 0; //phi() - radialAngle + uphb = 0; //phiB() - bendingAngle + uqua = (int)(8 * engine->flat()); //code() - qualityCode + utag = 0; //Ts2Tag() - Ts2TagCode + ucnt = 0; //BxCnt() - BxCntCode + L1MuDTChambPhDigi cand(ubx, uwh, usc, ust, uphr, uphb, uqua, utag, ucnt); tracks.push_back(cand); } diff --git a/L1Trigger/HardwareValidation/src/L1Comparator.cc b/L1Trigger/HardwareValidation/src/L1Comparator.cc index 3a159fd159614..82ef114d17cc7 100644 --- a/L1Trigger/HardwareValidation/src/L1Comparator.cc +++ b/L1Trigger/HardwareValidation/src/L1Comparator.cc @@ -436,8 +436,8 @@ void L1Comparator::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSe edm::Handle gmt_emul; edm::Handle gmt_rdt_data_; edm::Handle gmt_rdt_emul_; - L1MuRegionalCandCollection const* gmt_rdt_data(new L1MuRegionalCandCollection); - L1MuRegionalCandCollection const* gmt_rdt_emul(new L1MuRegionalCandCollection); + L1MuRegionalCandCollection const* gmt_rdt_data = nullptr; + L1MuRegionalCandCollection const* gmt_rdt_emul = nullptr; //tbd: may compare extended candidates L1MuGMTCandCollection const* gmt_can_data(new L1MuGMTCandCollection); L1MuGMTCandCollection const* gmt_can_emul(new L1MuGMTCandCollection); diff --git a/L1Trigger/L1TCalorimeter/src/CaloTools.cc b/L1Trigger/L1TCalorimeter/src/CaloTools.cc index c6b851922c174..567ba53ce8799 100644 --- a/L1Trigger/L1TCalorimeter/src/CaloTools.cc +++ b/L1Trigger/L1TCalorimeter/src/CaloTools.cc @@ -484,7 +484,7 @@ unsigned int l1t::CaloTools::gloriousDivision(uint32_t aNumerator, uint32_t aDen // Restore the scale by taking into account the bitshift applied above. // We are now 18 bit left-shifted, so the 18 LSBs are effectively the fractional part... - uint32_t aFractional = (lResult >>= (9 - lBitShift)) & 0x3FFFF; + uint32_t aFractional = (lResult >> (9 - lBitShift)) & 0x3FFFF; // ...and the top 18 bits are the integer part // uint32_t aInteger = ( lResult >>= 18 ) & 0x3FFFF; diff --git a/L1Trigger/L1TGlobal/src/CorrCondition.cc b/L1Trigger/L1TGlobal/src/CorrCondition.cc index c57bcc79a57b0..082bed42d2017 100644 --- a/L1Trigger/L1TGlobal/src/CorrCondition.cc +++ b/L1Trigger/L1TGlobal/src/CorrCondition.cc @@ -204,8 +204,6 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const { } // second object - reqObjResult = false; - switch (cond1Categ) { case CondMuon: { corrMuon = static_cast(m_gtCond1); diff --git a/L1Trigger/L1TGlobal/src/CorrThreeBodyCondition.cc b/L1Trigger/L1TGlobal/src/CorrThreeBodyCondition.cc index 6a00bd879861b..99fa3843edd84 100644 --- a/L1Trigger/L1TGlobal/src/CorrThreeBodyCondition.cc +++ b/L1Trigger/L1TGlobal/src/CorrThreeBodyCondition.cc @@ -148,8 +148,6 @@ const bool l1t::CorrThreeBodyCondition::evaluateCondition(const int bxEval) cons } // SECOND OBJECT - reqObjResult = false; - if (cond1Categ == CondMuon) { LogDebug("L1TGlobal") << "\n --------------------- Second muon checks ---------------------" << std::endl; corrMuon = static_cast(m_gtCond1); @@ -183,8 +181,6 @@ const bool l1t::CorrThreeBodyCondition::evaluateCondition(const int bxEval) cons } // THIRD OBJECT - reqObjResult = false; - if (cond2Categ == CondMuon) { LogDebug("L1TGlobal") << "\n --------------------- Third muon checks ---------------------" << std::endl; corrMuon = static_cast(m_gtCond2); diff --git a/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc b/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc index 53f5768f8fff0..5c26f8a51cdfe 100644 --- a/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc +++ b/L1Trigger/L1TGlobal/src/CorrWithOverlapRemovalCondition.cc @@ -258,8 +258,6 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE } // second object - reqObjResult = false; - switch (cond1Categ) { case CondMuon: { corrMuon = static_cast(m_gtCond1); @@ -337,8 +335,6 @@ const bool l1t::CorrWithOverlapRemovalCondition::evaluateCondition(const int bxE } // third object (used for overlap removal) - reqObjResult = false; - switch (cond2Categ) { case CondMuon: { corrMuon = static_cast(m_gtCond2); diff --git a/L1Trigger/L1TGlobal/src/TriggerMenu.cc b/L1Trigger/L1TGlobal/src/TriggerMenu.cc index f1cbb108374ec..f24d59f02dc64 100644 --- a/L1Trigger/L1TGlobal/src/TriggerMenu.cc +++ b/L1Trigger/L1TGlobal/src/TriggerMenu.cc @@ -386,7 +386,6 @@ void TriggerMenu::buildGtConditionMap() { size_t vecCorrelationWORSize = m_vecCorrelationWithOverlapRemovalTemplate.size(); if (condMapSize < vecCorrelationWORSize) { m_conditionMap.resize(vecCorrelationWORSize); - condMapSize = m_conditionMap.size(); } chipNr = -1; diff --git a/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2016.cc b/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2016.cc index 5a9f82ab5ce21..4f7c6a6086dfd 100644 --- a/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2016.cc +++ b/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2016.cc @@ -263,7 +263,6 @@ PtAssignmentEngine::address_t PtAssignmentEngine2016::calculate_address(const EM case 15: // 1-2-3-4 // Set sign23 and sign34 relative to sign12 if (!sign12) { - sign12 = !sign12; sign23 = !sign23; sign34 = !sign34; } diff --git a/L1Trigger/L1TMuonOverlapPhase1/src/Tools/CandidateSimMuonMatcher.cc b/L1Trigger/L1TMuonOverlapPhase1/src/Tools/CandidateSimMuonMatcher.cc index 9e64a0eaa3356..0d62407de2c2f 100644 --- a/L1Trigger/L1TMuonOverlapPhase1/src/Tools/CandidateSimMuonMatcher.cc +++ b/L1Trigger/L1TMuonOverlapPhase1/src/Tools/CandidateSimMuonMatcher.cc @@ -441,14 +441,8 @@ MatchingResult CandidateSimMuonMatcher::match(const l1t::RegionalMuonCand* muonC result.muonCand = muonCand; result.procMuon = procMuon; - double treshold = 6. * sigma; - if (simTrack.momentum().pt() > 20) - treshold = 7. * sigma; - if (simTrack.momentum().pt() > 100) - treshold = 20. * sigma; - //for displaced muons in H2ll - treshold = 0.15; //pt > 30 + double treshold = 0.15; //pt > 30 if (simTrack.momentum().pt() < 10) //TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! tune the threshold!!!!!! treshold = 0.3; diff --git a/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h b/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h index 927e8f9f1cf82..641fee944b797 100644 --- a/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h +++ b/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h @@ -122,7 +122,7 @@ namespace Phase2L1GMT { bstart = wordconcat(w, bstart, phi_, BITSPHI); bstart = wordconcat(w, bstart, eta_, BITSETA); bstart = wordconcat(w, bstart, z0_, BITSZ0); - bstart = wordconcat(w, bstart, d0_, BITSD0); + wordconcat(w, bstart, d0_, BITSD0); return w.to_int(); } @@ -137,7 +137,7 @@ namespace Phase2L1GMT { bstart = wordconcat(w2, bstart, isGlobal_, 1); bstart = wordconcat(w2, bstart, beta_, BITSMUONBETA); bstart = wordconcat(w2, bstart, quality_, BITSMATCHQUALITY); - bstart = wordconcat(w2, bstart, valid_, 1); + wordconcat(w2, bstart, valid_, 1); return w2.to_int(); } diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc index 97e7c11b9b6d6..412262e2af233 100644 --- a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc +++ b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc @@ -193,7 +193,7 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::Convertl1tMuon(const l1t::RegionalMuonCand bstart = wordconcat(word, bstart, eta, BITSETA); // bstart = wordconcat(word, bstart, z0, BITSSAZ0); NOT YET SUPPORTED BY GMT bstart = wordconcat(word, bstart, d0, BITSSAD0); - bstart = wordconcat( + wordconcat( word, bstart, qual, 8); //FOR NOW 8 bits to be efficienct with Ghost busting. THIS IS ***NOT*** THE FINAL QUALITY // Calculate Lorentz Vector @@ -251,7 +251,7 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::ConvertEMTFTrack(const l1t::phase2::EMTFTr float track_theta = emtf::phase2::tp::calcThetaRadFromInt(track.modelEta()); float track_eta = -1 * std::log(std::tan(track_theta / 2)); - track_theta *= track.endcap(); + // track_theta *= track.endcap(); track_eta *= track.endcap(); // Calculate Lorentz Vector @@ -277,7 +277,7 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::ConvertEMTFTrack(const l1t::phase2::EMTFTr bstart = wordconcat(word, bstart, eta, BITSETA); // bstart = wordconcat(word, bstart, z0, BITSSAZ0); NOT YET SUPPORTED BY GMT bstart = wordconcat(word, bstart, d0, BITSSAD0); - bstart = wordconcat( + wordconcat( word, bstart, qual, 8); //FOR NOW 8 bits to be efficienct with Ghost busting. THIS IS ***NOT*** THE FINAL QUALITY SAMuon samuon(p4, charge, pt.to_uint(), eta.to_int(), phi.to_int(), z0.to_int(), d0.to_int(), qual.to_uint()); diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTKMTFProducer.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTKMTFProducer.cc index 87297ccb94de7..04855cd154cb3 100644 --- a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTKMTFProducer.cc +++ b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTKMTFProducer.cc @@ -112,7 +112,7 @@ void Phase2L1TGMTKMTFProducer::produce(edm::Event& iEvent, const edm::EventSetup bstart = wordconcat(word, bstart, p.hwPhi(), BITSPHI); bstart = wordconcat(word, bstart, p.hwEta(), BITSETA); bstart = wordconcat(word, bstart, p.hwD0(), BITSSAD0); - bstart = wordconcat(word, bstart, track.rankPrompt(), 8); + wordconcat(word, bstart, track.rankPrompt(), 8); for (const auto& stub : track.stubs()) p.addStub(stub); @@ -140,7 +140,7 @@ void Phase2L1TGMTKMTFProducer::produce(edm::Event& iEvent, const edm::EventSetup bstart = wordconcat(word, bstart, p.hwPhi(), BITSPHI); bstart = wordconcat(word, bstart, p.hwEta(), BITSETA); bstart = wordconcat(word, bstart, p.hwD0(), BITSSAD0); - bstart = wordconcat(word, bstart, track.rankDisp(), 8); + wordconcat(word, bstart, track.rankDisp(), 8); for (const auto& stub : track.stubs()) { p.addStub(stub); diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonGhostCleaner.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonGhostCleaner.cc index a88e38ee54d60..2f77ba2bbaeaf 100644 --- a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonGhostCleaner.cc +++ b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonGhostCleaner.cc @@ -81,7 +81,7 @@ std::vector Phase2L1TGMTSAMuonGhostCleaner::prodMuons(std::vector(word, bstart, m.hwZ0(), BITSSAZ0); bstart = wordconcat(word, bstart, m.hwD0(), BITSSAD0); bstart = wordconcat(word, bstart, m.hwCharge(), 1); - bstart = wordconcat(word, bstart, m.hwQual(), BITSSAQUAL); + wordconcat(word, bstart, m.hwQual(), BITSSAQUAL); m.setWord(word); finalMuons.push_back(m); } diff --git a/L1Trigger/Phase2L1GMT/src/TPSAlgorithm.cc b/L1Trigger/Phase2L1GMT/src/TPSAlgorithm.cc index 43d5535e59155..ae0b40edff5d9 100644 --- a/L1Trigger/Phase2L1GMT/src/TPSAlgorithm.cc +++ b/L1Trigger/Phase2L1GMT/src/TPSAlgorithm.cc @@ -107,13 +107,13 @@ bool TPSAlgorithm::outputGT(std::vector& muons) { bstart = wordconcat(word1, bstart, mu.hwPhi(), BITSGTPHI); bstart = wordconcat(word1, bstart, mu.hwEta(), BITSGTETA); bstart = wordconcat(word1, bstart, mu.hwZ0(), BITSGTZ0); - bstart = wordconcat(word1, bstart, (mu.hwD0() >> 2), BITSGTD0); + wordconcat(word1, bstart, (mu.hwD0() >> 2), BITSGTD0); bstart = 0; bstart = wordconcat(word2, bstart, mu.hwCharge(), 1); bstart = wordconcat(word2, bstart, mu.hwQual(), BITSGTQUAL); bstart = wordconcat(word2, bstart, mu.hwIso(), BITSGTISO); - bstart = wordconcat(word2, bstart, mu.hwBeta(), BITSGTBETA); + wordconcat(word2, bstart, mu.hwBeta(), BITSGTBETA); std::array wordout = {{word1, word2}}; mu.setWord(wordout); diff --git a/L1Trigger/Phase2L1GMT/src/TrackConverter.cc b/L1Trigger/Phase2L1GMT/src/TrackConverter.cc index 414ee8b69ced0..ed41af2460107 100644 --- a/L1Trigger/Phase2L1GMT/src/TrackConverter.cc +++ b/L1Trigger/Phase2L1GMT/src/TrackConverter.cc @@ -39,7 +39,7 @@ ConvertedTTTrack TrackConverter::convert(const edm::Ptr(word, bstart, tanLambda, BITSTTTANL); bstart = wordconcat(word, bstart, z0, BITSZ0); bstart = wordconcat(word, bstart, d0, BITSD0); - bstart = wordconcat(word, bstart, uint(track->chi2()), 4); + wordconcat(word, bstart, uint(track->chi2()), 4); ConvertedTTTrack convertedTrack(charge, curvature, absEta, pt, eta, phi, z0, d0, quality, word); convertedTrack.setOfflineQuantities(LSBpt * pt, LSBeta * eta, LSBphi * phi); diff --git a/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCDigis.cc b/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCDigis.cc index de6f77544df37..506022283bcb9 100644 --- a/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCDigis.cc +++ b/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCDigis.cc @@ -218,7 +218,6 @@ void RBCProcessRPCDigis::setDigiAt(int sector, int digipos, RPCData& block) { auto itr = std::find(s_sec1id.begin(), s_sec1id.end(), sector); if (itr == s_sec1id.end()) { - itr = std::find(s_sec2id.begin(), s_sec2id.end(), sector); isAoB = 1; } diff --git a/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCSimDigis.cc b/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCSimDigis.cc index 51e9d6b956daf..7ac71d82e7286 100644 --- a/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCSimDigis.cc +++ b/L1Trigger/RPCTechnicalTrigger/src/RBCProcessRPCSimDigis.cc @@ -206,7 +206,6 @@ void RBCProcessRPCSimDigis::setDigiAt(int sector, int digipos, RPCData& block) { auto itr = std::find(s_sec1id.begin(), s_sec1id.end(), sector); if (itr == s_sec1id.end()) { - itr = std::find(s_sec2id.begin(), s_sec2id.end(), sector); isAoB = 1; } diff --git a/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc b/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc index 896976b9091a0..451d472392e6c 100644 --- a/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc +++ b/L1Trigger/RPCTechnicalTrigger/src/RPCTechnicalTrigger.cc @@ -216,8 +216,6 @@ void RPCTechnicalTrigger::produce(edm::Event& iEvent, const edm::EventSetup& iSe continue; } - infoSize = serializedInfoLine2.size(); - std::sort(serializedInfoLine2.begin(), serializedInfoLine2.end(), sortByBx); if (m_verbosity) { diff --git a/L1Trigger/RPCTechnicalTrigger/src/TTUEmulator.cc b/L1Trigger/RPCTechnicalTrigger/src/TTUEmulator.cc index 5140211833b57..a7537cd7ad47b 100644 --- a/L1Trigger/RPCTechnicalTrigger/src/TTUEmulator.cc +++ b/L1Trigger/RPCTechnicalTrigger/src/TTUEmulator.cc @@ -64,7 +64,7 @@ void TTUEmulator::setSpecifications(const TTUBoardSpecs* ttuspecs, const RBCBoar bool TTUEmulator::initialise() { bool status(false); for (int k = 0; k < m_maxWheels; ++k) - status = m_Wheels[k].initialise(); + m_Wheels[k].initialise(); status = m_ttuconf->initialise(m_line, m_id); diff --git a/L1Trigger/RPCTrigger/src/RPCTBMuon.cc b/L1Trigger/RPCTrigger/src/RPCTBMuon.cc index efd6aa71ac9fe..2b3f857ea02ef 100644 --- a/L1Trigger/RPCTrigger/src/RPCTBMuon.cc +++ b/L1Trigger/RPCTrigger/src/RPCTBMuon.cc @@ -221,7 +221,6 @@ void RPCTBMuon::PACOut::fromBits(RPCTBMuon& muon, unsigned int value) { muon.m_PtCode = (value & (m_ptBitsMask << shift)) >> shift; shift += m_ptBitsCnt; muon.m_Quality = (value & (m_qualBitsMask << shift)) >> shift; - shift += m_qualBitsCnt; } unsigned int RPCTBMuon::PACOut::toBits(const RPCTBMuon& muon) { @@ -232,7 +231,6 @@ unsigned int RPCTBMuon::PACOut::toBits(const RPCTBMuon& muon) { value = value | (muon.m_PtCode << shift); shift += m_ptBitsCnt; value = value | (muon.m_Quality << shift); - shift += m_qualBitsCnt; return value; } @@ -251,7 +249,6 @@ void RPCTBMuon::TBOut::fromBits(RPCTBMuon& muon, unsigned int value) { muon.m_EtaAddress = (value & (m_etaBitsMask << shift)) >> shift; shift += m_etaBitsCnt; muon.m_GBData = (value & (m_gbDataBitsMask << shift)) >> shift; - shift += m_gbDataBitsCnt; } unsigned int RPCTBMuon::TBOut::toBits(const RPCTBMuon& muon) { @@ -268,7 +265,6 @@ unsigned int RPCTBMuon::TBOut::toBits(const RPCTBMuon& muon) { value = value | (muon.m_EtaAddress << shift); shift += m_etaBitsCnt; value = value | (muon.m_GBData << shift); - shift += m_gbDataBitsCnt; return value; } @@ -286,7 +282,6 @@ void RPCTBMuon::TCOut::fromBits(RPCTBMuon& muon, unsigned int value) { muon.m_EtaAddress = (value & (m_etaBitsMask << shift)) >> shift; shift += m_etaBitsCnt; muon.m_GBData = (value & (m_gbDataBitsMask << shift)) >> shift; - shift += m_gbDataBitsCnt; } unsigned int RPCTBMuon::TCOut::toBits(const RPCTBMuon& muon) { @@ -303,7 +298,6 @@ unsigned int RPCTBMuon::TCOut::toBits(const RPCTBMuon& muon) { value = value | (muon.m_EtaAddress << shift); shift += m_etaBitsCnt; value = value | (muon.m_GBData << shift); - shift += m_gbDataBitsCnt; return value; } //------------------------------- @@ -322,7 +316,6 @@ unsigned int RPCTBMuon::HSBOut::toBits(const RPCTBMuon& muon) { value = value | (muon.m_PhiAddress << shift); shift += m_phiBitsCnt; value = value | (muon.m_EtaAddress << shift); - shift += m_etaBitsCnt; return value; } @@ -338,7 +331,6 @@ void RPCTBMuon::HSBOut::fromBits(RPCTBMuon& muon, unsigned int value) { muon.m_PhiAddress = (value & (m_phiBitsMask << shift)) >> shift; shift += m_phiBitsCnt; muon.m_EtaAddress = (value & (m_etaBitsMask << shift)) >> shift; - shift += m_etaBitsCnt; } unsigned int RPCTBMuon::FSBOut::toBits(const RPCTBMuon& muon) { @@ -360,7 +352,6 @@ unsigned int RPCTBMuon::FSBOut::toBits(const RPCTBMuon& muon) { value = value | (muon.m_EtaAddress << shift); shift += m_etaBitsCnt + 1; value = value | (muon.m_Sign << shift); - shift += m_signBitsCnt; return value; } @@ -378,7 +369,6 @@ void RPCTBMuon::FSBOut::fromBits(RPCTBMuon& muon, unsigned int value) { muon.m_EtaAddress = (value & (m_etaBitsMask << shift)) >> shift; shift += m_etaBitsCnt + 1; muon.m_Sign = (value & (m_signBitsMask << shift)) >> shift; - shift += m_signBitsCnt; muon.m_PtCode = (~(muon.m_PtCode)) & m_ptBitsMask; muon.m_Quality = (~(muon.m_Quality)) & m_qualBitsMask; diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc index cf6c23cf23dfd..336a0db2ea314 100644 --- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc +++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc @@ -153,27 +153,28 @@ void L1RCTTestAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup if (showEmCands) { if ((*em).rank() > 0) { // std::cout << std::endl << "rank: " << (*em).rank(); - unsigned short rgnPhi = 999; - unsigned short rgn = (unsigned short)(*em).rctRegion(); + // unsigned short rgnPhi = 999; + // unsigned short rgn = (unsigned short)(*em).rctRegion(); unsigned short card = (unsigned short)(*em).rctCard(); - unsigned short crate = (unsigned short)(*em).rctCrate(); - - if (card == 6) { - rgnPhi = rgn; - } else if (card < 6) { - rgnPhi = (card % 2); - } else { - std::cout << "rgnPhi not assigned (still " << rgnPhi << ") -- Weird card number! " << card; + // unsigned short crate = (unsigned short)(*em).rctCrate(); + + // if (card == 6) { + // rgnPhi = rgn; + // } else if (card < 6) { + // rgnPhi = (card % 2); + // } else { + if (card > 6) { + std::cout << "rgnPhi not assigned -- Weird card number! " << card; } // unsigned short phi_bin = ((crate % 9) * 2) + rgnPhi; - short eta_bin = (card / 2) * 2 + 1; - if (card < 6) { - eta_bin = eta_bin + rgn; - } - if (crate < 9) { - eta_bin = -eta_bin; - } + // short eta_bin = (card / 2) * 2 + 1; + // if (card < 6) { + // eta_bin = eta_bin + rgn; + // } + // if (crate < 9) { + // eta_bin = -eta_bin; + // } // std::cout << /* "rank: " << (*em).rank() << */ " // eta_bin: " << eta_bin << " phi_bin: " << phi_bin << ". crate: " diff --git a/L1Trigger/TrackFindingTMTT/src/DupFitTrkKiller.cc b/L1Trigger/TrackFindingTMTT/src/DupFitTrkKiller.cc index 976f14e3de0a9..6c8016fa84e25 100644 --- a/L1Trigger/TrackFindingTMTT/src/DupFitTrkKiller.cc +++ b/L1Trigger/TrackFindingTMTT/src/DupFitTrkKiller.cc @@ -79,7 +79,7 @@ namespace tmtt { if ((!usePtAndZ0Cuts) || (std::abs(trk.z0()) < settings_->beamWindowZ() && trk.pt() > settings_->houghMinPt() - 0.2)) { // For debugging. - const TP* tp = trk.matchedTP(); + [[clang::suppress]] const TP* tp = trk.matchedTP(); // Check if this track's fitted (q/pt, phi0) helix parameters correspond to the same HT cell as the HT originally found the track in. bool consistentCell = trk.consistentHTcell(); @@ -175,7 +175,7 @@ namespace tmtt { htCellUsed.insert(htCell); // For debugging. - const TP* tp = trk->matchedTP(); + [[clang::suppress]] const TP* tp = trk->matchedTP(); if (debug && tp != nullptr) { PrintL1trk() << "SECOND PASS: m=" << trk->cellLocationHT().first << "/" << trk->cellLocationFit().first diff --git a/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc b/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc index dd168792f96a7..271820b2cbf50 100644 --- a/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc +++ b/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc @@ -182,8 +182,8 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) { */ - bool print = getName() == "MP_L3PHIC" && iSector == 3; - print = false; + // bool print = getName() == "MP_L3PHIC" && iSector == 3; + bool print = false; phimin_ = phimin; diff --git a/L1Trigger/TrackFindingTracklet/src/TrackletProcessor.cc b/L1Trigger/TrackFindingTracklet/src/TrackletProcessor.cc index 9edfebfef9536..7d7822b1c0f2e 100644 --- a/L1Trigger/TrackFindingTracklet/src/TrackletProcessor.cc +++ b/L1Trigger/TrackFindingTracklet/src/TrackletProcessor.cc @@ -224,8 +224,8 @@ void TrackletProcessor::addInput(MemoryBase* memory, string input) { } void TrackletProcessor::execute(unsigned int iSector, double phimin, double phimax) { - bool print = (iSector == 3) && (getName() == "TP_L1L2D"); - print = false; + // bool print = (iSector == 3) && (getName() == "TP_L1L2D"); + bool print = false; phimin_ = phimin; phimax_ = phimax; diff --git a/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuConfigOnlineProd.cc b/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuConfigOnlineProd.cc index 4ac7244670476..ad8e67e8db457 100644 --- a/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuConfigOnlineProd.cc +++ b/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuConfigOnlineProd.cc @@ -1631,7 +1631,7 @@ void L1GtTriggerMenuConfigOnlineProd::addCorrelationCondition(const TableMenuCon case BPTX: case GtExternal: case TechTrig: { - wrongSubcondition = true; + // wrongSubcondition = true; edm::LogWarning("L1GtTriggerMenuConfigOnlineProd") << "\n Warning: correlation condition " << (condDB.cond) << " with invalid sub-condition object type " << gtObj << "\n Condition ignored!" << std::endl; diff --git a/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuXmlParser.cc b/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuXmlParser.cc index 2125f1957a3dd..4cb40f8769e8a 100644 --- a/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuXmlParser.cc +++ b/L1TriggerConfig/L1GtConfigProducers/src/L1GtTriggerMenuXmlParser.cc @@ -3121,11 +3121,10 @@ bool L1GtTriggerMenuXmlParser::workAlgorithm(XERCES_CPP_NAMESPACE::DOMNode* node //<< std::endl; // determine output pin - DOMNode* pinNode = findXMLChild(node->getFirstChild(), m_xmlTagOutput); std::string pinString; int outputPin = 0; - pinNode = node->getFirstChild(); + DOMNode* pinNode = node->getFirstChild(); if ((pinNode = findXMLChild(pinNode, m_xmlTagOutputPin)) != nullptr) { pinString = getXMLAttribute(pinNode, m_xmlAttrNr); @@ -3283,11 +3282,10 @@ bool L1GtTriggerMenuXmlParser::workTechTrigger(XERCES_CPP_NAMESPACE::DOMNode* no //<< std::endl; // determine bit number (use output pin tag) - DOMNode* pinNode = findXMLChild(node->getFirstChild(), m_xmlTagOutput); std::string pinString; int outputPin = 0; - pinNode = node->getFirstChild(); + DOMNode* pinNode = node->getFirstChild(); if ((pinNode = findXMLChild(pinNode, m_xmlTagOutputPin)) != nullptr) { pinString = getXMLAttribute(pinNode, m_xmlAttrNr);