Skip to content

Commit 22ea28d

Browse files
Dan RileyDan Riley
authored andcommitted
fix c++20 compilation errors
1 parent 365705a commit 22ea28d

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,7 @@ void TrackletLUT::initProjectionDiskRadius(int nrbits) {
901901
void TrackletLUT::initBendMatch(unsigned int layerdisk) {
902902
unsigned int nrinv = NRINVBITS;
903903
double rinvhalf = 0.5 * ((1 << nrinv) - 1);
904+
assert(layerdisk < 16); // should be a named constant for this
904905

905906
bool barrel = layerdisk < N_LAYER;
906907

L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ namespace trklet {
200200
vector<vector<TTStubRef>> lost;
201201
formTracks(lostTracks, lostStubs, lost, offset + channel);
202202
nTracks += tracks.size();
203-
nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
204-
return sum + static_cast<int>(track.size());
203+
nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
204+
return sum + track.size();
205205
});
206206
nLost += lost.size();
207207
allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerDRin.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ namespace trklet {
201201
vector<vector<TTStubRef>> lost;
202202
formTracks(lostTracks, lostStubs, lost, offset + channel);
203203
nTracks += tracks.size();
204-
nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
205-
return sum + (int)track.size();
204+
nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
205+
return sum + track.size();
206206
});
207207
nLost += lost.size();
208208
allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerKFin.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ namespace trklet {
192192
vector<vector<TTStubRef>> lost;
193193
formTracks(lostTracks, lostStubs, lost, offset + channel);
194194
nTracks += tracks.size();
195-
nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
196-
return sum + (int)track.size();
195+
nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
196+
return sum + track.size();
197197
});
198198
nLost += lost.size();
199199
allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerKFout.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ namespace trklet {
166166
if (frame.first.isNonnull())
167167
tracks.insert(frame.first);
168168
nTracksRegion += tracks.size();
169-
nStubsRegion += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const TTTrackRef& ttTrackRef) {
170-
return sum + (int)ttTrackRef->getStubRefs().size();
169+
nStubsRegion += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const TTTrackRef& ttTrackRef) {
170+
return sum + ttTrackRef->getStubRefs().size();
171171
});
172172
set<TTTrackRef> tracksLost;
173173
for (const FrameTrack& frame : lost)

0 commit comments

Comments
 (0)