Changes by Christian Holm

- Adopt for newer ROOT versions

diff --git a/TPC/Base/AliTPCRF1D.cxx b/TPC/Base/AliTPCRF1D.cxx
index 91828b17c80fbfe41906d92f2994591f7fa92811..17b1cf808ffea87b052c9ff0242eec2c98f36347 100644 (file)
--- a/TPC/Base/AliTPCRF1D.cxx
+++ b/TPC/Base/AliTPCRF1D.cxx
@@ -323,7 +323,14 @@ void AliTPCRF1D::Update()
   //at the begining initialize to 0
   for (Int_t i =0; i<fNRF;i++)  fcharge[i] = 0;
   if ( fGRF == 0 ) return;
+  // This form is no longer available 
+#if ROOT_VERISON_CODE < ROOT_VERSION(5,99,0)
   fInteg  = fGRF->Integral(-5*forigsigma,5*forigsigma,funParam,0.00001);
+#else
+  TArrayD savParam(fGRF->GetNpar(), fGRF->GetParameters());
+  fGRF->SetParameters(funParam);
+  fInteg  = fGRF->Integral(-5*forigsigma,5*forigsigma,0.00001);
+#endif
   if ( fInteg == 0 ) fInteg = 1; 
   if (fDirect==kFALSE){
   //integrate charge over pad for different distance of pad
@@ -332,8 +339,11 @@ 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);
-      fcharge[i] = 
-       fkNorm*fGRF->Integral(x1,x2,funParam,0.0001)/fInteg;
+#if ROOT_VERISON_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;
+#endif
     };   
   }
   else{
@@ -358,6 +368,9 @@ void AliTPCRF1D::Update()
     fSigma = TMath::Sqrt(fSigma/sum-mean*mean);   
   }
   else fSigma=0; 
+#if ROOT_VERISON_CODE >= ROOT_VERSION(5,99,0)
+  fGRF->SetParameters(savParam.GetArray());
+#endif
 }
 
 void AliTPCRF1D::Streamer(TBuffer &R__b)

diff --git a/TPC/Calib/AliTPCcalibTracks.cxx b/TPC/Calib/AliTPCcalibTracks.cxx
index 39d8f4919eec5828bbbbecc6dd1b025c0ea859a0..17fb28a83a7b67d48dcca20d59b06dc515b8f095 100644 (file)
--- a/TPC/Calib/AliTPCcalibTracks.cxx
+++ b/TPC/Calib/AliTPCcalibTracks.cxx
@@ -115,7 +115,9 @@ using namespace std;
 #include <TCanvas.h>
 #include <TGraph2DErrors.h>
 #include "TPostScript.h"
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
 #include "TCint.h"
+#endif
 
 #include <TH2D.h>
 #include <TF2.h>
@@ -321,7 +323,9 @@ AliTPCcalibTracks::AliTPCcalibTracks(const Text_t *name, const Text_t *title, Al
    this->SetTitle(title);
 
    if (GetDebugLevel() > 0) cout << " ***** this is AliTPCcalibTracks' main constructor ***** " << endl;
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
    G__SetCatchException(0);     
+#endif
    
    fClusterParam = clusterParam;
    if (fClusterParam){

diff --git a/TPC/Calib/AliTPCcalibTracksGain.cxx b/TPC/Calib/AliTPCcalibTracksGain.cxx
index f8aa0a3c4344a5d8047c622d18fe8db9cabed7b7..d7513346ba46a3c77a32fd8504a9773cfd7692e7 100644 (file)
--- a/TPC/Calib/AliTPCcalibTracksGain.cxx
+++ b/TPC/Calib/AliTPCcalibTracksGain.cxx
@@ -178,7 +178,6 @@
 #include "AliTPCParamSR.h"
 #include "AliTPCClusterParam.h"
 #include "AliTrackPointArray.h"
-#include "TCint.h"
 #include <TH1.h>
 #include <TH3F.h>
 #include <TLinearFitter.h>

diff --git a/TPC/Calib/AliTPCcalibV0.cxx b/TPC/Calib/AliTPCcalibV0.cxx
index 66f220d78206936182866ef3137daf58280abaf6..64573af5475c8847db20155d4e4b034f09e77601 100644 (file)
--- a/TPC/Calib/AliTPCcalibV0.cxx
+++ b/TPC/Calib/AliTPCcalibV0.cxx
@@ -35,7 +35,6 @@
 #include "AliKFVertex.h"
 
 #include "AliTrackPointArray.h"
-#include "TCint.h"
 #include "AliTPCcalibV0.h"
 #include "AliV0.h"
 #include "TRandom.h"