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

Clean up some unnecessary {begin,end}{Run,LuminosityBlock} transition functions #43648

Merged
merged 9 commits into from
Jan 15, 2024
Merged

Clean up some unnecessary {begin,end}{Run,LuminosityBlock} transition functions #43648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe39de4
Clean up some unnecessary transition function comments in Alignment
makortel Oct 27, 2023
8530249
Clean up some unnecessary transition function calls/comments in Commo…
makortel Oct 27, 2023
2628b64
Clean up some unnecessary transition function calls/comments in DQM
makortel Oct 27, 2023
6e3fe81
Clean up some unnecessary transition function calls/comments in Egamm…
makortel Oct 27, 2023
02604f8
Clean up some unnecessary transition function calls/comments in L1Tri…
makortel Oct 27, 2023
8fdb612
Clean up some unnecessary transition function calls/comments in Event…
makortel Oct 27, 2023
448d459
Clean up some unnecessary transition function calls/comments in HLTri…
makortel Oct 27, 2023
7ed67fe
Clean up some unnecessary transition function calls/comments in Physi…
makortel Oct 27, 2023
4803e54
Clean up some unnecessary transition function calls/comments in TauAn…
makortel Oct 27, 2023
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
3 changes: 0 additions & 3 deletions Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ class MillePedeAlignmentAlgorithm : public AlignmentAlgorithmBase {
/// called at end of luminosity block
void endLuminosityBlock(const edm::EventSetup &) override;

/* virtual void beginLuminosityBlock(const edm::EventSetup &setup) {} */
/* virtual void endLuminosityBlock(const edm::EventSetup &setup) {} */

/// Called in order to pass parameters to alignables for a specific run
/// range in case the algorithm supports run range dependent alignment.
bool setParametersForRunRange(const RunRange &runrange) override;
Expand Down
60 changes: 0 additions & 60 deletions CommonTools/RecoAlgos/plugins/BooleanFlagFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,9 @@
class BooleanFlagFilter : public edm::global::EDFilter<> {
public:
explicit BooleanFlagFilter(const edm::ParameterSet&);
~BooleanFlagFilter() override;

private:
//virtual void beginJob() override;
bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
//virtual void endJob() override;

//virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
//virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
//virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

// ----------member data ---------------------------
edm::EDGetTokenT<bool> inputToken_;
Expand All @@ -69,11 +61,6 @@ BooleanFlagFilter::BooleanFlagFilter(const edm::ParameterSet& iConfig) {
reverse_ = iConfig.getParameter<bool>("reverseDecision");
}

BooleanFlagFilter::~BooleanFlagFilter() {
// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
}

//
// member functions
//
Expand All @@ -96,52 +83,5 @@ bool BooleanFlagFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Eve
return result;
}

// ------------ method called once each job just before starting event loop ------------
/*
void
BooleanFlagFilter::beginJob()
{
}
*/

// ------------ method called once each job just after ending the event loop ------------
/*
void
BooleanFlagFilter::endJob() {
}
*/

// ------------ method called when starting to processes a run ------------
/*
void
BooleanFlagFilter::beginRun(edm::Run const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when ending the processing of a run ------------
/*
void
BooleanFlagFilter::endRun(edm::Run const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when starting to processes a luminosity block ------------
/*
void
BooleanFlagFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when ending the processing of a luminosity block ------------
/*
void
BooleanFlagFilter::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{
}
*/

//define this as a plug-in
DEFINE_FWK_MODULE(BooleanFlagFilter);
10 changes: 0 additions & 10 deletions DQM/HLTEvF/plugins/HLTObjectMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,12 @@ class HLTObjectMonitor : public DQMEDAnalyzer {

public:
explicit HLTObjectMonitor(const edm::ParameterSet&);
~HLTObjectMonitor() override;

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

private:
void analyze(const edm::Event&, const edm::EventSetup&) override;
void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override;
void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
vector<hltPlot*> plotList;
//virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
double dxyFinder(double, double, edm::Handle<reco::RecoChargedCandidateCollection>, edm::Handle<reco::BeamSpot>);
double get_wall_time(void);
// ----------member data ---------------------------
Expand Down Expand Up @@ -346,11 +341,6 @@ HLTObjectMonitor::HLTObjectMonitor(const edm::ParameterSet& iConfig)
csvPfJetsToken_ = consumes<vector<reco::PFJet>>(edm::InputTag("hltPFJetForBtag", "", processName_));
}

HLTObjectMonitor::~HLTObjectMonitor() {
// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
}

//
// member functions
//
Expand Down
8 changes: 0 additions & 8 deletions DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer {

public:
explicit HLTObjectMonitorProtonLead(const edm::ParameterSet&);
~HLTObjectMonitorProtonLead() override;

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

Expand All @@ -92,8 +91,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer {
void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override;
void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
vector<hltPlot*> plotList;
//virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
double get_wall_time(void);
// ----------member data ---------------------------

Expand Down Expand Up @@ -327,11 +324,6 @@ HLTObjectMonitorProtonLead::HLTObjectMonitorProtonLead(const edm::ParameterSet&
aodTriggerToken_ = consumes<trigger::TriggerEvent>(iConfig.getParameter<edm::InputTag>("triggerEvent"));
}

HLTObjectMonitorProtonLead::~HLTObjectMonitorProtonLead() {
// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
}

//
// member functions
//
Expand Down
8 changes: 0 additions & 8 deletions DQM/L1TMonitorClient/src/L1TOccupancyClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,6 @@ void L1TOccupancyClient::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter
delete hservice_;
}

//____________________________________________________________________________
// Function: beginLuminosityBlock
// Description: This is will be run at the begining of each luminosity block
// Inputs:
// * const LuminosityBlock& lumiSeg = Luminosity Block information
// * const EventSetup& context = Event Setup information
//____________________________________________________________________________

//____________________________________________________________________________
// Function: endLuminosityBlock
// Description: This is will be run at the end of each luminosity block
Expand Down
6 changes: 0 additions & 6 deletions DQM/TrigXMonitorClient/interface/L1ScalersClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,9 @@ class L1ScalersClient
/// Constructors
L1ScalersClient(const edm::ParameterSet &ps);

/// Destructor
~L1ScalersClient() override{};

/// BeginJob
void beginJob(void) override;

// /// Endjob
// void endJob(void);

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

Expand Down
7 changes: 0 additions & 7 deletions DQMOffline/EGamma/plugins/PhotonOfflineClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,8 @@ class PhotonOfflineClient : public DQMEDHarvester {
explicit PhotonOfflineClient(const edm::ParameterSet& pset);
~PhotonOfflineClient() override;

// virtual void analyze(const edm::Event&, const edm::EventSetup& ) ;
// virtual void beginJob() ;
//virtual void endJob() ;
void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;

// virtual void endLuminosityBlock( const edm::LuminosityBlock& , const edm::EventSetup& ) ;
//virtual void endRun(const edm::Run& , const edm::EventSetup& ) ;
//virtual void runClient();

virtual void runClient(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter);
MonitorElement* bookHisto(
DQMStore::IBooker& iBooker, std::string histoName, std::string title, int bin, double min, double max);
Expand Down
8 changes: 0 additions & 8 deletions DQMOffline/Trigger/interface/EgHLTOfflineClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

class EgHLTOfflineClient : public DQMEDHarvester {
private:
// DQMStore* dbe_; //dbe seems to be the standard name for this, I dont know why. We of course dont own it
std::string dirName_;

std::vector<std::string> eleHLTFilterNames_; //names of the filters monitored using electrons to make plots for
Expand Down Expand Up @@ -71,15 +70,8 @@ class EgHLTOfflineClient : public DQMEDHarvester {
explicit EgHLTOfflineClient(const edm::ParameterSet&);
~EgHLTOfflineClient() override;

// virtual void beginJob();
// virtual void analyze(const edm::Event&, const edm::EventSetup&); //dummy
// virtual void endJob();
void beginRun(const edm::Run& run, const edm::EventSetup& c) override;
// virtual void endRun(const edm::Run& run, const edm::EventSetup& c);

// virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& context){}
// DQM Client Diagnostic
// virtual void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c);
void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override; //performed in the endJob
void dqmEndLuminosityBlock(DQMStore::IBooker&,
DQMStore::IGetter&,
Expand Down
2 changes: 0 additions & 2 deletions DQMOffline/Trigger/interface/FSQDiJetAve.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ class FSQDiJetAve : public DQMEDAnalyzer {

void bookHistograms(DQMStore::IBooker&, edm::Run const& run, edm::EventSetup const& c) override;
void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override;
//virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

// ----------member data ---------------------------
//
Expand Down
22 changes: 0 additions & 22 deletions DQMOffline/Trigger/plugins/FSQDiJetAve.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,28 +852,6 @@ void FSQDiJetAve::bookHistograms(DQMStore::IBooker& booker, edm::Run const& run,
}
}
//*/
// ------------ method called when ending the processing of a run ------------
/*
void
FSQDiJetAve::endRun(edm::Run const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when starting to processes a luminosity block ------------
/*
void
FSQDiJetAve::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when ending the processing of a luminosity block ------------
/*
void
FSQDiJetAve::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{}
// */

// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
void FSQDiJetAve::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
Expand Down
30 changes: 1 addition & 29 deletions EgammaAnalysis/ElectronTools/plugins/EGammaCutBasedEleIdAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,14 @@ class EGammaCutBasedEleIdAnalyzer : public edm::one::EDAnalyzer<> {
typedef std::vector<edm::Handle<edm::ValueMap<double> > > IsoDepositVals;

explicit EGammaCutBasedEleIdAnalyzer(const edm::ParameterSet &);
~EGammaCutBasedEleIdAnalyzer() override;

static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget;

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

/*
void beginRun(edm::Run const &, edm::EventSetup const &) override;
void endRun(edm::Run const &, edm::EventSetup const &) override;
void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
*/

// ----------member data ---------------------------

// input tags
Expand Down Expand Up @@ -126,11 +118,6 @@ EGammaCutBasedEleIdAnalyzer::EGammaCutBasedEleIdAnalyzer(const edm::ParameterSet
h1_pt_fbremeopin_ = fs->make<TH1F>("h1_pt_fbremeopin", "pt (fbremeopin)", 100, 0.0, 100.0);
}

EGammaCutBasedEleIdAnalyzer::~EGammaCutBasedEleIdAnalyzer() {
// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
}

//
// member functions
//
Expand Down Expand Up @@ -253,21 +240,6 @@ void EGammaCutBasedEleIdAnalyzer::beginJob() {
EAtarget = ElectronEffectiveArea::kEleEAData2012;
}

// ------------ method called once each job just after ending the event loop ------------
void EGammaCutBasedEleIdAnalyzer::endJob() {}
/*
// ------------ method called when starting to processes a run ------------
void EGammaCutBasedEleIdAnalyzer::beginRun(edm::Run const &, edm::EventSetup const &) {}

// ------------ method called when ending the processing of a run ------------
void EGammaCutBasedEleIdAnalyzer::endRun(edm::Run const &, edm::EventSetup const &) {}

// ------------ method called when starting to processes a luminosity block ------------
void EGammaCutBasedEleIdAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {}

// ------------ method called when ending the processing of a luminosity block ------------
void EGammaCutBasedEleIdAnalyzer::endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {}
*/
// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
void EGammaCutBasedEleIdAnalyzer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
//The following says we do not know what parameters are allowed so do no validation
Expand Down
51 changes: 0 additions & 51 deletions EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
class MiniAODElectronIDValidationAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit MiniAODElectronIDValidationAnalyzer(const edm::ParameterSet &);
~MiniAODElectronIDValidationAnalyzer() override;

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

Expand All @@ -72,14 +71,7 @@ class MiniAODElectronIDValidationAnalyzer : public edm::one::EDAnalyzer<edm::one
}; // The last does not include tau parents

private:
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;
//virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

int matchToTruth(const reco::GsfElectron &el, const edm::Handle<edm::View<reco::GenParticle>> &genParticles);
void findFirstNonElectronMother(const reco::Candidate *particle, int &ancestorPID, int &ancestorStatus);
Expand Down Expand Up @@ -159,11 +151,6 @@ MiniAODElectronIDValidationAnalyzer::MiniAODElectronIDValidationAnalyzer(const e
electronTree_->Branch("isPass", &isPass_, "isPass/I");
}

MiniAODElectronIDValidationAnalyzer::~MiniAODElectronIDValidationAnalyzer() {
// do anything here that needs to be done at desctruction time
// (e.g. close files, deallocate resources etc.)
}

//
// member functions
//
Expand Down Expand Up @@ -246,44 +233,6 @@ void MiniAODElectronIDValidationAnalyzer::analyze(const edm::Event &iEvent, cons
}
}

// ------------ method called once each job just before starting event loop ------------
void MiniAODElectronIDValidationAnalyzer::beginJob() {}

// ------------ method called once each job just after ending the event loop ------------
void MiniAODElectronIDValidationAnalyzer::endJob() {}

// ------------ method called when starting to processes a run ------------
/*
void
MiniAODElectronIDValidationAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when ending the processing of a run ------------
/*
void
MiniAODElectronIDValidationAnalyzer::endRun(edm::Run const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when starting to processes a luminosity block ------------
/*
void
MiniAODElectronIDValidationAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{
}
*/

// ------------ method called when ending the processing of a luminosity block ------------
/*
void
MiniAODElectronIDValidationAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
{
}
*/

// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
void MiniAODElectronIDValidationAnalyzer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
//The following says we do not know what parameters are allowed so do no validation
Expand Down
Loading