From 113e8f6461cb0cc21268d807c07c593c4ee547e1 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 22 Oct 2013 11:58:51 +0000 Subject: [PATCH] Fixed compilation with Root6 --- TPC/Base/AliTPCRF1D.cxx | 7 ++++--- TPC/CMakelibTPCutil.pkg | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/TPC/Base/AliTPCRF1D.cxx b/TPC/Base/AliTPCRF1D.cxx index 17b1cf808ff..4e0243191bd 100644 --- a/TPC/Base/AliTPCRF1D.cxx +++ b/TPC/Base/AliTPCRF1D.cxx @@ -28,6 +28,7 @@ // +#include #include #include #include @@ -324,7 +325,7 @@ void AliTPCRF1D::Update() for (Int_t i =0; iIntegral(-5*forigsigma,5*forigsigma,funParam,0.00001); #else TArrayD savParam(fGRF->GetNpar(), fGRF->GetParameters()); @@ -339,7 +340,7 @@ void AliTPCRF1D::Update() Float_t x = (Float_t)(i-fNRF/2)/fDSTEPM1; Float_t x1=TMath::Max(x-fpadWidth/2,-5*forigsigma); Float_t x2=TMath::Min(x+fpadWidth/2,5*forigsigma); -#if ROOT_VERISON_CODE < ROOT_VERSION(5,99,0) +#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0) fcharge[i] = fkNorm*fGRF->Integral(x1,x2,funParam,0.0001)/fInteg; #else fcharge[i] = fkNorm*fGRF->Integral(x1,x2,0.0001)/fInteg; @@ -368,7 +369,7 @@ void AliTPCRF1D::Update() fSigma = TMath::Sqrt(fSigma/sum-mean*mean); } else fSigma=0; -#if ROOT_VERISON_CODE >= ROOT_VERSION(5,99,0) +#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) fGRF->SetParameters(savParam.GetArray()); #endif } diff --git a/TPC/CMakelibTPCutil.pkg b/TPC/CMakelibTPCutil.pkg index dd381695a82..b59a999555b 100644 --- a/TPC/CMakelibTPCutil.pkg +++ b/TPC/CMakelibTPCutil.pkg @@ -38,7 +38,7 @@ set ( SRCS string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( EINCLUDE RAW TPC TPC/Util TPC/Base ANALYSIS STAT STEER/STEER STEER/CDB STEER/STEERBase ) +set ( EINCLUDE RAW TPC TPC/Util TPC/Base ANALYSIS STAT STEER/STEER STEER/ESD STEER/CDB STEER/STEERBase ) set ( DHDR TPCutilLinkDef.h) -- 2.39.3