From 0674b039cdcc4af0abf9c1b8c6e096631c2424cf Mon Sep 17 00:00:00 2001 From: Lucas Camolezi Date: Thu, 21 May 2020 15:17:27 +0200 Subject: [PATCH] Replaced boost::tuple for std::tuple --- .../Muon/interface/HLTMuonPlotter.h | 14 +++++------ HLTriggerOffline/Muon/src/HLTMuonPlotter.cc | 24 +++++++++---------- HLTriggerOffline/Muon/src/HLTMuonValidator.cc | 8 +++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h b/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h index 6600989d96220..04ff3ac534fdc 100644 --- a/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h +++ b/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h @@ -37,12 +37,12 @@ #include "DQMServices/Core/interface/DQMStore.h" -#include "boost/tuple/tuple.hpp" #include #include #include #include #include +#include #include #include "TPRegexp.h" @@ -58,9 +58,9 @@ class HLTMuonPlotter { std::string, const std::vector &, const std::vector &, - const boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> &); + const std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> &); ~HLTMuonPlotter() { delete genMuonSelector_; @@ -71,9 +71,9 @@ class HLTMuonPlotter { void beginRun(DQMStore::IBooker &, const edm::Run &, const edm::EventSetup &); void analyze(const edm::Event &, const edm::EventSetup &); - static boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> + static std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> getTokens(const edm::ParameterSet &, edm::ConsumesCollector &&); private: diff --git a/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc b/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc index 9512d4244cb7a..caffd91e9deaa 100644 --- a/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc +++ b/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc @@ -28,9 +28,9 @@ HLTMuonPlotter::HLTMuonPlotter(const ParameterSet &pset, string hltPath, const std::vector &moduleLabels, const std::vector &stepLabels, - const boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> &tokens) + const std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> &tokens) : l1Matcher_(pset) { @@ -52,9 +52,9 @@ HLTMuonPlotter::HLTMuonPlotter(const ParameterSet &pset, recMuonSelector_ = nullptr; // set tokens - hltTriggerSummaryRAW_ = tokens.get<0>(); - genParticleLabel_ = tokens.get<1>(); - recMuonLabel_ = tokens.get<2>(); + hltTriggerSummaryRAW_ = std::get<0>(tokens); + genParticleLabel_ = std::get<1>(tokens); + recMuonLabel_ = std::get<2>(tokens); } void HLTMuonPlotter::beginJob() {} @@ -258,9 +258,9 @@ void HLTMuonPlotter::analyze(const Event &iEvent, const EventSetup &iSetup) { } // End loop over sources } -boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> +std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> HLTMuonPlotter::getTokens(const edm::ParameterSet &pset, edm::ConsumesCollector &&iC) { edm::EDGetTokenT _hltTriggerSummaryRAW = iC.consumes(edm::InputTag("hltTriggerSummaryRAW")); @@ -269,9 +269,9 @@ HLTMuonPlotter::getTokens(const edm::ParameterSet &pset, edm::ConsumesCollector edm::EDGetTokenT _recMuonLabel = iC.consumes(pset.getParameter("recMuonLabel")); - boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> + std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> myTuple(_hltTriggerSummaryRAW, _genParticleLabel, _recMuonLabel); return (myTuple); diff --git a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc index 715d4419c08ed..93db7045f0659 100644 --- a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc +++ b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc @@ -12,6 +12,7 @@ // system include files #include #include +#include // user include files #include "HLTriggerOffline/Muon/interface/HLTMuonPlotter.h" @@ -28,7 +29,6 @@ #include "TDirectory.h" #include "TFile.h" #include "TPRegexp.h" -#include "boost/tuple/tuple.hpp" ////////////////////////////////////////////////////////////////////////////// //////// Define the interface //////////////////////////////////////////////// @@ -55,9 +55,9 @@ class HLTMuonValidator : public DQMEDAnalyzer { // Member Variables std::vector analyzers_; HLTConfigProvider hltConfig_; - boost::tuple, - edm::EDGetTokenT, - edm::EDGetTokenT> + std::tuple, + edm::EDGetTokenT, + edm::EDGetTokenT> myTokens_; };