addressing clang errors.

cms-sw · Jan 9, 2025 · a5f36b2 · a5f36b2
1 parent 6b57fa1
commit a5f36b2
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 33 deletions.
diff --git a/DataFormats/L1TrackTrigger/interface/TTBV.h b/DataFormats/L1TrackTrigger/interface/TTBV.h
@@ -1,6 +1,8 @@
 #ifndef DataFormats_L1TrackTrigger_TTBV_h
 #define DataFormats_L1TrackTrigger_TTBV_h
 
+#include "FWCore/Utilities/interface/Exception.h"
+
 #include <bitset>
 #include <array>
 #include <string>

diff --git a/L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc b/L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc
@@ -767,7 +767,7 @@ void L1FPGATrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
     L1TkTracksForOutput->push_back(aTrack);
   }
 
-  const OrphanHandle<TTTracks> oh = iEvent.emplace(putTokenTTTracks_, move(*L1TkTracksForOutput));
+  const OrphanHandle<TTTracks> oh = iEvent.emplace(putTokenTTTracks_, std::move(*L1TkTracksForOutput));
 
   // produce clock and bit accurate stream output tracks and stubs.
   // from end of tracklet pattern recognition.
@@ -810,8 +810,8 @@ void L1FPGATrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
         streamsStub[offsetOut + layer++].push_back(fs);
     }
   }
-  iEvent.emplace(putTokenTracks_, move(streamsTrack));
-  iEvent.emplace(putTokenStubs_, move(streamsStub));
+  iEvent.emplace(putTokenTracks_, std::move(streamsTrack));
+  iEvent.emplace(putTokenStubs_, std::move(streamsStub));
 
 }  /// End of produce()
 

diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc
@@ -123,8 +123,8 @@ namespace trklet {
       dr.produce(streamsTrack, streamsStub);
     }
     // store products
-    iEvent.emplace(edPutTokenStubs_, move(streamsStub));
-    iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
+    iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
+    iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
   }
 
 }  // namespace trklet

diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc
@@ -158,7 +158,7 @@ namespace trklet {
     }
     if (use5ParameterFit_) {
       // store ttTracks
-      const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
+      const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
       // replace ttTrackRefs in track streams
       int iTrk(0);
       for (StreamTrack& stream : streamsTrack)
@@ -167,8 +167,8 @@ namespace trklet {
             frame.first = TTTrackRef(oh, iTrk++);
     }
     // store products
-    iEvent.emplace(edPutTokenStubs_, move(streamsStub));
-    iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
+    iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
+    iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
     iEvent.emplace(edPutTokenNumStatesAccepted_, numStatesAccepted);
     iEvent.emplace(edPutTokenNumStatesTruncated_, numStatesTruncated);
   }

diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerTFP.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerTFP.cc
@@ -109,15 +109,15 @@ namespace trklet {
     tfp.produce(*handleTracks, *handleTracksAdd, *handleStubs, ttTracks, streamsTrack);
     // put TTTRacks and produce TTTRackRefs
     const int nTrks = ttTracks.size();
-    const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
+    const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
     vector<TTTrackRef> ttTrackRefs;
     ttTrackRefs.reserve(nTrks);
     for (int iTrk = 0; iTrk < nTrks; iTrk++)
       ttTrackRefs.emplace_back(oh, iTrk);
     // replace old TTTrackRefs in streamsTrack with new TTTrackRefs
     tfp.produce(ttTrackRefs, streamsTrack);
     // put StreamsTrack
-    iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
+    iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
   }
 
 }  // namespace trklet

diff --git a/L1Trigger/TrackFindingTracklet/plugins/ProducerTM.cc b/L1Trigger/TrackFindingTracklet/plugins/ProducerTM.cc
@@ -118,8 +118,8 @@ namespace trklet {
       tm.produce(streamsTrack, streamsStub);
     }
     // store products
-    iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
-    iEvent.emplace(edPutTokenStubs_, move(streamsStub));
+    iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
+    iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
   }
 
 }  // namespace trklet

diff --git a/L1Trigger/TrackFindingTracklet/test/ProducerIRin.cc b/L1Trigger/TrackFindingTracklet/test/ProducerIRin.cc
@@ -91,7 +91,7 @@ namespace trklet {
       for (int tfpChannel : channelEncoding_)
         streamStubs.emplace_back(handleTTDTC->stream(tfpRegion, tfpChannel));
     // store products
-    iEvent.emplace(edPutTokenStubs_, move(streamStubs));
+    iEvent.emplace(edPutTokenStubs_, std::move(streamStubs));
   }
 
 }  // namespace trklet

diff --git a/L1Trigger/TrackTrigger/interface/SensorModule.h b/L1Trigger/TrackTrigger/interface/SensorModule.h
@@ -72,7 +72,7 @@ namespace tt {
     //
     double tiltCorrection(double cot) const { return std::abs(tiltCorrectionSlope_ * cot) + tiltCorrectionIntercept_; }
     //
-    double dPhi(double inv2R) const { return dPhi_ + (dR_ + scattering_) * abs(inv2R); }
+    double dPhi(double inv2R) const { return dPhi_ + (dR_ + scattering_) * std::abs(inv2R); }
     //
     double dZ() const { return dZ_; }
 

diff --git a/L1Trigger/TrackerDTC/plugins/ProducerDTC.cc b/L1Trigger/TrackerDTC/plugins/ProducerDTC.cc
@@ -116,8 +116,8 @@ namespace trackerDTC {
       dtc.produce(productAccepted, productLost);
     }
     // store ED products
-    iEvent.emplace(edPutTokenAccepted_, move(productAccepted));
-    iEvent.emplace(edPutTokenLost_, move(productLost));
+    iEvent.emplace(edPutTokenAccepted_, std::move(productAccepted));
+    iEvent.emplace(edPutTokenLost_, std::move(productLost));
   }
 
 }  // namespace trackerDTC

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerCTB.cc b/L1Trigger/TrackerTFP/plugins/ProducerCTB.cc
@@ -217,7 +217,7 @@ namespace trackerTFP {
         }
       }
     }
-    const OrphanHandle<TTTracks> handle = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
+    const OrphanHandle<TTTracks> handle = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
     // add TTTrackRefs
     int iTrk(0);
     int iChan(0);
@@ -236,9 +236,9 @@ namespace trackerTFP {
       }
     }
     // store tracks
-    iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
+    iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
     // store stubs
-    iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
+    iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerDR.cc b/L1Trigger/TrackerTFP/plugins/ProducerDR.cc
@@ -179,8 +179,8 @@ namespace trackerTFP {
       }
     }
     // store products
-    iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
-    iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
+    iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
+    iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerGP.cc b/L1Trigger/TrackerTFP/plugins/ProducerGP.cc
@@ -149,7 +149,7 @@ namespace trackerTFP {
       }
     }
     // store products
-    iEvent.emplace(edPutToken_, move(accepted));
+    iEvent.emplace(edPutToken_, std::move(accepted));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerHT.cc b/L1Trigger/TrackerTFP/plugins/ProducerHT.cc
@@ -143,7 +143,7 @@ namespace trackerTFP {
       }
     }
     // store products
-    iEvent.emplace(edPutToken_, move(accepted));
+    iEvent.emplace(edPutToken_, std::move(accepted));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerKF.cc b/L1Trigger/TrackerTFP/plugins/ProducerKF.cc
@@ -209,8 +209,8 @@ namespace trackerTFP {
       }
     }
     // store products
-    iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
-    iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
+    iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
+    iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
     iEvent.emplace(edPutTokenNumStatesAccepted_, numStatesAccepted);
     iEvent.emplace(edPutTokenNumStatesTruncated_, numStatesTruncated);
     iEvent.emplace(edPutTokenChi2s_, chi2s.begin(), chi2s.end());

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerPP.cc b/L1Trigger/TrackerTFP/plugins/ProducerPP.cc
@@ -73,7 +73,7 @@ namespace trackerTFP {
         stubs[offset + channel] = ttDTC.stream(region, channel);
     }
     // store products
-    iEvent.emplace(edPutToken_, move(stubs));
+    iEvent.emplace(edPutToken_, std::move(stubs));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerTFP.cc b/L1Trigger/TrackerTFP/plugins/ProducerTFP.cc
@@ -104,15 +104,15 @@ namespace trackerTFP {
     tfp.produce(*handleTracks, *handleStubs, ttTracks, streamsTrack);
     // put TTTRacks and produce TTTRackRefs
     const int nTrks = ttTracks.size();
-    const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
+    const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
     vector<TTTrackRef> ttTrackRefs;
     ttTrackRefs.reserve(nTrks);
     for (int iTrk = 0; iTrk < nTrks; iTrk++)
       ttTrackRefs.emplace_back(oh, iTrk);
     // replace old TTTrackRefs in streamsTrack with new TTTrackRefs
     tfp.produce(ttTrackRefs, streamsTrack);
     // put StreamsTrack
-    iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
+    iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
   }
 
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc b/L1Trigger/TrackerTFP/plugins/ProducerTQ.cc
@@ -145,8 +145,8 @@ namespace trackerTFP {
       }
     }
     // store TQ product
-    iEvent.emplace(edPutTokenTracks_, move(outputTracks));
-    iEvent.emplace(edPutTokenTracksAdd_, move(outputTracksAdd));
+    iEvent.emplace(edPutTokenTracks_, std::move(outputTracks));
+    iEvent.emplace(edPutTokenTracksAdd_, std::move(outputTracksAdd));
     iEvent.emplace(edPutTokenStubs_, streamsStubs);
   }
 }  // namespace trackerTFP

diff --git a/L1Trigger/TrackerTFP/src/HoughTransform.cc b/L1Trigger/TrackerTFP/src/HoughTransform.cc
@@ -176,7 +176,7 @@ namespace trackerTFP {
     }
     // read out found tracks ordered as found
     for (int phiT : phiTs) {
-      auto samePhiT = [phiT, toBinPhiT, this](StubHT* stub) { return toBinPhiT(stub) == phiT; };
+      auto samePhiT = [phiT, toBinPhiT](StubHT* stub) { return toBinPhiT(stub) == phiT; };
       // read out stubs in reverse order to emulate f/w (backtracking linked list)
       copy_if(input.rbegin(), input.rend(), back_inserter(output), samePhiT);
     }

diff --git a/SimTracker/TrackTriggerAssociation/plugins/StubAssociator.cc b/SimTracker/TrackTriggerAssociation/plugins/StubAssociator.cc
@@ -158,8 +158,8 @@ namespace tt {
       if (tpSelector_(*p.first))
         selection.insert(p.first, p.second);
     }
-    iEvent.emplace(putTokenReconstructable_, move(reconstructable));
-    iEvent.emplace(putTokenSelection_, move(selection));
+    iEvent.emplace(putTokenReconstructable_, std::move(reconstructable));
+    iEvent.emplace(putTokenSelection_, std::move(selection));
   }
 
 }  // namespace tt