From: marian Date: Wed, 10 Oct 2007 12:21:38 +0000 (+0000) Subject: Adding TStatToolkit to the Makefile s (Marian) X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=4d61c301518d661e774498a7e63d3fc5b18e3a41 Adding TStatToolkit to the Makefile s (Marian) --- diff --git a/STAT/Makefile b/STAT/Makefile index cdcd38098fb..988a228a52f 100644 --- a/STAT/Makefile +++ b/STAT/Makefile @@ -17,8 +17,8 @@ OutPutOpt = -o CXX = g++ LD = g++ -CXXFLAGS = -O -g -pg -fPIC -LDFLAGS = -O -g -pg -fPIC +CXXFLAGS = -O -g -pg -fPIC -Wall -Weffc++ +LDFLAGS = -O -g -pg -fPIC -Wall -Weffc++ SOFLAGS = -shared -g -pg -fPIC ROOTCXX = $(shell root-config --cflags) diff --git a/STAT/TStatToolkit.cxx b/STAT/TStatToolkit.cxx index 981bd75a29a..3eaa384e564 100644 --- a/STAT/TStatToolkit.cxx +++ b/STAT/TStatToolkit.cxx @@ -784,6 +784,14 @@ TString* TStatToolkit::FitPlane(TTree *tree, const char* drawCommand, const char chi2 = fitter->GetChisquare(); chi2 = chi2; npoints = entries; +// TString *preturnFormula = new TString(Form("%f*(",fitParam[0])), &returnFormula = *preturnFormula; + +// for (Int_t iparam = 0; iparam < dim; iparam++) { +// returnFormula.Append(Form("%s*(%f)",((TObjString*)formulaTokens->At(iparam))->GetName(),fitParam[iparam+1]/fitParam[0])); +// if (iparam < dim-1) returnFormula.Append("+"); +// } +// returnFormula.Append(" )"); + TString *preturnFormula = new TString(Form("( %f+",fitParam[0])), &returnFormula = *preturnFormula; for (Int_t iparam = 0; iparam < dim; iparam++) { @@ -791,6 +799,10 @@ TString* TStatToolkit::FitPlane(TTree *tree, const char* drawCommand, const char if (iparam < dim-1) returnFormula.Append("+"); } returnFormula.Append(" )"); + + + + delete formulaTokens; delete fitter; delete[] values; diff --git a/STAT/kDStatLinkDef.h b/STAT/kDStatLinkDef.h index 498db719434..08e6abe4490 100644 --- a/STAT/kDStatLinkDef.h +++ b/STAT/kDStatLinkDef.h @@ -19,6 +19,7 @@ #pragma link C++ class TKDInterpolator::TKDNodeInfo+; #pragma link C++ class TKDSpline+; #pragma link C++ class AliTMinuitToolkit+; +#pragma link C++ class TStatToolkit+; #endif diff --git a/STAT/libKDStat.pkg b/STAT/libKDStat.pkg index 1fa4156a8f2..912815e830a 100644 --- a/STAT/libKDStat.pkg +++ b/STAT/libKDStat.pkg @@ -1,5 +1,7 @@ -SRCS= TKDTree.cxx TKDInterpolator.cxx TKDSpline.cxx AliTMinuitToolkit.cxx +SRCS= TKDTree.cxx TKDInterpolator.cxx TKDSpline.cxx AliTMinuitToolkit.cxx TStatToolkit.cxx HDRS= $(SRCS:.cxx=.h) DHDR:=kDStatLinkDef.h + +EINCLUDE:= STEER include