@@ -58,7 +58,7 @@ CSCGEMMatcher::CSCGEMMatcher(
5858
5959unsigned CSCGEMMatcher::calculateGEMCSCBending (const CSCCLCTDigi& clct, const GEMInternalCluster& cluster) const {
6060 // difference in 1/8-strip number
61- const unsigned diff = std::abs (clct.getKeyStrip (8 ) - cluster.getKeyStrip (8 ));
61+ const unsigned diff = std::abs (int ( clct.getKeyStrip (8 )) - int ( cluster.getKeyStrip (8 ) ));
6262
6363 unsigned slope = 0 ;
6464
@@ -117,7 +117,8 @@ void CSCGEMMatcher::matchingClustersBX(const CSCALCTDigi& alct,
117117
118118 // select clusters matched in time
119119 for (const auto & cl : clusters) {
120- if (std::abs (alct.getBX () - cl.bx ()) <= maxDeltaBXALCTGEM_)
120+ const unsigned diff = std::abs (int (alct.getBX ()) - cl.bx ());
121+ if (diff <= maxDeltaBXALCTGEM_)
121122 output.push_back (cl);
122123 }
123124}
@@ -131,7 +132,8 @@ void CSCGEMMatcher::matchingClustersBX(const CSCCLCTDigi& clct,
131132
132133 // select clusters matched in time
133134 for (const auto & cl : clusters) {
134- if (std::abs (clct.getBX () - cl.bx ()) <= maxDeltaBXCLCTGEM_)
135+ const unsigned diff = std::abs (int (clct.getBX ()) - cl.bx ());
136+ if (diff <= maxDeltaBXCLCTGEM_)
135137 output.push_back (cl);
136138 }
137139}
@@ -189,7 +191,7 @@ void CSCGEMMatcher::matchingClustersLoc(const CSCCLCTDigi& clct,
189191
190192// match by 1/2-strip
191193bool CSCGEMMatcher::matchedClusterLocHS (const CSCCLCTDigi& clct, const GEMInternalCluster& cluster) const {
192- const unsigned halfStripDiff = std::abs (clct.getKeyStrip (2 ) - cluster.getKeyStrip (2 ));
194+ const unsigned halfStripDiff = std::abs (int ( clct.getKeyStrip (2 )) - int ( cluster.getKeyStrip (2 ) ));
193195 const bool isME1a (station_ == 1 and clct.getKeyStrip () > CSCConstants::MAX_HALF_STRIP_ME1B);
194196
195197 // 98% acceptance cuts
@@ -259,7 +261,7 @@ bool CSCGEMMatcher::matchedClusterLocES(const CSCCLCTDigi& clct, const GEMIntern
259261 // determine matching window by chamber, assuming facing chambers only are processed
260262 int window = chamber_ % 2 == 0 ? 20 : 40 ;
261263
262- return abs (clct.getKeyStrip (8 ) - key_es + SlopeShift) < window;
264+ return std:: abs (clct.getKeyStrip (8 ) - key_es + SlopeShift) < window;
263265}
264266
265267void CSCGEMMatcher::matchingClustersLoc (const CSCALCTDigi& alct,
0 commit comments