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

Run3-hcs326 Avoid using legacy EDAnalyzer in CalibCalorimetry/HcalAlgos #35911

Merged
merged 2 commits into from
Oct 30, 2021
+4 −14
Merged

Run3-hcs326 Avoid using legacy EDAnalyzer in CalibCalorimetry/HcalAlgos #35911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6f84ca
Avoid using legacy EDAnalyzer in CalibCalorimetry/HcalAlgos
Oct 29, 2021
1fe27f8
Remove clang errors
Oct 29, 2021
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
4 changes: 0 additions & 4 deletions CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
#define HcalLedAnalysis_H

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"

#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"

Expand Down
4 changes: 0 additions & 4 deletions CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
#define HcalPedestalAnalysis_H

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"

Expand Down
10 changes: 4 additions & 6 deletions CalibCalorimetry/HcalAlgos/test/MapTester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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 @@ -40,17 +40,17 @@
// class decleration
//

class MapTester : public edm::EDAnalyzer {
class MapTester : public edm::one::EDAnalyzer<> {
public:
explicit MapTester(const edm::ParameterSet&);
~MapTester();
~MapTester() override = default;

private:
unsigned int mapIOV_; //1 for first set, 2 for second, ...
bool generateTextfiles_;
bool generateEmap_;

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

// ----------member data ---------------------------
const edm::ESGetToken<HcalTopology, HcalRecNumberingRecord> tok_topo_;
Expand All @@ -62,8 +62,6 @@ MapTester::MapTester(const edm::ParameterSet& iConfig) : tok_topo_(esConsumes<Hc
generateEmap_ = iConfig.getParameter<bool>("generateEmap");
}

MapTester::~MapTester() {}

// ------------ method called to for each event ------------
void MapTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
char tempbuff[128];
Expand Down