From 2e9e60509842cf6f260856cb6ddd28bfdcbf45fe Mon Sep 17 00:00:00 2001 From: Thomas Reis Date: Wed, 9 Mar 2016 11:31:31 +0100 Subject: [PATCH] Fix for cancel out unit --- L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc b/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc index 191d79454eb75..0ae405991cca0 100644 --- a/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc +++ b/L1Trigger/L1TMuon/src/MicroGMTCancelOutUnit.cc @@ -19,13 +19,11 @@ MicroGMTCancelOutUnit::initialise(L1TMuonGlobalParams* microGMTParams) { m_boNegMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->bONegMatchQualLUTPath(), microGMTParams->bONegMatchQualLUTMaxDR(), cancel_t::omtf_bmtf_neg, fwVersion); m_foPosMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->fOPosMatchQualLUTPath(), microGMTParams->fOPosMatchQualLUTMaxDR(), cancel_t::omtf_emtf_pos, fwVersion); m_foNegMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->fONegMatchQualLUTPath(), microGMTParams->fONegMatchQualLUTMaxDR(), cancel_t::omtf_emtf_neg, fwVersion); - //m_brlSingleMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->brlSingleMatchQualLUTPath(), microGMTParams->brlSingleMatchQualLUTMaxDR(), cancel_t::bmtf_bmtf, fwVersion); m_ovlPosSingleMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->ovlPosSingleMatchQualLUTPath(), microGMTParams->ovlPosSingleMatchQualLUTMaxDR(), cancel_t::omtf_omtf_pos, fwVersion); m_ovlNegSingleMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->ovlNegSingleMatchQualLUTPath(), microGMTParams->ovlNegSingleMatchQualLUTMaxDR(), cancel_t::omtf_omtf_neg, fwVersion); m_fwdPosSingleMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->fwdPosSingleMatchQualLUTPath(), microGMTParams->fwdPosSingleMatchQualLUTMaxDR(), cancel_t::emtf_emtf_pos, fwVersion); m_fwdNegSingleMatchQualLUT = l1t::MicroGMTMatchQualLUTFactory::create(microGMTParams->fwdNegSingleMatchQualLUTPath(), microGMTParams->fwdNegSingleMatchQualLUTMaxDR(), cancel_t::emtf_emtf_neg, fwVersion); - //m_lutDict[tftype::bmtf+tftype::bmtf*10] = m_brlSingleMatchQualLUT; m_lutDict[tftype::omtf_neg+tftype::bmtf*10] = m_boNegMatchQualLUT; m_lutDict[tftype::omtf_pos+tftype::bmtf*10] = m_boPosMatchQualLUT; m_lutDict[tftype::omtf_pos+tftype::omtf_pos*10] = m_ovlPosSingleMatchQualLUT; @@ -156,8 +154,8 @@ MicroGMTCancelOutUnit::getCoordinateCancelBits(std::vectorgetDeltaPhiWidth()) - 1; int dEtaMask = (1 << matchLUT->getDeltaEtaWidth()) - 1; - // temporary fix to take processor offset into account... int dPhi = (*mu_w1)->hwGlobalPhi() - (*mu_w2)->hwGlobalPhi(); + dPhi = std::abs(dPhi); if (dPhi > 338) dPhi -= 576; // shifts dPhi to [-pi, pi) in integer scale dPhi = std::abs(dPhi); int dEta = std::abs((*mu_w1)->hwEta() - (*mu_w2)->hwEta());