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.

Sign up for GitHub

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

Jump to bottom

Fix CMS deprecation warnings in EgammaAnalysis/ElectronTools #39501

Merged
merged 1 commit into from Sep 27, 2022
Merged

Fix CMS deprecation warnings in EgammaAnalysis/ElectronTools #39501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions EgammaAnalysis/ElectronTools/test/CorrectECALIsolation.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand All @@ -20,13 +20,13 @@

#include <iostream>

class CorrectECALIsolation : public edm::EDAnalyzer {
class CorrectECALIsolation : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit CorrectECALIsolation(const edm::ParameterSet&);
~CorrectECALIsolation();
~CorrectECALIsolation() override;

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

edm::ParameterSet conf_;

Expand All @@ -40,6 +40,8 @@ class CorrectECALIsolation : public edm::EDAnalyzer {
};

CorrectECALIsolation::CorrectECALIsolation(const edm::ParameterSet& iConfig) : conf_(iConfig) {
usesResource(TFileService::kSharedResource);

isData_ = iConfig.getUntrackedParameter<bool>("isData", false);
tokenGsfElectrons_ = consumes<reco::GsfElectronCollection>(iConfig.getParameter<edm::InputTag>("Electrons"));

Expand Down
14 changes: 8 additions & 6 deletions EgammaAnalysis/ElectronTools/test/ElectronIsoAnalyzer.cc
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand All @@ -42,16 +42,16 @@
// class decleration
//

class ElectronIsoAnalyzer : public edm::EDAnalyzer {
class ElectronIsoAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit ElectronIsoAnalyzer(const edm::ParameterSet&);
~ElectronIsoAnalyzer();
~ElectronIsoAnalyzer() override;
//

private:
virtual void beginJob() override;
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
virtual void endJob() override;
void beginJob() override;
void analyze(const edm::Event&, const edm::EventSetup&) override;
void endJob() override;

edm::ParameterSet conf_;

Expand Down Expand Up @@ -101,6 +101,8 @@ ElectronIsoAnalyzer::ElectronIsoAnalyzer(const edm::ParameterSet& iConfig)
: conf_(iConfig)

{
usesResource(TFileService::kSharedResource);

verbose_ = iConfig.getUntrackedParameter<bool>("verbose", false);
tokenGsfElectrons_ = consumes<reco::GsfElectronCollection>(iConfig.getParameter<edm::InputTag>("Electrons"));
tokensIsoValElectrons_ =
Expand Down
25 changes: 13 additions & 12 deletions EgammaAnalysis/ElectronTools/test/ElectronTestAnalyzer.cc
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down Expand Up @@ -62,15 +62,15 @@
// class decleration
//

class ElectronTestAnalyzer : public edm::EDAnalyzer {
class ElectronTestAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit ElectronTestAnalyzer(const edm::ParameterSet&);
~ElectronTestAnalyzer();
~ElectronTestAnalyzer() override;

private:
virtual void beginJob() override;
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
virtual void endJob() override;
void beginJob() override;
void analyze(const edm::Event&, const edm::EventSetup&) override;
void endJob() override;
virtual void myBindVariables();
virtual void myVar(const reco::GsfElectron& ele,
const reco::Vertex& vertex,
Expand All @@ -92,6 +92,8 @@ class ElectronTestAnalyzer : public edm::EDAnalyzer {
edm::EDGetTokenT<reco::MuonCollection> muonToken_;
edm::EDGetTokenT<EcalRecHitCollection> reducedEBRecHitCollectionToken_;
edm::EDGetTokenT<EcalRecHitCollection> reducedEERecHitCollectionToken_;
edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> builderToken_;

const EcalClusterLazyTools::ESGetTokens ecalClusterESGetTokens_;

EGammaMvaEleEstimator* myMVATrigV0;
Expand Down Expand Up @@ -181,7 +183,10 @@ ElectronTestAnalyzer::ElectronTestAnalyzer(const edm::ParameterSet& iConfig)
muonToken_(consumes<reco::MuonCollection>(edm::InputTag("muons"))),
reducedEBRecHitCollectionToken_(consumes<EcalRecHitCollection>(edm::InputTag("reducedEcalRecHitsEB"))),
reducedEERecHitCollectionToken_(consumes<EcalRecHitCollection>(edm::InputTag("reducedEcalRecHitsEE"))),
builderToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))),
ecalClusterESGetTokens_{consumesCollector()} {
usesResource(TFileService::kSharedResource);

Bool_t manualCat = true;

ev = 0;
Expand Down Expand Up @@ -299,9 +304,7 @@ void ElectronTestAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSet
EcalClusterLazyTools lazyTools(
iEvent, ecalClusterESGetTokens_.get(iSetup), reducedEBRecHitCollectionToken_, reducedEERecHitCollectionToken_);

edm::ESHandle<TransientTrackBuilder> builder;
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", builder);
TransientTrackBuilder thebuilder = *(builder.product());
TransientTrackBuilder thebuilder = iSetup.getData(builderToken_);

bool debug = true;
bool debugMVAclass = false;
Expand Down Expand Up @@ -693,9 +696,7 @@ void ElectronTestAnalyzer::evaluate_mvas(const edm::Event& iEvent, const edm::Ev
EcalClusterLazyTools lazyTools(
iEvent, ecalClusterESGetTokens_.get(iSetup), reducedEBRecHitCollectionToken_, reducedEERecHitCollectionToken_);

edm::ESHandle<TransientTrackBuilder> builder;
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", builder);
TransientTrackBuilder thebuilder = *(builder.product());
TransientTrackBuilder thebuilder = iSetup.getData(builderToken_);

for (reco::GsfElectronCollection::const_iterator iE = inElectrons.begin(); iE != inElectrons.end(); ++iE) {
reco::GsfElectron ele = *iE;
Expand Down
13 changes: 7 additions & 6 deletions EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@

// user include files
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down Expand Up @@ -57,10 +57,10 @@
// class declaration
//

class MiniAODElectronIDValidationAnalyzer : public edm::EDAnalyzer {
class MiniAODElectronIDValidationAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit MiniAODElectronIDValidationAnalyzer(const edm::ParameterSet &);
~MiniAODElectronIDValidationAnalyzer();
~MiniAODElectronIDValidationAnalyzer() override;

static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand All @@ -72,9 +72,9 @@ class MiniAODElectronIDValidationAnalyzer : public edm::EDAnalyzer {
}; // The last does not include tau parents

private:
virtual void beginJob() override;
virtual void analyze(const edm::Event &, const edm::EventSetup &) override;
virtual void endJob() override;
void beginJob() override;
void analyze(const edm::Event &, const edm::EventSetup &) override;
void endJob() override;

//virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
//virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
Expand Down Expand Up @@ -136,6 +136,7 @@ MiniAODElectronIDValidationAnalyzer::MiniAODElectronIDValidationAnalyzer(const e
electronIdTag_(iConfig.getParameter<edm::InputTag>("electronIDs")),
electronIdToken_(consumes<edm::ValueMap<bool>>(iConfig.getParameter<edm::InputTag>("electronIDs"))) {
//now do what ever initialization is needed
usesResource(TFileService::kSharedResource);
edm::Service<TFileService> fs;
electronTree_ = fs->make<TTree>("ElectronTree", "Electron data");

Expand Down