From b79e2522ebf10c6a3be0b11899d6f975d2c100d3 Mon Sep 17 00:00:00 2001 From: abrinke1 Date: Thu, 18 Oct 2018 14:46:28 +0200 Subject: [PATCH 1/3] Fix compile error from KalmanMuonCalibrator.h --- Calibration/interface/KalmanMuonCalibrator.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Calibration/interface/KalmanMuonCalibrator.h b/Calibration/interface/KalmanMuonCalibrator.h index d8c05a8..7c750e3 100644 --- a/Calibration/interface/KalmanMuonCalibrator.h +++ b/Calibration/interface/KalmanMuonCalibrator.h @@ -1,3 +1,6 @@ +#ifndef KalmanMuonCalibrator_h +#define KalmanMuonCalibrator_h + #include "TFile.h" #include "TH3F.h" #include "TH2F.h" @@ -77,3 +80,5 @@ class KalmanMuonCalibrator { }; + +#endif // #define KalmanMuonCalibrator_h From 08e2434e1edcfd5d4e35b36044d0108a27ed3720 Mon Sep 17 00:00:00 2001 From: abrinke1 Date: Thu, 18 Oct 2018 14:51:40 +0200 Subject: [PATCH 2/3] Fix compile warnings in DataEBEEstimator.cc --- Derivation/src/DataEBEEstimator.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Derivation/src/DataEBEEstimator.cc b/Derivation/src/DataEBEEstimator.cc index ffb2b17..0e134fd 100644 --- a/Derivation/src/DataEBEEstimator.cc +++ b/Derivation/src/DataEBEEstimator.cc @@ -91,7 +91,7 @@ void DataEBEEstimator::processTree(const std::string&fileName,const std::string& float x=0.0; - TRandom *random = new TRandom(10101982); + // TRandom *random = new TRandom(10101982); for (int i=0;iGetEntry(i); @@ -144,7 +144,7 @@ void DataEBEEstimator::processTree(const std::string&fileName,const std::string& x=genMass; - histoMap_[bin2]->Fill(x); + histoMap_[bin2]->Fill(x); if (i % 1000000==0) printf("Processed %d \%d entries\n",i,entries); From 1d75124d2def5e9e32768c752bf21d55b3504482 Mon Sep 17 00:00:00 2001 From: abrinke1 Date: Thu, 18 Oct 2018 14:52:42 +0200 Subject: [PATCH 3/3] Fix compile warning in RooGaussianSumPdfWithSigma.cc --- Derivation/src/RooGaussianSumPdfWithSigma.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Derivation/src/RooGaussianSumPdfWithSigma.cc b/Derivation/src/RooGaussianSumPdfWithSigma.cc index a533545..c680cb8 100644 --- a/Derivation/src/RooGaussianSumPdfWithSigma.cc +++ b/Derivation/src/RooGaussianSumPdfWithSigma.cc @@ -62,7 +62,7 @@ Double_t RooGaussianSumPdfWithSigma::evaluate() const //protection! if (error<=0.0) continue; - error=sqrt(error); + error=sqrt(error); arg = (mass-scale*masses[i])/(error); sum=sum+weights[i]*exp(-0.5*arg*arg)/(rootPiTimes2*error); sumw=sumw+weights[i];