Skip to content

Commit e2dc5ef

Browse files
tschuhtschuh
committed
addressing clang errors.
1 parent 0c4cf41 commit e2dc5ef

File tree

19 files changed

+35
-33
lines changed

19 files changed

+35
-33
lines changed

‎DataFormats/L1TrackTrigger/interface/TTBV.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef DataFormats_L1TrackTrigger_TTBV_h
22
#define DataFormats_L1TrackTrigger_TTBV_h
33

4+
#include "FWCore/Utilities/interface/Exception.h"
5+
46
#include <bitset>
57
#include <array>
68
#include <string>

‎L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ void L1FPGATrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
767767
L1TkTracksForOutput->push_back(aTrack);
768768
}
769769

770-
const OrphanHandle<TTTracks> oh = iEvent.emplace(putTokenTTTracks_, move(*L1TkTracksForOutput));
770+
const OrphanHandle<TTTracks> oh = iEvent.emplace(putTokenTTTracks_, std::move(*L1TkTracksForOutput));
771771

772772
// produce clock and bit accurate stream output tracks and stubs.
773773
// from end of tracklet pattern recognition.
@@ -810,8 +810,8 @@ void L1FPGATrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
810810
streamsStub[offsetOut + layer++].push_back(fs);
811811
}
812812
}
813-
iEvent.emplace(putTokenTracks_, move(streamsTrack));
814-
iEvent.emplace(putTokenStubs_, move(streamsStub));
813+
iEvent.emplace(putTokenTracks_, std::move(streamsTrack));
814+
iEvent.emplace(putTokenStubs_, std::move(streamsStub));
815815

816816
} /// End of produce()
817817

‎L1Trigger/TrackFindingTracklet/plugins/ProducerDR.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ namespace trklet {
123123
dr.produce(streamsTrack, streamsStub);
124124
}
125125
// store products
126-
iEvent.emplace(edPutTokenStubs_, move(streamsStub));
127-
iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
126+
iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
127+
iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
128128
}
129129

130130
} // namespace trklet

‎L1Trigger/TrackFindingTracklet/plugins/ProducerKF.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ namespace trklet {
158158
}
159159
if (use5ParameterFit_) {
160160
// store ttTracks
161-
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
161+
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
162162
// replace ttTrackRefs in track streams
163163
int iTrk(0);
164164
for (StreamTrack& stream : streamsTrack)
@@ -167,8 +167,8 @@ namespace trklet {
167167
frame.first = TTTrackRef(oh, iTrk++);
168168
}
169169
// store products
170-
iEvent.emplace(edPutTokenStubs_, move(streamsStub));
171-
iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
170+
iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
171+
iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
172172
iEvent.emplace(edPutTokenNumStatesAccepted_, numStatesAccepted);
173173
iEvent.emplace(edPutTokenNumStatesTruncated_, numStatesTruncated);
174174
}

‎L1Trigger/TrackFindingTracklet/plugins/ProducerTFP.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ namespace trklet {
109109
tfp.produce(*handleTracks, *handleTracksAdd, *handleStubs, ttTracks, streamsTrack);
110110
// put TTTRacks and produce TTTRackRefs
111111
const int nTrks = ttTracks.size();
112-
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
112+
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
113113
vector<TTTrackRef> ttTrackRefs;
114114
ttTrackRefs.reserve(nTrks);
115115
for (int iTrk = 0; iTrk < nTrks; iTrk++)
116116
ttTrackRefs.emplace_back(oh, iTrk);
117117
// replace old TTTrackRefs in streamsTrack with new TTTrackRefs
118118
tfp.produce(ttTrackRefs, streamsTrack);
119119
// put StreamsTrack
120-
iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
120+
iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
121121
}
122122

123123
} // namespace trklet

‎L1Trigger/TrackFindingTracklet/plugins/ProducerTM.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ namespace trklet {
118118
tm.produce(streamsTrack, streamsStub);
119119
}
120120
// store products
121-
iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
122-
iEvent.emplace(edPutTokenStubs_, move(streamsStub));
121+
iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
122+
iEvent.emplace(edPutTokenStubs_, std::move(streamsStub));
123123
}
124124

125125
} // namespace trklet

‎L1Trigger/TrackFindingTracklet/test/ProducerIRin.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace trklet {
9191
for (int tfpChannel : channelEncoding_)
9292
streamStubs.emplace_back(handleTTDTC->stream(tfpRegion, tfpChannel));
9393
// store products
94-
iEvent.emplace(edPutTokenStubs_, move(streamStubs));
94+
iEvent.emplace(edPutTokenStubs_, std::move(streamStubs));
9595
}
9696

9797
} // namespace trklet

‎L1Trigger/TrackTrigger/interface/SensorModule.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace tt {
7272
//
7373
double tiltCorrection(double cot) const { return std::abs(tiltCorrectionSlope_ * cot) + tiltCorrectionIntercept_; }
7474
//
75-
double dPhi(double inv2R) const { return dPhi_ + (dR_ + scattering_) * abs(inv2R); }
75+
double dPhi(double inv2R) const { return dPhi_ + (dR_ + scattering_) * std::abs(inv2R); }
7676
//
7777
double dZ() const { return dZ_; }
7878

‎L1Trigger/TrackerDTC/plugins/ProducerDTC.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ namespace trackerDTC {
116116
dtc.produce(productAccepted, productLost);
117117
}
118118
// store ED products
119-
iEvent.emplace(edPutTokenAccepted_, move(productAccepted));
120-
iEvent.emplace(edPutTokenLost_, move(productLost));
119+
iEvent.emplace(edPutTokenAccepted_, std::move(productAccepted));
120+
iEvent.emplace(edPutTokenLost_, std::move(productLost));
121121
}
122122

123123
} // namespace trackerDTC

‎L1Trigger/TrackerTFP/plugins/ProducerCTB.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ namespace trackerTFP {
217217
}
218218
}
219219
}
220-
const OrphanHandle<TTTracks> handle = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
220+
const OrphanHandle<TTTracks> handle = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
221221
// add TTTrackRefs
222222
int iTrk(0);
223223
int iChan(0);
@@ -236,9 +236,9 @@ namespace trackerTFP {
236236
}
237237
}
238238
// store tracks
239-
iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
239+
iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
240240
// store stubs
241-
iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
241+
iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
242242
}
243243

244244
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerDR.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ namespace trackerTFP {
179179
}
180180
}
181181
// store products
182-
iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
183-
iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
182+
iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
183+
iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
184184
}
185185

186186
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerGP.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ namespace trackerTFP {
149149
}
150150
}
151151
// store products
152-
iEvent.emplace(edPutToken_, move(accepted));
152+
iEvent.emplace(edPutToken_, std::move(accepted));
153153
}
154154

155155
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerHT.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace trackerTFP {
143143
}
144144
}
145145
// store products
146-
iEvent.emplace(edPutToken_, move(accepted));
146+
iEvent.emplace(edPutToken_, std::move(accepted));
147147
}
148148

149149
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerKF.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ namespace trackerTFP {
209209
}
210210
}
211211
// store products
212-
iEvent.emplace(edPutTokenStubs_, move(acceptedStubs));
213-
iEvent.emplace(edPutTokenTracks_, move(acceptedTracks));
212+
iEvent.emplace(edPutTokenStubs_, std::move(acceptedStubs));
213+
iEvent.emplace(edPutTokenTracks_, std::move(acceptedTracks));
214214
iEvent.emplace(edPutTokenNumStatesAccepted_, numStatesAccepted);
215215
iEvent.emplace(edPutTokenNumStatesTruncated_, numStatesTruncated);
216216
iEvent.emplace(edPutTokenChi2s_, chi2s.begin(), chi2s.end());

‎L1Trigger/TrackerTFP/plugins/ProducerPP.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace trackerTFP {
7373
stubs[offset + channel] = ttDTC.stream(region, channel);
7474
}
7575
// store products
76-
iEvent.emplace(edPutToken_, move(stubs));
76+
iEvent.emplace(edPutToken_, std::move(stubs));
7777
}
7878

7979
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerTFP.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ namespace trackerTFP {
104104
tfp.produce(*handleTracks, *handleStubs, ttTracks, streamsTrack);
105105
// put TTTRacks and produce TTTRackRefs
106106
const int nTrks = ttTracks.size();
107-
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, move(ttTracks));
107+
const OrphanHandle<TTTracks> oh = iEvent.emplace(edPutTokenTTTracks_, std::move(ttTracks));
108108
vector<TTTrackRef> ttTrackRefs;
109109
ttTrackRefs.reserve(nTrks);
110110
for (int iTrk = 0; iTrk < nTrks; iTrk++)
111111
ttTrackRefs.emplace_back(oh, iTrk);
112112
// replace old TTTrackRefs in streamsTrack with new TTTrackRefs
113113
tfp.produce(ttTrackRefs, streamsTrack);
114114
// put StreamsTrack
115-
iEvent.emplace(edPutTokenTracks_, move(streamsTrack));
115+
iEvent.emplace(edPutTokenTracks_, std::move(streamsTrack));
116116
}
117117

118118
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/plugins/ProducerTQ.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ namespace trackerTFP {
145145
}
146146
}
147147
// store TQ product
148-
iEvent.emplace(edPutTokenTracks_, move(outputTracks));
149-
iEvent.emplace(edPutTokenTracksAdd_, move(outputTracksAdd));
148+
iEvent.emplace(edPutTokenTracks_, std::move(outputTracks));
149+
iEvent.emplace(edPutTokenTracksAdd_, std::move(outputTracksAdd));
150150
iEvent.emplace(edPutTokenStubs_, streamsStubs);
151151
}
152152
} // namespace trackerTFP

‎L1Trigger/TrackerTFP/src/HoughTransform.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ namespace trackerTFP {
176176
}
177177
// read out found tracks ordered as found
178178
for (int phiT : phiTs) {
179-
auto samePhiT = [phiT, toBinPhiT, this](StubHT* stub) { return toBinPhiT(stub) == phiT; };
179+
auto samePhiT = [phiT, toBinPhiT](StubHT* stub) { return toBinPhiT(stub) == phiT; };
180180
// read out stubs in reverse order to emulate f/w (backtracking linked list)
181181
copy_if(input.rbegin(), input.rend(), back_inserter(output), samePhiT);
182182
}

‎SimTracker/TrackTriggerAssociation/plugins/StubAssociator.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ namespace tt {
158158
if (tpSelector_(*p.first))
159159
selection.insert(p.first, p.second);
160160
}
161-
iEvent.emplace(putTokenReconstructable_, move(reconstructable));
162-
iEvent.emplace(putTokenSelection_, move(selection));
161+
iEvent.emplace(putTokenReconstructable_, std::move(reconstructable));
162+
iEvent.emplace(putTokenSelection_, std::move(selection));
163163
}
164164

165165
} // namespace tt

0 commit comments

Comments
 (0)