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

Jump to bottom

Fixes for code rule violations in Validation/RecoB and HLTriggerOffline/SUSYBSM #26772

Merged
merged 3 commits into from May 15, 2019
Merged

Fixes for code rule violations in Validation/RecoB and HLTriggerOffline/SUSYBSM #26772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a491833
Move using namespace from header to source file
fabiocos May 9, 2019
9a4ed92
Replace all but one try - catch statements in HLTriggerOffline/SUSYBS…
fabiocos May 13, 2019
74b8a63
remove the last try - catch block in SUSY_HLT_SingleLepton
fabiocos May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 27 additions & 31 deletions HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc
View file
Open in desktop
Expand Up @@ -47,13 +47,14 @@ namespace {
const float sigmaietaieta = el.full5x5_sigmaIetaIeta();
const float hOverE = el.hcalOverEcal();
float d0 = 0.0, dz = 0.0;
try {
d0 = -(el.gsfTrack()->dxy(pv_position));
dz = el.gsfTrack()->dz(pv_position);
} catch (...) {

if (el.gsfTrack().isNull()) {
edm::LogError("SUSY_HLT_SingleLepton") << "Could not read electron.gsfTrack().\n";
return false;
}
d0 = -(el.gsfTrack()->dxy(pv_position));
dz = el.gsfTrack()->dz(pv_position);

float ooemoop = 1e30;
if (el.ecalEnergy() > 0.0 && std::isfinite(el.ecalEnergy())) {
ooemoop = fabs(1.0 / el.ecalEnergy() - el.eSuperClusterOverP() / el.ecalEnergy());
Expand All @@ -65,21 +66,18 @@ namespace {

bool pass_conversion = false;
if (convs.isValid()) {
try {
pass_conversion = !ConversionTools::hasMatchedConversion(el, *convs, bs_position);
} catch (...) {
edm::LogError("SUSY_HLT_SingleLepton") << "Electron conversion matching failed.\n";
return false;
}
pass_conversion = !ConversionTools::hasMatchedConversion(el, *convs, bs_position);
} else {
edm::LogError("SUSY_HLT_SingleLepton") << "Electron conversion matching failed.\n";
return false;
}

float etasc = 0.0;
try {
etasc = el.superCluster()->eta();
} catch (...) {
if (el.superCluster().isNull()) {
edm::LogError("SUSY_HLT_SingleLepton") << "Could not read electron.superCluster().\n";
return false;
}
etasc = el.superCluster()->eta();
if (fabs(etasc) > 2.5) {
return false;
} else if (fabs(etasc) > 1.479) {
Expand Down Expand Up @@ -129,35 +127,33 @@ namespace {
return false;
if (!mu.isPFMuon())
return false;
try {
if (mu.globalTrack()->normalizedChi2() >= 10.)
return false;
if (mu.globalTrack()->hitPattern().numberOfValidMuonHits() <= 0)
return false;
} catch (...) {
if (mu.globalTrack().isNull()) {
edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.globalTrack().\n";
return false;
}
if (mu.globalTrack()->normalizedChi2() >= 10.)
return false;
if (mu.globalTrack()->hitPattern().numberOfValidMuonHits() <= 0)
return false;
if (mu.numberOfMatchedStations() <= 1)
return false;
try {
if (fabs(mu.muonBestTrack()->dxy(pv_position)) >= 0.2)
return false;
if (fabs(mu.muonBestTrack()->dz(pv_position)) >= 0.5)
return false;
} catch (...) {
if (mu.muonBestTrack().isNull()) {
edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.muonBestTrack().\n";
return false;
}
try {
if (mu.innerTrack()->hitPattern().numberOfValidPixelHits() <= 0)
return false;
if (mu.innerTrack()->hitPattern().trackerLayersWithMeasurement() <= 5)
return false;
} catch (...) {
if (fabs(mu.muonBestTrack()->dxy(pv_position)) >= 0.2)
return false;
if (fabs(mu.muonBestTrack()->dz(pv_position)) >= 0.5)
return false;
if (mu.innerTrack().isNull()) {
edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.innerTrack().\n";
return false;
}
if (mu.innerTrack()->hitPattern().numberOfValidPixelHits() <= 0)
return false;
if (mu.innerTrack()->hitPattern().trackerLayersWithMeasurement() <= 5)
return false;

return true;
}
} // namespace
Expand Down
4 changes: 4 additions & 0 deletions Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc
View file
Open in desktop
@@ -1,5 +1,9 @@
#include "Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h"

using namespace reco;
using namespace edm;
using namespace std;

const reco::TrackBaseRef toTrackRef(const edm::Ptr<reco::Candidate> &cnd) {
const reco::PFCandidate *pfcand = dynamic_cast<const reco::PFCandidate *>(cnd.get());

Expand Down
4 changes: 0 additions & 4 deletions Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h
View file
Open in desktop
Expand Up @@ -37,10 +37,6 @@
#include <fstream>
#include <iostream>

using namespace reco;
using namespace edm;
using namespace std;

/** \class BDHadronTrackMonitoringAnalyzer
*
* Top level steering routine for B + D hadron track monitoring tool from
Expand Down
4 changes: 4 additions & 0 deletions Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc
View file
Open in desktop
@@ -1,5 +1,9 @@
#include "Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h"

using namespace edm;
using namespace std;
using namespace RecoBTag;

// intialize category map
// std::map<unsigned int, std::string>
// BDHadronTrackMonitoringAnalyzer::TrkHistCat(map_start_values,
Expand Down
4 changes: 0 additions & 4 deletions Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h
View file
Open in desktop
Expand Up @@ -11,10 +11,6 @@
#include "FWCore/Utilities/interface/InputTag.h"
#include "Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h"

using namespace edm;
using namespace std;
using namespace RecoBTag;

/** \class BDHadronTrackMonitoringHarvester
*
* Top level steering routine for b tag performance harvesting.
Expand Down