From 1a33f11cdcfc94862f9af3b395b71e7a696edb31 Mon Sep 17 00:00:00 2001
From: Paul Seyfert <paul.seyfert@mib.infn.it>
Date: Thu, 14 Jul 2016 23:02:30 +0200
Subject: [PATCH] remove const cast from roodatahist
---
roofit/roofitcore/inc/RooDataHist.h | 4 ++--
roofit/roofitcore/src/RooDataHist.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/roofit/roofitcore/inc/RooDataHist.h b/roofit/roofitcore/inc/RooDataHist.h
index a8ba9cc0229..38b1f9afcb7 100644
--- a/roofit/roofitcore/inc/RooDataHist.h
+++ b/roofit/roofitcore/inc/RooDataHist.h
@@ -151,8 +151,8 @@ protected:
void calculatePartialBinVolume(const RooArgSet& dimSet) const ;
void checkBinBounds() const;
- void adjustBinning(const RooArgList& vars, TH1& href, Int_t* offset=0) ;
- void importTH1(const RooArgList& vars, TH1& histo, Double_t initWgt, Bool_t doDensityCorrection) ;
+ void adjustBinning(const RooArgList& vars, const TH1& href, Int_t* offset=0) ;
+ void importTH1(const RooArgList& vars, const TH1& histo, Double_t initWgt, Bool_t doDensityCorrection) ;
void importTH1Set(const RooArgList& vars, RooCategory& indexCat, std::map<std::string,TH1*> hmap, Double_t initWgt, Bool_t doDensityCorrection) ;
void importDHistSet(const RooArgList& vars, RooCategory& indexCat, std::map<std::string,RooDataHist*> dmap, Double_t initWgt) ;
diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx
index 5586862e403..be79e01cbb4 100644
--- a/roofit/roofitcore/src/RooDataHist.cxx
+++ b/roofit/roofitcore/src/RooDataHist.cxx
@@ -227,7 +227,7 @@ RooDataHist::RooDataHist(const char *name, const char *title, const RooArgList&
assert(0) ;
}
- importTH1(vars,*const_cast<TH1*>(hist),wgt, kFALSE) ;
+ importTH1(vars,*hist,wgt, kFALSE) ;
_dstore->setExternalWeightArray(_wgt,_errLo,_errHi,_sumw2) ;
TRACE_CREATE
@@ -374,7 +374,7 @@ RooDataHist::RooDataHist(const char *name, const char *title, const RooArgList&
////////////////////////////////////////////////////////////////////////////////
/// Import data from given TH1/2/3 into this RooDataHist
-void RooDataHist::importTH1(const RooArgList& vars, TH1& histo, Double_t wgt, Bool_t doDensityCorrection)
+void RooDataHist::importTH1(const RooArgList& vars, const TH1& histo, Double_t wgt, Bool_t doDensityCorrection)
{
// Adjust binning of internal observables to match that of input THx
Int_t offset[3] ;
@@ -578,7 +578,7 @@ void RooDataHist::importDHistSet(const RooArgList& /*vars*/, RooCategory& indexC
/// observable to binning in given reference TH1. Used by constructors
/// that import data from an external TH1
-void RooDataHist::adjustBinning(const RooArgList& vars, TH1& href, Int_t* offset)
+void RooDataHist::adjustBinning(const RooArgList& vars, const TH1& href, Int_t* offset)
{
// X
RooRealVar* xvar = (RooRealVar*) _vars.find(*vars.at(0)) ;
--
GitLab