dan131riley 1

tschuh · tschuh · commit 9ddad445f192 · 2025-04-16T15:15:26.000+01:00
diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc
@@ -158,7 +158,7 @@ namespace trklet {
     const Setup* setup = &iSetup.getData(esGetTokenSetup_);
     // helper class to extract structured data from tt::Frames
     const DataFormats* dataFormats = &iSetup.getData(esGetTokenDataFormats_);
-    auto valid = [](int sum, const FrameTrack& f) { return sum += (f.first.isNull() ? 0 : 1); };
+    auto valid = [](int sum, const FrameTrack& f) { return sum + (f.first.isNull() ? 0 : 1); };
     // empty KF products
     StreamsStub streamsStub(setup->numRegions() * setup->numLayers());
     StreamsTrack streamsTrack(setup->numRegions());
diff --git a/L1Trigger/TrackFindingTracklet/src/ChannelAssignment.cc b/L1Trigger/TrackFindingTracklet/src/ChannelAssignment.cc
@@ -108,7 +108,7 @@ namespace trklet {
     numSeedingLayers_ = max_element(seedTypesSeedLayers_.begin(), seedTypesSeedLayers_.end(), bigger)->size();
     maxNumProjectionLayers_ =
         max_element(seedTypesProjectionLayers_.begin(), seedTypesProjectionLayers_.end(), bigger)->size();
-    auto acc = [](int sum, vector<int> ints) { return sum += (int)ints.size(); };
+    auto acc = [](int sum, vector<int> ints) { return sum + static_cast<int>(ints.size()); };
     offsetsStubs_.reserve(numSeedTypes_);
     numChannelsStub_ = accumulate(
         seedTypesProjectionLayers_.begin(), seedTypesProjectionLayers_.end(), numSeedingLayers_ * numSeedTypes_, acc);
diff --git a/L1Trigger/TrackFindingTracklet/src/DuplicateRemoval.cc b/L1Trigger/TrackFindingTracklet/src/DuplicateRemoval.cc
@@ -32,8 +32,8 @@ namespace trklet {
 
   // read in and organize input tracks and stubs
   void DuplicateRemoval::consume(const StreamsTrack& streamsTrack, const StreamsStub& streamsStub) {
-    auto nonNullTrack = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
-    auto nonNullStub = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto nonNullTrack = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
+    auto nonNullStub = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     // count tracks and stubs and reserve corresponding vectors
     int sizeStubs(0);
     const int offset = region_ * tmNumLayers_;
diff --git a/L1Trigger/TrackFindingTracklet/src/KalmanFilter.cc b/L1Trigger/TrackFindingTracklet/src/KalmanFilter.cc
@@ -43,13 +43,13 @@ namespace trklet {
     const int offset = region_ * setup_->numLayers();
     const StreamTrack& streamTrack = streamsTrack[region_];
     const int numTracks = accumulate(streamTrack.begin(), streamTrack.end(), 0, [](int sum, const FrameTrack& f) {
-      return sum += (f.first.isNull() ? 0 : 1);
+      return sum + (f.first.isNull() ? 0 : 1);
     });
     int numStubs(0);
     for (int layer = 0; layer < setup_->numLayers(); layer++) {
       const StreamStub& streamStub = streamsStub[offset + layer];
       numStubs += accumulate(streamStub.begin(), streamStub.end(), 0, [](int sum, const FrameStub& f) {
-        return sum += (f.first.isNull() ? 0 : 1);
+        return sum + (f.first.isNull() ? 0 : 1);
       });
     }
     tracks_.reserve(numTracks);
@@ -230,7 +230,7 @@ namespace trklet {
     }
     // count total number of final states
     const int nStates =
-        accumulate(stream_.begin(), stream_.end(), 0, [](int sum, State* state) { return sum += (state ? 1 : 0); });
+        accumulate(stream_.begin(), stream_.end(), 0, [](int sum, State* state) { return sum + (state ? 1 : 0); });
     // apply truncation
     if (setup_->enableTruncation() && (int)stream_.size() > setup_->numFramesHigh())
       stream_.resize(setup_->numFramesHigh());
diff --git a/L1Trigger/TrackFindingTracklet/src/TrackFindingProcessor.cc b/L1Trigger/TrackFindingTracklet/src/TrackFindingProcessor.cc
@@ -128,7 +128,7 @@ namespace trklet {
                                       vector<deque<Track*>>& outputs) {
     // count input objects
     int nTracks(0);
-    auto valid = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto valid = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     for (const StreamTrack& tracks : inputs)
       nTracks += accumulate(tracks.begin(), tracks.end(), 0, valid);
     tracks_.reserve(nTracks);
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc
@@ -181,7 +181,7 @@ namespace trklet {
       formTracks(streamsTrack, streamsStub, tracks, region);
       nTracks += tracks.size();
       nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
-        return sum += (int)track.size();
+        return sum + static_cast<int>(track.size());
       });
       allTracks += tracks.size();
       if (!useMCTruth_)
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerTM.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerTM.cc
@@ -180,7 +180,7 @@ namespace trklet {
       formTracks(streamsTrack, streamsStub, tracks, region);
       nTracks += tracks.size();
       nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
-        return sum += (int)track.size();
+        return sum + static_cast<int>(track.size());
       });
       allTracks += tracks.size();
       if (!useMCTruth_)
diff --git a/L1Trigger/TrackFindingTracklet/test/AnalyzerTracklet.cc b/L1Trigger/TrackFindingTracklet/test/AnalyzerTracklet.cc
@@ -193,7 +193,7 @@ namespace trklet {
       for (int seedType = 0; seedType < channelAssignment_->numSeedTypes(); seedType++) {
         const int nTracks =
             accumulate(ttTrackRefs.begin(), ttTrackRefs.end(), 0, [seedType](int sum, const TTTrackRef& ttTrackRef) {
-              return sum += ((int)ttTrackRef->trackSeedType() == seedType ? 1 : 0);
+              return sum + (static_cast<int>(ttTrackRef->trackSeedType()) == seedType ? 1 : 0);
             });
         hisChannel_->Fill(nTracks);
         profChannel_->Fill(seedType, nTracks);
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerCTB.cc b/L1Trigger/TrackerTFP/plugins/ProducerCTB.cc
@@ -115,7 +115,7 @@ namespace trackerTFP {
     const StreamsStub& streamsStub = iEvent.get(edGetToken_);
     // count stubs
     int nStubsHT(0);
-    auto validFrame = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrame = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     for (const StreamStub& stream : streamsStub)
       nStubsHT += accumulate(stream.begin(), stream.end(), 0, validFrame);
     // create input objects and count tracks
@@ -175,7 +175,7 @@ namespace trackerTFP {
     }
     // store TTTracks
     int nTracks(0);
-    auto valid = [](int sum, TrackCTB* track) { return sum += (track ? 1 : 0); };
+    auto valid = [](int sum, TrackCTB* track) { return sum + (track ? 1 : 0); };
     for (const vector<deque<TrackCTB*>>& region : streamsTracks)
       for (const deque<TrackCTB*>& channel : region)
         nTracks += accumulate(channel.begin(), channel.end(), 0, valid);
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerDR.cc b/L1Trigger/TrackerTFP/plugins/ProducerDR.cc
@@ -92,8 +92,8 @@ namespace trackerTFP {
     const StreamsStub& allStubs = iEvent.get(edGetTokenStubs_);
     const StreamsTrack& allTracks = iEvent.get(edGetTokenTracks_);
     // helper
-    auto validFrameT = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
-    auto validFrameS = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrameT = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrameS = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     auto putT = [](const vector<TrackDR*>& objects, StreamTrack& stream) {
       auto toFrame = [](TrackDR* object) { return object ? object->frame() : FrameTrack(); };
       stream.reserve(objects.size());
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerGP.cc b/L1Trigger/TrackerTFP/plugins/ProducerGP.cc
@@ -94,11 +94,11 @@ namespace trackerTFP {
     // read in DTC Product and produce TFP product
     const StreamsStub& streamsStub = iEvent.get(edGetToken_);
     // helper
-    auto validFrame = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrame = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     auto nSectors = [](int sum, const StubPP& object) {
       const int nPhiT = object.phiTMax() - object.phiTMin() + 1;
       const int nZT = object.zTMax() - object.zTMin() + 1;
-      return sum += nPhiT * nZT;
+      return sum + nPhiT * nZT;
     };
     auto toFrame = [](StubGP* object) { return object ? object->frame() : FrameStub(); };
     // produce GP product per region
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerHT.cc b/L1Trigger/TrackerTFP/plugins/ProducerHT.cc
@@ -93,7 +93,7 @@ namespace trackerTFP {
     iEvent.getByToken<StreamsStub>(edGetToken_, handle);
     const StreamsStub& streamsStub = *handle.product();
     // helper
-    auto validFrame = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrame = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     auto toFrame = [](StubHT* object) { return object ? object->frame() : FrameStub(); };
     // produce HT output per region
     for (int region = 0; region < numRegions_; region++) {
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerKF.cc b/L1Trigger/TrackerTFP/plugins/ProducerKF.cc
@@ -170,8 +170,8 @@ namespace trackerTFP {
     const StreamsStub& allStubs = iEvent.get(edGetTokenStubs_);
     const StreamsTrack& allTracks = iEvent.get(edGetTokenTracks_);
     // helper
-    auto validFrameT = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
-    auto validFrameS = [](int sum, const FrameStub& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrameT = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
+    auto validFrameS = [](int sum, const FrameStub& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     auto putT = [](const vector<TrackKF*>& objects, StreamTrack& stream) {
       auto toFrame = [](TrackKF* object) { return object ? object->frame() : FrameTrack(); };
       stream.reserve(objects.size());
diff --git a/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc b/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc
@@ -85,7 +85,7 @@ namespace trackerTFP {
   void ProducerTQ::produce(Event& iEvent, const EventSetup& iSetup) {
     // helper class to determine Track Quality
     const TrackQuality* trackQuality = &iSetup.getData(esGetTokenTrackQuality_);
-    auto valid = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNull() ? 0 : 1); };
+    auto valid = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNull() ? 0 : 1); };
     // empty TQ product
     StreamsTrack outputTracks(numRegions_);
     Streams outputTracksAdd(numRegions_);
diff --git a/L1Trigger/TrackerTFP/src/CleanTrackBuilder.cc b/L1Trigger/TrackerTFP/src/CleanTrackBuilder.cc
@@ -255,7 +255,7 @@ namespace trackerTFP {
     for (Stub* stub : stubs_)
       stub->update(hitsPhi_, hitsZ_, stubIds, setup->ctbMaxStubs());
     const int nLayer =
-        accumulate(stubIds.begin(), stubIds.end(), 0, [](int sum, int i) { return sum += (i > 0 ? 1 : 0); });
+        accumulate(stubIds.begin(), stubIds.end(), 0, [](int sum, int i) { return sum + (i > 0 ? 1 : 0); });
     if (nLayer < setup->ctbMinLayers())
       valid_ = false;
     size_ = *max_element(stubIds.begin(), stubIds.end());
@@ -370,7 +370,7 @@ namespace trackerTFP {
     }
     // add all gaps
     const int size =
-        accumulate(tracks.begin(), tracks.end(), 0, [](int sum, Track* track) { return sum += track->size_; });
+        accumulate(tracks.begin(), tracks.end(), 0, [](int sum, Track* track) { return sum + track->size_; });
     for (int frame = 0; frame < size;) {
       const int trackId = tracks[frame]->trackId_;
       const int length = tracks[frame]->size_;
diff --git a/L1Trigger/TrackerTFP/src/DuplicateRemoval.cc b/L1Trigger/TrackerTFP/src/DuplicateRemoval.cc
@@ -35,7 +35,7 @@ namespace trackerTFP {
     int nTracks(0);
     for (const vector<TrackKF*>& tracks : tracksIn)
       nTracks +=
-          accumulate(tracks.begin(), tracks.end(), 0, [](int sum, TrackKF* track) { return sum += track ? 1 : 0; });
+          accumulate(tracks.begin(), tracks.end(), 0, [](int sum, TrackKF* track) { return sum + (track ? 1 : 0); });
     vector<Track> tracks;
     tracks.reserve(nTracks);
     deque<Track*> stream;
diff --git a/L1Trigger/TrackerTFP/src/HoughTransform.cc b/L1Trigger/TrackerTFP/src/HoughTransform.cc
@@ -35,7 +35,7 @@ namespace trackerTFP {
   // fill output products
   void HoughTransform::produce(const vector<vector<StubGP*>>& streamsIn, vector<deque<StubHT*>>& streamsOut) {
     // count and reserve ht stubs
-    auto multiplicity = [](int sum, StubGP* s) { return sum += s ? 1 + s->inv2RMax() - s->inv2RMin() : 0; };
+    auto multiplicity = [](int sum, StubGP* s) { return sum + (s ? 1 + s->inv2RMax() - s->inv2RMin() : 0); };
     int nStubs(0);
     for (const vector<StubGP*>& input : streamsIn)
       nStubs += accumulate(input.begin(), input.end(), 0, multiplicity);
diff --git a/L1Trigger/TrackerTFP/src/KalmanFilter.cc b/L1Trigger/TrackerTFP/src/KalmanFilter.cc
@@ -51,7 +51,7 @@ namespace trackerTFP {
         addLayer(stream);
       // count total number of final states
       const int nStates =
-          accumulate(stream.begin(), stream.end(), 0, [](int sum, State* state) { return sum += (state ? 1 : 0); });
+          accumulate(stream.begin(), stream.end(), 0, [](int sum, State* state) { return sum + (state ? 1 : 0); });
       // apply truncation
       if (setup_->enableTruncation() && (int)stream.size() > setup_->numFramesHigh())
         stream.resize(setup_->numFramesHigh());
diff --git a/L1Trigger/TrackerTFP/src/TrackFindingProcessor.cc b/L1Trigger/TrackerTFP/src/TrackFindingProcessor.cc
@@ -125,7 +125,7 @@ namespace trackerTFP {
                                       vector<deque<Track*>>& outputs) {
     // count input objects
     int nTracks(0);
-    auto valid = [](int sum, const FrameTrack& frame) { return sum += (frame.first.isNonnull() ? 1 : 0); };
+    auto valid = [](int sum, const FrameTrack& frame) { return sum + (frame.first.isNonnull() ? 1 : 0); };
     for (const StreamTrack& tracks : inputs)
       nTracks += accumulate(tracks.begin(), tracks.end(), 0, valid);
     tracks_.reserve(nTracks);
diff --git a/L1Trigger/TrackerTFP/test/AnalyzerCTB.cc b/L1Trigger/TrackerTFP/test/AnalyzerCTB.cc
@@ -217,7 +217,7 @@ namespace trackerTFP {
         for (int layer = 0; layer < setup_->numLayers(); layer++) {
           const StreamStub& stream = acceptedStubs[offsetStub + layer];
           const int nStubs = accumulate(stream.begin(), stream.end(), 0, [](int sum, const FrameStub& frame) {
-            return sum += (frame.first.isNonnull() ? 1 : 0);
+            return sum + (frame.first.isNonnull() ? 1 : 0);
           });
           hisStubs_->Fill(nStubs);
           profStubs_->Fill(channel * setup_->numLayers() + layer, nStubs);
diff --git a/L1Trigger/TrackerTFP/test/AnalyzerDR.cc b/L1Trigger/TrackerTFP/test/AnalyzerDR.cc
@@ -179,7 +179,7 @@ namespace trackerTFP {
         profTracks_->Fill(channel, tracks.size());
         nTracks += tracks.size();
         nStubs += accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
-          return sum += (int)track.size();
+          return sum + static_cast<int>(track.size());
         });
         allTracks += tracks.size();
         if (!useMCTruth_)
@@ -247,7 +247,7 @@ namespace trackerTFP {
     const int offset = channel * setup_->numLayers();
     const StreamTrack& streamTrack = streamsTrack[channel];
     const int numTracks = accumulate(streamTrack.begin(), streamTrack.end(), 0, [](int sum, const FrameTrack& frame) {
-      return sum += (frame.first.isNonnull() ? 1 : 0);
+      return sum + (frame.first.isNonnull() ? 1 : 0);
     });
     tracks.reserve(numTracks);
     for (int frame = 0; frame < (int)streamTrack.size(); frame++) {
diff --git a/L1Trigger/TrackerTFP/test/AnalyzerTQ.cc b/L1Trigger/TrackerTFP/test/AnalyzerTQ.cc
@@ -175,7 +175,7 @@ namespace trackerTFP {
       profTracks_->Fill(region, tracks.size());
       const int nTracks = tracks.size();
       const int nStubs = accumulate(tracks.begin(), tracks.end(), 0, [](int sum, const vector<TTStubRef>& track) {
-        return sum += (int)track.size();
+        return sum + static_cast<int>(track.size());
       });
       allTracks += tracks.size();
       if (!useMCTruth_)
@@ -242,7 +242,7 @@ namespace trackerTFP {
     const int offset = region * setup_->numLayers();
     const StreamTrack& streamTrack = streamsTrack[region];
     const int numTracks = accumulate(streamTrack.begin(), streamTrack.end(), 0, [](int sum, const FrameTrack& frame) {
-      return sum += (frame.first.isNonnull() ? 1 : 0);
+      return sum + (frame.first.isNonnull() ? 1 : 0);
     });
     tracks.reserve(numTracks);
     for (int frame = 0; frame < (int)streamTrack.size(); frame++) {
