Skip to content

Commit 16a6457

Browse files
authored
Merge pull request #45495 from smuzaffar/clang-Phase2L1GT-warning
[CLANG] Phase2L1GT: Fix compilation warnings
2 parents a823f61 + d1fede2 commit 16a6457

File tree

2 files changed

+28
-35
lines changed

2 files changed

+28
-35
lines changed

L1Trigger/Phase2L1GT/plugins/L1GTAlgoBlockProducer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class L1GTAlgoBlockProducer
337337
std::shared_ptr<std::unordered_map<std::string, unsigned int>> globalBeginRun(edm::Run const&,
338338
edm::EventSetup const&) const override;
339339

340-
void globalEndRun(edm::Run const&, edm::EventSetup const&) {}
340+
void globalEndRun(edm::Run const&, edm::EventSetup const&) override {}
341341

342342
edm::GetterOfProducts<P2GTCandidateVectorRef> getterOfPassedReferences_;
343343
std::map<std::string, AlgoDefinition> algoDefinitions_;

L1Trigger/Phase2L1GT/plugins/L1GTOutputObjectWriter.cc

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -269,42 +269,35 @@ static std::vector<ap_uint<64>> vpack(const Args&... vobjects) {
269269
void L1GTOutputObjectWriter::analyze(const edm::Event& event, const edm::EventSetup&) {
270270
std::map<std::string, std::vector<std::unique_ptr<L1TGT_BaseInterface>>> outputObjects;
271271

272-
outputObjects.emplace("GCTNonIsoEg", std::move(fillCollection<L1TGT_Common3Vector<64>>(event, gctNonIsoEgToken_)));
273-
outputObjects.emplace("GCTIsoEg", std::move(fillCollection<L1TGT_Common3Vector<64>>(event, gctIsoEgToken_)));
274-
outputObjects.emplace("GCTJets", std::move(fillCollection<L1TGT_Common3Vector<64>>(event, gctJetsToken_)));
275-
outputObjects.emplace("GCTTaus", std::move(fillCollection<L1TGT_GCT_tau6p6>(event, gctTausToken_)));
276-
outputObjects.emplace("GCTHtSum", std::move(fillCollection<L1TGT_CommonSum>(event, gctHtSumToken_)));
277-
outputObjects.emplace("GCTEtSum", std::move(fillCollection<L1TGT_CommonSum>(event, gctEtSumToken_)));
272+
outputObjects.emplace("GCTNonIsoEg", fillCollection<L1TGT_Common3Vector<64>>(event, gctNonIsoEgToken_));
273+
outputObjects.emplace("GCTIsoEg", fillCollection<L1TGT_Common3Vector<64>>(event, gctIsoEgToken_));
274+
outputObjects.emplace("GCTJets", fillCollection<L1TGT_Common3Vector<64>>(event, gctJetsToken_));
275+
outputObjects.emplace("GCTTaus", fillCollection<L1TGT_GCT_tau6p6>(event, gctTausToken_));
276+
outputObjects.emplace("GCTHtSum", fillCollection<L1TGT_CommonSum>(event, gctHtSumToken_));
277+
outputObjects.emplace("GCTEtSum", fillCollection<L1TGT_CommonSum>(event, gctEtSumToken_));
278278
outputObjects.emplace("GMTSaPromptMuons",
279-
std::move(fillCollection<L1TGT_GMT_PromptDisplacedMuon>(event, gmtSaPromptMuonsToken_)));
279+
fillCollection<L1TGT_GMT_PromptDisplacedMuon>(event, gmtSaPromptMuonsToken_));
280280
outputObjects.emplace("GMTSaDisplacedMuons",
281-
std::move(fillCollection<L1TGT_GMT_PromptDisplacedMuon>(event, gmtSaDisplacedMuonsToken_)));
282-
outputObjects.emplace("GMTTkMuons", std::move(fillCollection<L1TGT_GMT_TrackMatchedmuon>(event, gmtTkMuonsToken_)));
283-
outputObjects.emplace("GMTTopo", std::move(fillCollection<L1TGT_GMT_TopoObject>(event, gmtTopoToken_)));
284-
outputObjects.emplace("GTTPromptJets", std::move(fillCollection<L1TGT_GTT_PromptJet>(event, gttPromptJetsToken_)));
285-
outputObjects.emplace("GTTDisplacedJets",
286-
std::move(fillCollection<L1TGT_GTT_DisplacedJet>(event, gttDisplacedJetsToken_)));
287-
outputObjects.emplace("GTTPhiCandidates",
288-
std::move(fillCollection<L1TGT_GTT_LightMeson>(event, gttPhiCandidatesToken_)));
289-
outputObjects.emplace("GTTRhoCandidates",
290-
std::move(fillCollection<L1TGT_GTT_LightMeson>(event, gttRhoCandidatesToken_)));
291-
outputObjects.emplace("GTTBsCandidates",
292-
std::move(fillCollection<L1TGT_GTT_LightMeson>(event, gttBsCandidatesToken_)));
293-
outputObjects.emplace("GTTHadronicTaus",
294-
std::move(fillCollection<L1TGT_GTT_HadronicTau>(event, gttHadronicTausToken_)));
295-
outputObjects.emplace("GTTPrimaryVert",
296-
std::move(fillCollection<L1TGT_GTT_PrimaryVert>(event, gttPrimaryVertToken_)));
297-
outputObjects.emplace("GTTPromptHtSum", std::move(fillCollection<L1TGT_CommonSum>(event, gttPromptHtSumToken_)));
298-
outputObjects.emplace("GTTDisplacedHtSum",
299-
std::move(fillCollection<L1TGT_CommonSum>(event, gttDisplacedHtSumToken_)));
300-
outputObjects.emplace("GTTEtSum", std::move(fillCollection<L1TGT_CommonSum>(event, gttEtSumToken_)));
301-
outputObjects.emplace("CL2JetsSC4", std::move(fillCollection<L1TGT_CL2_Jet>(event, cl2JetsSc4Token_)));
302-
outputObjects.emplace("CL2JetsSC8", std::move(fillCollection<L1TGT_CL2_Jet>(event, cl2JetsSc8Token_)));
303-
outputObjects.emplace("CL2Taus", std::move(fillCollection<L1TGT_CL2_Tau>(event, cl2TausToken_)));
304-
outputObjects.emplace("CL2Electrons", std::move(fillCollection<L1TGT_CL2_Electron>(event, cl2ElectronsToken_)));
305-
outputObjects.emplace("CL2Photons", std::move(fillCollection<L1TGT_CL2_Photon>(event, cl2PhotonsToken_)));
306-
outputObjects.emplace("CL2HtSum", std::move(fillCollection<L1TGT_CommonSum>(event, cl2HtSumToken_)));
307-
outputObjects.emplace("CL2EtSum", std::move(fillCollection<L1TGT_CommonSum>(event, cl2EtSumToken_)));
281+
fillCollection<L1TGT_GMT_PromptDisplacedMuon>(event, gmtSaDisplacedMuonsToken_));
282+
outputObjects.emplace("GMTTkMuons", fillCollection<L1TGT_GMT_TrackMatchedmuon>(event, gmtTkMuonsToken_));
283+
outputObjects.emplace("GMTTopo", fillCollection<L1TGT_GMT_TopoObject>(event, gmtTopoToken_));
284+
outputObjects.emplace("GTTPromptJets", fillCollection<L1TGT_GTT_PromptJet>(event, gttPromptJetsToken_));
285+
outputObjects.emplace("GTTDisplacedJets", fillCollection<L1TGT_GTT_DisplacedJet>(event, gttDisplacedJetsToken_));
286+
outputObjects.emplace("GTTPhiCandidates", fillCollection<L1TGT_GTT_LightMeson>(event, gttPhiCandidatesToken_));
287+
outputObjects.emplace("GTTRhoCandidates", fillCollection<L1TGT_GTT_LightMeson>(event, gttRhoCandidatesToken_));
288+
outputObjects.emplace("GTTBsCandidates", fillCollection<L1TGT_GTT_LightMeson>(event, gttBsCandidatesToken_));
289+
outputObjects.emplace("GTTHadronicTaus", fillCollection<L1TGT_GTT_HadronicTau>(event, gttHadronicTausToken_));
290+
outputObjects.emplace("GTTPrimaryVert", fillCollection<L1TGT_GTT_PrimaryVert>(event, gttPrimaryVertToken_));
291+
outputObjects.emplace("GTTPromptHtSum", fillCollection<L1TGT_CommonSum>(event, gttPromptHtSumToken_));
292+
outputObjects.emplace("GTTDisplacedHtSum", fillCollection<L1TGT_CommonSum>(event, gttDisplacedHtSumToken_));
293+
outputObjects.emplace("GTTEtSum", fillCollection<L1TGT_CommonSum>(event, gttEtSumToken_));
294+
outputObjects.emplace("CL2JetsSC4", fillCollection<L1TGT_CL2_Jet>(event, cl2JetsSc4Token_));
295+
outputObjects.emplace("CL2JetsSC8", fillCollection<L1TGT_CL2_Jet>(event, cl2JetsSc8Token_));
296+
outputObjects.emplace("CL2Taus", fillCollection<L1TGT_CL2_Tau>(event, cl2TausToken_));
297+
outputObjects.emplace("CL2Electrons", fillCollection<L1TGT_CL2_Electron>(event, cl2ElectronsToken_));
298+
outputObjects.emplace("CL2Photons", fillCollection<L1TGT_CL2_Photon>(event, cl2PhotonsToken_));
299+
outputObjects.emplace("CL2HtSum", fillCollection<L1TGT_CommonSum>(event, cl2HtSumToken_));
300+
outputObjects.emplace("CL2EtSum", fillCollection<L1TGT_CommonSum>(event, cl2EtSumToken_));
308301

309302
std::map<demo::LinkId, std::vector<ap_uint<64>>> eventData;
310303

0 commit comments

Comments
 (0)