From d693b902d02aeca925fcf9e6521dbb5dc3a5a372 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Mon, 26 Mar 2018 15:18:05 +0200 Subject: [PATCH] SemileptonicCorr: Fix placement of using directive. Do not put using directives in the global namespace in headers. Former-commit-id: 326679780d86c6943d1bbd3cac10b22988579bfb --- .../SemileptonicCorr/SemileptonicCorr/semilCorr.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/PhysicsAnalysis/JetPhys/SemileptonicCorr/SemileptonicCorr/semilCorr.h b/PhysicsAnalysis/JetPhys/SemileptonicCorr/SemileptonicCorr/semilCorr.h index cf0b4535ac9..da00c721bad 100644 --- a/PhysicsAnalysis/JetPhys/SemileptonicCorr/SemileptonicCorr/semilCorr.h +++ b/PhysicsAnalysis/JetPhys/SemileptonicCorr/SemileptonicCorr/semilCorr.h @@ -11,7 +11,6 @@ #include "TLorentzVector.h" #include <vector> -using namespace std; class semilCorr{ @@ -28,21 +27,21 @@ public: }; private: - vector<vector<TH1F*> > m_histos; - vector<float> m_etas; + std::vector<std::vector<TH1F*> > m_histos; + std::vector<float> m_etas; TFile* m_f; bool m_Debug; - float getResponse(float pt, float eta, vector<TH1F*> h); + float getResponse(float pt, float eta, std::vector<TH1F*> h); float getSemilCorrToIncl(TLorentzVector jet, TLorentzVector mu, - vector<TH1F*> histos); - vector<int> getHistoIndeces(semilCorr::Systematics syst); + std::vector<TH1F*> histos); + std::vector<int> getHistoIndeces(semilCorr::Systematics syst); public: - semilCorr(TString fIn, string suffix = "", bool DebugIn = false); + semilCorr(TString fIn, std::string suffix = "", bool DebugIn = false); ~semilCorr(); float getSemilCorrToIncl(TLorentzVector jet, TLorentzVector mu); -- GitLab