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-gex116 Remove compilation warnings in several packages of RecoBTag #36815

Merged
merged 3 commits into from
Feb 6, 2022
Merged

Run3-gex116 Remove compilation warnings in several packages of RecoBTag #36815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1862d9
Remove compilation warnings in several packages of RecoBTag
Jan 26, 2022
4fbab22
Make use of stream rather than one for the filter as suggested by Chris
Jan 31, 2022
d26844e
Code format
Jan 31, 2022
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 RecoBTag/ImpactParameter/test/IPAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
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"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down Expand Up @@ -49,7 +49,7 @@ using namespace reco;
// class decleration
//

class IPAnalyzer : public edm::EDAnalyzer {
class IPAnalyzer : public edm::one::EDAnalyzer<> {
public:
explicit IPAnalyzer(const edm::ParameterSet&);
~IPAnalyzer() {}
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/Skimming/interface/BTagSkimLeptonJet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
*/

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDFilter.h"
#include "FWCore/Framework/interface/one/EDFilter.h"
#include "FWCore/Framework/interface/Event.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"

class BTagSkimLeptonJet : public edm::EDFilter {
class BTagSkimLeptonJet : public edm::one::EDFilter<> {
public:
explicit BTagSkimLeptonJet(const edm::ParameterSet&);
~BTagSkimLeptonJet() override;
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/Skimming/interface/BTagSkimMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "FWCore/Framework/interface/EDFilter.h"
#include "FWCore/Framework/interface/one/EDFilter.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

class BTagSkimMC : public edm::EDFilter {
class BTagSkimMC : public edm::one::EDFilter<> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why one? From a quick glance this could be a stream or maybe a global, both of which are much more efficient than one.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @bsunanda , are you planning to update the PR with this suggestion? If so, I'll wait before signing. Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please wait. I shall update the PR with suggestion from Chris

public:
/// constructor
BTagSkimMC(const edm::ParameterSet&);
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/SoftLepton/test/testLeptonAssociator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <tuple>

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand All @@ -28,7 +28,7 @@ namespace std {
};
} // namespace std

class testLeptonAssociator : public edm::EDAnalyzer {
class testLeptonAssociator : public edm::one::EDAnalyzer<> {
public:
explicit testLeptonAssociator(const edm::ParameterSet& iConfig);
virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& setup) override;
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/SoftLepton/test/testMuonAssociator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <set>

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand All @@ -26,7 +26,7 @@ namespace std {
};
} // namespace std

class testMuonAssociator : public edm::EDAnalyzer {
class testMuonAssociator : public edm::one::EDAnalyzer<> {
public:
explicit testMuonAssociator(const edm::ParameterSet& iConfig);
virtual ~testMuonAssociator();
Expand Down
2 changes: 1 addition & 1 deletion RecoBTag/TrackProbability/test/CalibrationSkeleton.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using namespace std;

// 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"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/TrackProbability/test/TrackProbabilityAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using namespace std;

// 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/MakerMacros.h"
Expand Down Expand Up @@ -53,7 +53,7 @@ using namespace reco;
// class decleration
//

class TrackProbabilityAnalyzer : public edm::EDAnalyzer {
class TrackProbabilityAnalyzer : public edm::one::EDAnalyzer<> {
public:
explicit TrackProbabilityAnalyzer(const edm::ParameterSet&);
~TrackProbabilityAnalyzer() {}
Expand Down
2 changes: 1 addition & 1 deletion RecoBTag/TrackProbability/test/TrackProbabilityXMLtoDB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using namespace std;

// 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"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/XMLCalibration/test/XMLCalibrationTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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"
Expand All @@ -24,7 +24,7 @@ class TestCategory;
///This is an example of how to use the AlgorithmCalibration stuff
// to read the calibrated objects from a .xml file

class XMLCalibrationTest : public edm::EDAnalyzer {
class XMLCalibrationTest : public edm::one::EDAnalyzer<> {
public:
explicit XMLCalibrationTest(const edm::ParameterSet&);
~XMLCalibrationTest();
Expand Down