Skip to content

Commit

Permalink
Apply code-checks and code-format
Browse files Browse the repository at this point in the history
  • Loading branch information
david walter committed Aug 24, 2022
1 parent efbd262 commit f457c02
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 44 deletions.
7 changes: 3 additions & 4 deletions DQMOffline/Lumi/plugins/ZCounting.cc
View file
Expand Up @@ -49,8 +49,7 @@ ZCounting::ZCounting(const edm::ParameterSet& iConfig)

IDTypestr_(iConfig.getUntrackedParameter<std::string>("IDType")),
IsoTypestr_(iConfig.getUntrackedParameter<std::string>("IsoType")),
IsoCut_(iConfig.getUntrackedParameter<double>("IsoCut"))
{
IsoCut_(iConfig.getUntrackedParameter<double>("IsoCut")) {
edm::LogInfo("ZCounting") << "Constructor ZCounting::ZCounting " << std::endl;

// Trigger settings
Expand All @@ -61,7 +60,7 @@ ZCounting::ZCounting(const edm::ParameterSet& iConfig)

edm::LogVerbatim("ZCounting") << "ZCounting::ZCounting set trigger names";
const std::vector<std::string> patterns_ = iConfig.getParameter<std::vector<std::string>>("MuonTriggerNames");
for (const std::string pattern_ : patterns_) {
for (const std::string& pattern_ : patterns_) {
triggers->addTriggerRecord(pattern_);
}

Expand Down Expand Up @@ -274,7 +273,7 @@ void ZCounting::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
return;
}

const reco::Vertex* pv = 0;
const reco::Vertex* pv = nullptr;
int nvtx = 0;

for (auto const& itVtx : *hVertexProduct) {
Expand Down
7 changes: 3 additions & 4 deletions DQMOffline/Lumi/plugins/ZCounting.h
View file
Expand Up @@ -38,7 +38,7 @@ class ZCounting : public DQMEDAnalyzer {

private:
//other functions
bool passMuonID(const reco::Muon& muon, const reco::Vertex *vtx);
bool passMuonID(const reco::Muon& muon, const reco::Vertex* vtx);
bool passMuonIso(const reco::Muon& muon);
bool isCustomTightMuon(const reco::Muon& muon);

Expand Down Expand Up @@ -80,14 +80,14 @@ class ZCounting : public DQMEDAnalyzer {
const std::string IDTypestr_;
const std::string IsoTypestr_;
const double IsoCut_;

// muon ID and ISO parameters
MuonIDTypes IDType_{NoneID};
MuonIsoTypes IsoType_{NoneIso};

// trigger objects
HLTConfigProvider hltConfigProvider_;
TriggerTools *triggers;
TriggerTools* triggers;

// constants
const double DRMAX = 0.1; // max dR matching between muon and hlt object
Expand All @@ -114,7 +114,6 @@ class ZCounting : public DQMEDAnalyzer {
MonitorElement* h_mass_Glo_fail_BB;
MonitorElement* h_mass_Glo_fail_BE;
MonitorElement* h_mass_Glo_fail_EE;

};

#endif
122 changes: 91 additions & 31 deletions DQMOffline/Lumi/plugins/ZCountingElectrons.cc
View file
Expand Up @@ -17,11 +17,14 @@
//
ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig)
: triggerResultsInputTag_(iConfig.getParameter<edm::InputTag>("TriggerResults")),
fPVName_token(consumes<reco::VertexCollection>(iConfig.getUntrackedParameter<std::string>("edmPVName", "offlinePrimaryVertices"))),
fPVName_token(consumes<reco::VertexCollection>(
iConfig.getUntrackedParameter<std::string>("edmPVName", "offlinePrimaryVertices"))),

// Electron-specific Parameters
fGsfElectronName_token(consumes<edm::View<reco::GsfElectron>>(iConfig.getUntrackedParameter<std::string>("edmGsfEleName", "gedGsfElectrons"))),
fSCName_token(consumes<edm::View<reco::SuperCluster>>(iConfig.getUntrackedParameter<std::string>("edmSCName", "particleFlowEGamma"))),
fGsfElectronName_token(consumes<edm::View<reco::GsfElectron>>(
iConfig.getUntrackedParameter<std::string>("edmGsfEleName", "gedGsfElectrons"))),
fSCName_token(consumes<edm::View<reco::SuperCluster>>(
iConfig.getUntrackedParameter<std::string>("edmSCName", "particleFlowEGamma"))),

// Electron-specific Tags
fRhoToken(consumes<double>(iConfig.getParameter<edm::InputTag>("rhoname"))),
Expand All @@ -40,7 +43,7 @@ ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig)

LumiBin_(iConfig.getUntrackedParameter<double>("LumiBin")),
LumiMin_(iConfig.getUntrackedParameter<double>("LumiMin")),
LumiMax_(iConfig.getUntrackedParameter<double>("LumiMax")),
LumiMax_(iConfig.getUntrackedParameter<double>("LumiMax")),

PVBin_(iConfig.getUntrackedParameter<int>("PVBin")),
PVMin_(iConfig.getUntrackedParameter<double>("PVMin")),
Expand All @@ -62,20 +65,20 @@ ZCountingElectrons::ZCountingElectrons(const edm::ParameterSet& iConfig)
triggers->setDRMAX(DRMAX);

edm::LogVerbatim("ZCounting") << "ZCounting::ZCounting set trigger names";
const std::vector<std::string> patterns_ =
iConfig.getParameter<std::vector<std::string>>("ElectronTriggerNames");
for (const std::string pattern_ : patterns_) {
const std::vector<std::string> patterns_ = iConfig.getParameter<std::vector<std::string>>("ElectronTriggerNames");
for (const std::string& pattern_ : patterns_) {
triggers->addTriggerRecord(pattern_);
}


EleID_.setID(ELE_ID_WP);
}

//
// -------------------------------------- Destructor --------------------------------------------
//
ZCountingElectrons::~ZCountingElectrons() { edm::LogInfo("ZCountingElectrons") << "Destructor ZCountingElectrons::~ZCountingElectrons " << std::endl; }
ZCountingElectrons::~ZCountingElectrons() {
edm::LogInfo("ZCountingElectrons") << "Destructor ZCountingElectrons::~ZCountingElectrons " << std::endl;
}

//
// -------------------------------------- beginRun --------------------------------------------
Expand All @@ -89,15 +92,15 @@ void ZCountingElectrons::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const

bool hltChanged_ = true;
if (hltConfigProvider_.init(iRun, iSetup, triggerResultsInputTag_.process(), hltChanged_)) {
edm::LogVerbatim("ZCountingElectrons") << "ZCountingElectrons::dqmBeginRun [TriggerObjMatchValueMapsProducer::beginRun] "
"HLTConfigProvider initialized [processName() = \""
<< hltConfigProvider_.processName() << "\", tableName() = \""
<< hltConfigProvider_.tableName() << "\", size() = " << hltConfigProvider_.size()
<< "]";
edm::LogVerbatim("ZCountingElectrons")
<< "ZCountingElectrons::dqmBeginRun [TriggerObjMatchValueMapsProducer::beginRun] "
"HLTConfigProvider initialized [processName() = \""
<< hltConfigProvider_.processName() << "\", tableName() = \"" << hltConfigProvider_.tableName()
<< "\", size() = " << hltConfigProvider_.size() << "]";
} else {
edm::LogError("ZCountingElectrons") << "ZCountingElectrons::dqmBeginRun Initialization of HLTConfigProvider failed for Run="
<< iRun.id() << " (process=\"" << triggerResultsInputTag_.process()
<< "\") -> plugin will not produce outputs for this Run";
edm::LogError("ZCountingElectrons")
<< "ZCountingElectrons::dqmBeginRun Initialization of HLTConfigProvider failed for Run=" << iRun.id()
<< " (process=\"" << triggerResultsInputTag_.process() << "\") -> plugin will not produce outputs for this Run";
return;
}

Expand All @@ -118,26 +121,83 @@ void ZCountingElectrons::bookHistograms(DQMStore::IBooker& ibooker_, edm::Run co
h_npv->setAxisTitle("number of primary vertices", 2);

// Electron histograms
h_ee_mass_id_pass_central = ibooker_.book2D("h_ee_mass_id_pass_central", "h_ee_mass_id_pass_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_id_fail_central = ibooker_.book2D("h_ee_mass_id_fail_central", "h_ee_mass_id_fail_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_id_pass_forward = ibooker_.book2D("h_ee_mass_id_pass_forward", "h_ee_mass_id_pass_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_id_fail_forward = ibooker_.book2D("h_ee_mass_id_fail_forward", "h_ee_mass_id_fail_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);

h_ee_mass_HLT_pass_central = ibooker_.book2D("h_ee_mass_HLT_pass_central", "h_ee_mass_HLT_pass_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_HLT_fail_central = ibooker_.book2D("h_ee_mass_HLT_fail_central", "h_ee_mass_HLT_fail_central", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_HLT_pass_forward = ibooker_.book2D("h_ee_mass_HLT_pass_forward", "h_ee_mass_HLT_pass_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);
h_ee_mass_HLT_fail_forward = ibooker_.book2D("h_ee_mass_HLT_fail_forward", "h_ee_mass_HLT_fail_forward", LumiBin_, LumiMin_, LumiMax_, MassBin_, MassMin_, MassMax_);

h_ee_yield_Z_ebeb = ibooker_.book1D("h_ee_yield_Z_ebeb", "h_ee_yield_Z_ebeb", LumiBin_, LumiMin_, LumiMax_);
h_ee_yield_Z_ebee = ibooker_.book1D("h_ee_yield_Z_ebee", "h_ee_yield_Z_ebee", LumiBin_, LumiMin_, LumiMax_);
h_ee_yield_Z_eeee = ibooker_.book1D("h_ee_yield_Z_eeee", "h_ee_yield_Z_eeee", LumiBin_, LumiMin_, LumiMax_);
h_ee_mass_id_pass_central = ibooker_.book2D("h_ee_mass_id_pass_central",
"h_ee_mass_id_pass_central",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_id_fail_central = ibooker_.book2D("h_ee_mass_id_fail_central",
"h_ee_mass_id_fail_central",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_id_pass_forward = ibooker_.book2D("h_ee_mass_id_pass_forward",
"h_ee_mass_id_pass_forward",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_id_fail_forward = ibooker_.book2D("h_ee_mass_id_fail_forward",
"h_ee_mass_id_fail_forward",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);

h_ee_mass_HLT_pass_central = ibooker_.book2D("h_ee_mass_HLT_pass_central",
"h_ee_mass_HLT_pass_central",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_HLT_fail_central = ibooker_.book2D("h_ee_mass_HLT_fail_central",
"h_ee_mass_HLT_fail_central",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_HLT_pass_forward = ibooker_.book2D("h_ee_mass_HLT_pass_forward",
"h_ee_mass_HLT_pass_forward",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);
h_ee_mass_HLT_fail_forward = ibooker_.book2D("h_ee_mass_HLT_fail_forward",
"h_ee_mass_HLT_fail_forward",
LumiBin_,
LumiMin_,
LumiMax_,
MassBin_,
MassMin_,
MassMax_);

h_ee_yield_Z_ebeb = ibooker_.book1D("h_ee_yield_Z_ebeb", "h_ee_yield_Z_ebeb", LumiBin_, LumiMin_, LumiMax_);
h_ee_yield_Z_ebee = ibooker_.book1D("h_ee_yield_Z_ebee", "h_ee_yield_Z_ebee", LumiBin_, LumiMin_, LumiMax_);
h_ee_yield_Z_eeee = ibooker_.book1D("h_ee_yield_Z_eeee", "h_ee_yield_Z_eeee", LumiBin_, LumiMin_, LumiMax_);
}

//
// -------------------------------------- Analyze --------------------------------------------
//
//--------------------------------------------------------------------------------------------------
void ZCountingElectrons::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { // Fill event tree on the fly
void ZCountingElectrons::analyze(const edm::Event& iEvent,
const edm::EventSetup& iSetup) { // Fill event tree on the fly
edm::LogInfo("ZCountingElectrons") << "ZCountingElectrons::analyze" << std::endl;

//-------------------------------
Expand Down
5 changes: 2 additions & 3 deletions DQMOffline/Lumi/plugins/ZCountingElectrons.h
View file
Expand Up @@ -32,7 +32,6 @@ class ZCountingElectrons : public DQMEDAnalyzer {
void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;

private:

// Electron-specific functions
bool ele_probe_selection(double pt, double abseta);
bool ele_tag_selection(double pt, double abseta);
Expand Down Expand Up @@ -74,9 +73,9 @@ class ZCountingElectrons : public DQMEDAnalyzer {

// trigger objects
HLTConfigProvider hltConfigProvider_;
TriggerTools *triggers;
TriggerTools* triggers;

//constants
//constants
const double DRMAX = 0.1; // max dR matching between muon and hlt object
const float ELECTRON_MASS = 0.000511;
const float ELE_ETA_CRACK_LOW = 1.4442;
Expand Down
5 changes: 3 additions & 2 deletions DQMOffline/Lumi/src/TriggerTools.cc
View file
Expand Up @@ -79,7 +79,8 @@ void TriggerTools::initHLTObjects(const HLTConfigProvider& hltConfigProvider_) {
}

if (iRec.hltPathIndex == (unsigned int)-1) {
edm::LogWarning("TriggerTools") << "TriggerTools::initHLTObjects hltPathIndex has not been found for: " << iRec.hltPattern << std::endl;
edm::LogWarning("TriggerTools") << "TriggerTools::initHLTObjects hltPathIndex has not been found for: "
<< iRec.hltPattern << std::endl;
continue;
}
}
Expand Down Expand Up @@ -122,7 +123,7 @@ bool TriggerTools::pass() const {
check if the event passed any of the initialized triggers
*/

return triggerBits!=0;
return triggerBits != 0;
}

//--------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit f457c02

Please sign in to comment.