Changes for

[u/mrichter/AliRoot.git] / EVGEN / AliGenParam.cxx

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index 717dae0f7d8c02ca97d44e8b1af0739d4b96d7d8..6589d1a56436cbe9a70e69f80a5d5b8a6cadfb5c 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -248,9 +248,15 @@ void AliGenParam::Init()
     fdNdy0=fYParaFunc(&y1,&y2);
   //
   // Integral over generation region
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
     Float_t intYS  = yPara.Integral(fYMin, fYMax,(Double_t*) 0x0,1.e-6);
     Float_t intPt0 = ptPara.Integral(0,15,(Double_t *) 0x0,1.e-6);
     Float_t intPtS = ptPara.Integral(fPtMin,fPtMax,(Double_t*) 0x0,1.e-6);
+#else
+    Float_t intYS  = yPara.Integral(fYMin, fYMax,1.e-6);
+    Float_t intPt0 = ptPara.Integral(0,15,1.e-6);
+    Float_t intPtS = ptPara.Integral(fPtMin,fPtMax,1.e-6);
+#endif
   Float_t phiWgt=(fPhiMax-fPhiMin)/2./TMath::Pi();    //TR: should probably be done differently in case of anisotropic phi...
     if (fAnalog == kAnalog) {
        fYWgt  = intYS/fdNdy0;
@@ -566,10 +572,17 @@ Float_t AliGenParam::GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin,
   //
   // Normalisation for selected kinematic region
   //
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
   Float_t ratio =  
     fPtPara->Integral(ptMin,ptMax,(Double_t *)0,1.e-6) / fPtPara->Integral( fPtPara->GetXmin(), fPtPara->GetXmax(),(Double_t *)0,1.e-6) *
     fYPara->Integral(yMin,yMax,(Double_t *)0,1.e-6)/fYPara->Integral(fYPara->GetXmin(),fYPara->GetXmax(),(Double_t *)0,1.e-6)   *
     (phiMax-phiMin)/360.;
+#else
+  Float_t ratio =  
+    fPtPara->Integral(ptMin,ptMax,1.e-6) / fPtPara->Integral( fPtPara->GetXmin(), fPtPara->GetXmax(),1.e-6) *
+    fYPara->Integral(yMin,yMax,1.e-6)/fYPara->Integral(fYPara->GetXmin(),fYPara->GetXmax(),1.e-6)   *
+    (phiMax-phiMin)/360.;
+#endif
   return TMath::Abs(ratio);
 }