Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-gex136E Try too remove compilation warnings in PhysicsTools/PatAlgos #38670

Merged
merged 1 commit into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions PhysicsTools/PatAlgos/test/private/PATUserDataTestModule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down Expand Up @@ -63,19 +63,19 @@ namespace edm {
// class decleration
//

class PATUserDataTestModule : public edm::EDProducer {
class PATUserDataTestModule : public edm::stream::EDProducer<> {
public:
explicit PATUserDataTestModule(const edm::ParameterSet&);
~PATUserDataTestModule();
~PATUserDataTestModule() override = default;

private:
virtual void produce(edm::Event&, const edm::EventSetup&) override;

// ----------member data ---------------------------
edm::EDGetTokenT<edm::View<pat::Muon>> muonsToken_;
std::string label_;
const edm::EDGetTokenT<edm::View<pat::Muon>> muonsToken_;
const std::string label_;
enum TestMode { TestRead, TestWrite, TestExternal };
TestMode mode_;
const TestMode mode_;
};

//
Expand All @@ -99,8 +99,6 @@ PATUserDataTestModule::PATUserDataTestModule(const edm::ParameterSet& iConfig)
}
}

PATUserDataTestModule::~PATUserDataTestModule() {}

// ------------ method called to for each event ------------
void PATUserDataTestModule::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/stream/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand All @@ -13,10 +13,10 @@
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/MuonReco/interface/Muon.h"

class TestEventHypothesisReader : public edm::EDAnalyzer {
class TestEventHypothesisReader : public edm::stream::EDAnalyzer<> {
public:
TestEventHypothesisReader(const edm::ParameterSet &iConfig);
virtual void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup);
void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
void runTests(const pat::EventHypothesis &h);

private:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand All @@ -13,10 +13,10 @@
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/JetReco/interface/CaloJet.h"

class TestEventHypothesisWriter : public edm::EDProducer {
class TestEventHypothesisWriter : public edm::stream::EDProducer<> {
public:
TestEventHypothesisWriter(const edm::ParameterSet &iConfig);
virtual void produce(edm::Event &iEvent, const edm::EventSetup &iSetup);
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;
void runTests(const pat::EventHypothesis &h);

private:
Expand Down