Skip to content

modernize CondTools/SiStrip #35415

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 26, 2021
Merged

modernize CondTools/SiStrip #35415

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
4 changes: 2 additions & 2 deletions CondTools/SiStrip/plugins/SiStripApvGainReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ SiStripApvGainReader::SiStripApvGainReader(const edm::ParameterSet& iConfig)
formatedOutput_(iConfig.getUntrackedParameter<std::string>("outputFile", "")),
gainType_(iConfig.getUntrackedParameter<uint32_t>("gainType", 1)),
gainToken_(esConsumes()) {
usesResource(TFileService::kSharedResource);

if (fs_.isAvailable()) {
tree_ = fs_->make<TTree>("Gains", "Gains");

Expand All @@ -25,8 +27,6 @@ SiStripApvGainReader::SiStripApvGainReader(const edm::ParameterSet& iConfig)
}
}

SiStripApvGainReader::~SiStripApvGainReader() {}

void SiStripApvGainReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& stripApvGain = iSetup.getData(gainToken_);
edm::LogInfo("SiStripApvGainReader") << "[SiStripApvGainReader::analyze] End Reading SiStripApvGain" << std::endl;
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripApvGainReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand All @@ -24,10 +24,10 @@

class SiStripGain;

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

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

Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripBadStripReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#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/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand All @@ -11,7 +11,7 @@
#include <cstdio>
#include <sys/time.h>

class SiStripBadStripReader : public edm::EDAnalyzer {
class SiStripBadStripReader : public edm::one::EDAnalyzer<> {
public:
explicit SiStripBadStripReader(const edm::ParameterSet& iConfig)
: printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), badStripToken_(esConsumes()) {}
Expand All @@ -25,7 +25,7 @@ class SiStripBadStripReader : public edm::EDAnalyzer {
edm::ESGetToken<SiStripBadStrip, SiStripBadStripRcd> badStripToken_;
};

SiStripBadStripReader::~SiStripBadStripReader() {}
SiStripBadStripReader::~SiStripBadStripReader() = default;

void SiStripBadStripReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& badStrip = iSetup.getData(badStripToken_);
Expand Down
7 changes: 2 additions & 5 deletions CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@

#include <sstream>

SiStripCablingTrackerMap::SiStripCablingTrackerMap(edm::ParameterSet const& conf)
: conf_(conf), detCablingToken_(esConsumes()) {}

SiStripCablingTrackerMap::~SiStripCablingTrackerMap() {}
SiStripCablingTrackerMap::SiStripCablingTrackerMap(edm::ParameterSet const& conf) : detCablingToken_(esConsumes()) {}

void SiStripCablingTrackerMap::beginRun(const edm::Run& run, const edm::EventSetup& es) {
tkMap_detCab = new TrackerMap("DetCabling");
tkMap_detCab = std::make_unique<TrackerMap>("DetCabling");
}

//------------------------------------------------------------------------------------------
Expand Down
12 changes: 5 additions & 7 deletions CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SiStripCablingTrackerMap_h

#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -13,22 +13,20 @@

#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"

class SiStripCablingTrackerMap : public edm::EDAnalyzer {
class SiStripCablingTrackerMap : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
SiStripCablingTrackerMap(const edm::ParameterSet& conf);
~SiStripCablingTrackerMap() override;
~SiStripCablingTrackerMap() override = default;

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

void endJob() override;

void endRun(const edm::Run& run, const edm::EventSetup& es) override{};
void analyze(const edm::Event& e, const edm::EventSetup& c) override;

private:
edm::ParameterSet conf_;
edm::ESGetToken<SiStripDetCabling, SiStripDetCablingRcd> detCablingToken_;

TrackerMap* tkMap_detCab; //0 for onTrack, 1 for offTrack, 2 for All
std::unique_ptr<TrackerMap> tkMap_detCab; //0 for onTrack, 1 for offTrack, 2 for All
};

#endif
4 changes: 2 additions & 2 deletions CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SiStripDetVOff_H

#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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -13,7 +13,7 @@

class TrackerGeometry;

class SiStripDetVOffFakeBuilder : public edm::EDAnalyzer {
class SiStripDetVOffFakeBuilder : public edm::one::EDAnalyzer<> {
public:
explicit SiStripDetVOffFakeBuilder(const edm::ParameterSet& iConfig);

Expand Down
2 changes: 0 additions & 2 deletions CondTools/SiStrip/plugins/SiStripDetVOffReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
SiStripDetVOffReader::SiStripDetVOffReader(const edm::ParameterSet& iConfig)
: printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", true)), detVOffToken_(esConsumes()) {}

SiStripDetVOffReader::~SiStripDetVOffReader() {}

void SiStripDetVOffReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& detVOff = iSetup.getData(detVOffToken_);
edm::LogInfo("SiStripDetVOffReader") << "[SiStripDetVOffReader::analyze] End Reading SiStripDetVOff" << std::endl;
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripDetVOffReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -24,10 +24,10 @@ class SiStripDetVOff;
//
// class decleration
//
class SiStripDetVOffReader : public edm::EDAnalyzer {
class SiStripDetVOffReader : public edm::one::EDAnalyzer<> {
public:
explicit SiStripDetVOffReader(const edm::ParameterSet&);
~SiStripDetVOffReader() override;
~SiStripDetVOffReader() override = default;

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

Expand Down
10 changes: 5 additions & 5 deletions CondTools/SiStrip/plugins/SiStripFedCablingBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
#include "CalibTracker/Records/interface/SiStripFecCablingRcd.h"
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
Expand All @@ -15,15 +15,15 @@ class SiStripFecCabling;
class SiStripDetCabling;
class SiStripRegionCabling;

class SiStripFedCablingBuilder : public edm::EDAnalyzer {
class SiStripFedCablingBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
SiStripFedCablingBuilder(const edm::ParameterSet& iConfig);

~SiStripFedCablingBuilder() override{};
~SiStripFedCablingBuilder() = default;

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

void analyze(const edm::Event&, const edm::EventSetup&) override { ; }
void analyze(const edm::Event&, const edm::EventSetup&) override {}
void endRun(const edm::Run&, const edm::EventSetup&) override{};

private:
bool printFecCabling_;
Expand Down
11 changes: 5 additions & 6 deletions CondTools/SiStrip/plugins/SiStripFedCablingReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef CondTools_SiStrip_FedCablingReader_H
#define CondTools_SiStrip_FedCablingReader_H

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
Expand All @@ -15,15 +15,14 @@ class SiStripFecCabling;
class SiStripDetCabling;
class SiStripRegionCabling;

class SiStripFedCablingReader : public edm::EDAnalyzer {
class SiStripFedCablingReader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
SiStripFedCablingReader(const edm::ParameterSet&);

~SiStripFedCablingReader() override { ; }
~SiStripFedCablingReader() = default;

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

void analyze(const edm::Event&, const edm::EventSetup&) override { ; }
void endRun(const edm::Run&, const edm::EventSetup&) override{};
void analyze(const edm::Event&, const edm::EventSetup&) override{};

private:
bool printFecCabling_;
Expand Down
1 change: 0 additions & 1 deletion CondTools/SiStrip/plugins/SiStripLorentzAngleReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SiStripLorentzAngleReader::SiStripLorentzAngleReader(const edm::ParameterSet& iC
: printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 5)),
label_(iConfig.getUntrackedParameter<std::string>("label", "")),
laToken_(esConsumes(edm::ESInputTag{"", label_})) {}
SiStripLorentzAngleReader::~SiStripLorentzAngleReader() {}

void SiStripLorentzAngleReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& lorentzAngles = iSetup.getData(laToken_);
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripLorentzAngleReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -21,10 +21,10 @@ class SiStripLorentzAngle;
//
// class decleration
//
class SiStripLorentzAngleReader : public edm::EDAnalyzer {
class SiStripLorentzAngleReader : public edm::one::EDAnalyzer<> {
public:
explicit SiStripLorentzAngleReader(const edm::ParameterSet&);
~SiStripLorentzAngleReader() override;
~SiStripLorentzAngleReader() override = default;

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

Expand Down
4 changes: 2 additions & 2 deletions CondTools/SiStrip/plugins/SiStripNoisesReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -22,7 +22,7 @@
#include <cstdio>
#include <sys/time.h>

class SiStripNoisesReader : public edm::EDAnalyzer {
class SiStripNoisesReader : public edm::one::EDAnalyzer<> {
public:
explicit SiStripNoisesReader(const edm::ParameterSet&);
~SiStripNoisesReader() override;
Expand Down
2 changes: 0 additions & 2 deletions CondTools/SiStrip/plugins/SiStripPedestalsReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ using namespace cms;
SiStripPedestalsReader::SiStripPedestalsReader(const edm::ParameterSet& iConfig)
: printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), pedestalsToken_(esConsumes()) {}

SiStripPedestalsReader::~SiStripPedestalsReader() {}

void SiStripPedestalsReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& pedestals = iSetup.getData(pedestalsToken_);
edm::LogInfo("SiStripPedestalsReader") << "[SiStripPedestalsReader::analyze] End Reading SiStripPedestals"
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripPedestalsReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -22,10 +22,10 @@
#include <cstdio>
#include <sys/time.h>

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

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

Expand Down
2 changes: 0 additions & 2 deletions CondTools/SiStrip/plugins/SiStripSummaryReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
SiStripSummaryReader::SiStripSummaryReader(const edm::ParameterSet& iConfig)
: printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), summaryToken_(esConsumes()) {}

SiStripSummaryReader::~SiStripSummaryReader() {}

void SiStripSummaryReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& summary = iSetup.getData(summaryToken_);
edm::LogInfo("SiStripSummaryReader") << "[SiStripSummaryReader::analyze] End Reading SiStripSummary" << std::endl;
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripSummaryReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -17,10 +17,10 @@
#include "CondFormats/DataRecord/interface/SiStripSummaryRcd.h"
class SiStripSummary;

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

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

Expand Down
2 changes: 0 additions & 2 deletions CondTools/SiStrip/plugins/SiStripThresholdReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ using namespace cms;
SiStripThresholdReader::SiStripThresholdReader(const edm::ParameterSet& iConfig)
: printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 3)), thresholdToken_(esConsumes()) {}

SiStripThresholdReader::~SiStripThresholdReader() {}

void SiStripThresholdReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
const auto& thresholds = iSetup.getData(thresholdToken_);
edm::LogInfo("SiStripThresholdReader") << "[SiStripThresholdReader::analyze] End Reading SiStripThreshold"
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiStrip/plugins/SiStripThresholdReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand All @@ -22,10 +22,10 @@
#include <cstdio>
#include <sys/time.h>

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

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

Expand Down