Skip to content

Migrating away from deprecated edm::EDAnalyzer API in CalibTracker/SiStripLorentzAngle #35381

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

Merged
cmsbuild merged 1 commit into from
Sep 23, 2021
Merged

Migrating away from deprecated edm::EDAnalyzer API in CalibTracker/SiStripLorentzAngle #35381

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CalibTracker/SiStripLorentzAngle/interface/SiStripLAProfileBooker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <map>

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
Expand All @@ -30,7 +30,7 @@

class TrackerTopology;

class SiStripLAProfileBooker : public edm::EDAnalyzer {
class SiStripLAProfileBooker : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
typedef dqm::legacy::MonitorElement MonitorElement;
typedef dqm::legacy::DQMStore DQMStore;
Expand All @@ -40,6 +40,8 @@ class SiStripLAProfileBooker : public edm::EDAnalyzer {

void beginRun(edm::Run const&, const edm::EventSetup& c) override;

void endRun(edm::Run const&, const edm::EventSetup& c) override;

void endJob() override;

void analyze(const edm::Event& e, const edm::EventSetup& c) override;
Expand Down
4 changes: 4 additions & 0 deletions CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ namespace sistrip {
vMethods(conf.getParameter<std::vector<int> >("Methods")),
tTopoToken_(esConsumes<edm::Transition::EndRun>()) {}

EnsembleCalibrationLA::~EnsembleCalibrationLA(){};

void EnsembleCalibrationLA::endJob() {
Book book("la_ensemble");
TChain* const chain = new TChain("la_ensemble");
Expand All @@ -41,6 +43,8 @@ namespace sistrip {
write_calibrations();
}

void EnsembleCalibrationLA::beginRun(const edm::Run&, const edm::EventSetup& eSetup) {}

void EnsembleCalibrationLA::endRun(const edm::Run&, const edm::EventSetup& eSetup) {
tTopo_ = &eSetup.getData(tTopoToken_);
}
Expand Down
7 changes: 5 additions & 2 deletions CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@
#define CalibTracker_SiStripLorentzAngle_EnsembleCalibrationLA_h

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "CalibTracker/SiStripLorentzAngle/interface/LA_Filler_Fitter.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"

namespace sistrip {
class EnsembleCalibrationLA : public edm::EDAnalyzer {
class EnsembleCalibrationLA : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
explicit EnsembleCalibrationLA(const edm::ParameterSet&);
void analyze(const edm::Event&, const edm::EventSetup&) override {}
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void endRun(const edm::Run&, const edm::EventSetup&) override;
void endJob() override;

~EnsembleCalibrationLA() override;

private:
void write_ensembles_text(const Book&);
void write_ensembles_plots(const Book&) const;
Expand Down
2 changes: 2 additions & 0 deletions CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ void SiStripLAProfileBooker::beginRun(const edm::Run&, const edm::EventSetup& c)
TrackCounter = 1;
}

void SiStripLAProfileBooker::endRun(const edm::Run&, const edm::EventSetup& c) {}

SiStripLAProfileBooker::~SiStripLAProfileBooker() {
detparmap::iterator detpariter;
for (detpariter = detmap.begin(); detpariter != detmap.end(); ++detpariter)
Expand Down