From a4918339f24683897ff0d0c830fe7e72e8c6ffb7 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Thu, 9 May 2019 16:41:13 +0200 Subject: [PATCH 1/3] Move using namespace from header to source file --- Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc | 4 ++++ Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h | 4 ---- Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc | 4 ++++ Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc index 13cb3248856d9..2685add3c917e 100644 --- a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc +++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc @@ -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 &cnd) { const reco::PFCandidate *pfcand = dynamic_cast(cnd.get()); diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h index 67f8ad0f77523..703865654d6b5 100644 --- a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h +++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h @@ -37,10 +37,6 @@ #include #include -using namespace reco; -using namespace edm; -using namespace std; - /** \class BDHadronTrackMonitoringAnalyzer * * Top level steering routine for B + D hadron track monitoring tool from diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc index f35b1f70ec5fc..e9727dcaefa4a 100644 --- a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc +++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc @@ -1,5 +1,9 @@ #include "Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h" +using namespace edm; +using namespace std; +using namespace RecoBTag; + // intialize category map // std::map // BDHadronTrackMonitoringAnalyzer::TrkHistCat(map_start_values, diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h index 37869913bf9b3..159bdfa067d41 100644 --- a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h +++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h @@ -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. From 9a4ed9230528e0a7eee2f232421d0ec929908ebb Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Mon, 13 May 2019 17:27:35 +0200 Subject: [PATCH 2/3] Replace all but one try - catch statements in HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc --- .../SUSYBSM/src/SUSY_HLT_SingleLepton.cc | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc index 006c804491359..d9b1f7d6b8226 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc @@ -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()); @@ -74,12 +75,11 @@ namespace { } 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) { @@ -129,35 +129,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 From 74b8a63ae76683f9517485dbeb1faa0bea20685d Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 14 May 2019 15:24:27 +0200 Subject: [PATCH 3/3] remove the last try - catch block in SUSY_HLT_SingleLepton --- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc index d9b1f7d6b8226..2ad4126a379da 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc @@ -66,12 +66,10 @@ 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;