[LLVM][L1] Remove dead code

cms-sw · Oct 4, 2024 · 1e22f18 · 1e22f18
1 parent 26a5101
commit 1e22f18
Show file tree

Hide file tree

Showing 35 changed files with 73 additions and 128 deletions.
diff --git 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
@@ -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<DTTSS *>::iterator p;

diff --git 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
@@ -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
@@ -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
@@ -249,8 +249,6 @@ const bool L1GtCorrelationCondition::evaluateCondition() const {
   }
 
   // second object
-  reqObjResult = false;
-
   switch (cond1Categ) {
     case CondMuon: {
       corrMuon = static_cast<const L1GtMuonTemplate *>(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
@@ -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
@@ -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
@@ -484,7 +484,7 @@ inline L1DataEmulDigi DEutils<CSCCorrelatedLCTDigiCollection_>::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<CSCCorrelatedLCTDigiCollection_>::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<CSCALCTDigiCollection_>::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,15 +560,15 @@ inline L1DataEmulDigi DEutils<CSCCLCTDigiCollection_>::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);
   ew += (itm->getPattern() & ((1 << kPatternBitWidth) - 1)) << (shift += kQualityBitWidth);
   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
@@ -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
@@ -436,8 +436,8 @@ void L1Comparator::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSe
   edm::Handle<L1MuGMTCandCollection> gmt_emul;
   edm::Handle<L1MuGMTReadoutCollection> gmt_rdt_data_;
   edm::Handle<L1MuGMTReadoutCollection> 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
@@ -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
@@ -204,8 +204,6 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const {
   }
 
   // second object
-  reqObjResult = false;
-
   switch (cond1Categ) {
     case CondMuon: {
       corrMuon = static_cast<const MuonTemplate*>(m_gtCond1);

diff --git 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<const MuonTemplate*>(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<const MuonTemplate*>(m_gtCond2);

diff --git 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<const MuonTemplate*>(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<const MuonTemplate*>(m_gtCond2);

diff --git 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
@@ -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
@@ -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
@@ -122,7 +122,7 @@ namespace Phase2L1GMT {
       bstart = wordconcat<wordtype>(w, bstart, phi_, BITSPHI);
       bstart = wordconcat<wordtype>(w, bstart, eta_, BITSETA);
       bstart = wordconcat<wordtype>(w, bstart, z0_, BITSZ0);
-      bstart = wordconcat<wordtype>(w, bstart, d0_, BITSD0);
+      wordconcat<wordtype>(w, bstart, d0_, BITSD0);
       return w.to_int();
     }
 
@@ -137,7 +137,7 @@ namespace Phase2L1GMT {
       bstart = wordconcat<wordtype>(w2, bstart, isGlobal_, 1);
       bstart = wordconcat<wordtype>(w2, bstart, beta_, BITSMUONBETA);
       bstart = wordconcat<wordtype>(w2, bstart, quality_, BITSMATCHQUALITY);
-      bstart = wordconcat<wordtype>(w2, bstart, valid_, 1);
+      wordconcat<wordtype>(w2, bstart, valid_, 1);
 
       return w2.to_int();
     }

diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTFwdMuonTranslator.cc
@@ -193,7 +193,7 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::Convertl1tMuon(const l1t::RegionalMuonCand
   bstart = wordconcat<wordtype>(word, bstart, eta, BITSETA);
   //  bstart = wordconcat<wordtype>(word, bstart, z0, BITSSAZ0); NOT YET SUPPORTED BY GMT
   bstart = wordconcat<wordtype>(word, bstart, d0, BITSSAD0);
-  bstart = wordconcat<wordtype>(
+  wordconcat<wordtype>(
       word, bstart, qual, 8);  //FOR NOW 8 bits to be efficienct with Ghost busting. THIS IS ***NOT*** THE FINAL QUALITY
 
   // Calculate Lorentz Vector
@@ -248,10 +248,8 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::ConvertEMTFTrack(const l1t::phase2::EMTFTr
   // Convert EMTF Phi and Theta to Global Phi and Eta
   float track_phi =
       emtf::phase2::tp::calcPhiGlobRadFromLoc(track.sector(), emtf::phase2::tp::calcPhiLocRadFromInt(track.modelPhi()));
-  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_eta *= track.endcap();
 
   // Calculate Lorentz Vector
@@ -277,7 +275,7 @@ SAMuon Phase2L1TGMTFwdMuonTranslator::ConvertEMTFTrack(const l1t::phase2::EMTFTr
   bstart = wordconcat<wordtype>(word, bstart, eta, BITSETA);
   //  bstart = wordconcat<wordtype>(word, bstart, z0, BITSSAZ0); NOT YET SUPPORTED BY GMT
   bstart = wordconcat<wordtype>(word, bstart, d0, BITSSAD0);
-  bstart = wordconcat<wordtype>(
+  wordconcat<wordtype>(
       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
@@ -112,7 +112,7 @@ void Phase2L1TGMTKMTFProducer::produce(edm::Event& iEvent, const edm::EventSetup
     bstart = wordconcat<wordtype>(word, bstart, p.hwPhi(), BITSPHI);
     bstart = wordconcat<wordtype>(word, bstart, p.hwEta(), BITSETA);
     bstart = wordconcat<wordtype>(word, bstart, p.hwD0(), BITSSAD0);
-    bstart = wordconcat<wordtype>(word, bstart, track.rankPrompt(), 8);
+    wordconcat<wordtype>(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<wordtype>(word, bstart, p.hwPhi(), BITSPHI);
     bstart = wordconcat<wordtype>(word, bstart, p.hwEta(), BITSETA);
     bstart = wordconcat<wordtype>(word, bstart, p.hwD0(), BITSSAD0);
-    bstart = wordconcat<wordtype>(word, bstart, track.rankDisp(), 8);
+    wordconcat<wordtype>(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
@@ -81,7 +81,7 @@ std::vector<l1t::SAMuon> Phase2L1TGMTSAMuonGhostCleaner::prodMuons(std::vector<l
     bstart = wordconcat<wordtype>(word, bstart, m.hwZ0(), BITSSAZ0);
     bstart = wordconcat<wordtype>(word, bstart, m.hwD0(), BITSSAD0);
     bstart = wordconcat<wordtype>(word, bstart, m.hwCharge(), 1);
-    bstart = wordconcat<wordtype>(word, bstart, m.hwQual(), BITSSAQUAL);
+    wordconcat<wordtype>(word, bstart, m.hwQual(), BITSSAQUAL);
     m.setWord(word);
     finalMuons.push_back(m);
   }