Restoring previous fixes that were lost during one of the last commits in this class...

diff --git a/ANALYSIS/AliCentralitySelectionTask.cxx b/ANALYSIS/AliCentralitySelectionTask.cxx
index 5b06b7e9cc3e20d9c3560e7307d301be3f60fe3c..cd590253d23726fd6be264c0026d8fc8536e49fc 100644 (file)
--- a/ANALYSIS/AliCentralitySelectionTask.cxx
+++ b/ANALYSIS/AliCentralitySelectionTask.cxx
@@ -357,8 +357,7 @@ void AliCentralitySelectionTask::UserExec(Option_t */*option*/)
     multV0C=esdV0->GetMTotV0C();
 
     float v0CorrR;
     multV0C=esdV0->GetMTotV0C();
 
     float v0CorrR;

-    v0Corr = GetCorrV0(esd,v0CorrR,fRunNo);
-    v0Corr = (Short_t)v0Corr;
+    v0Corr = (Short_t)GetCorrV0(esd,v0CorrR);

     v0CorrResc = (Short_t)v0CorrR;
 
     // ***** Vertex Info
     v0CorrResc = (Short_t)v0CorrR;
 
     // ***** Vertex Info


@@ -575,7 +574,7 @@ Int_t AliCentralitySelectionTask::SetupRun(AliESDEvent* esd)
   return 0;
 }
 //________________________________________________________________________
   return 0;
 }
 //________________________________________________________________________

-Float_t AliCentralitySelectionTask::GetCorrV0(const AliESDEvent* esd, float &v0CorrResc, int run) 
+Float_t AliCentralitySelectionTask::GetCorrV0(const AliESDEvent* esd, float &v0CorrResc) 

 {
   // correct V0 non-linearity, prepare a version rescaled to SPD2 corr
   Double_t *par0;
 {
   // correct V0 non-linearity, prepare a version rescaled to SPD2 corr
   Double_t *par0;


@@ -647,7 +646,7 @@ Float_t AliCentralitySelectionTask::GetCorrV0(const AliESDEvent* esd, float &v0C
                               3.92e-09 , 1.18e-09 , 2.26e-09 , 1.57e-09 , 2.02e-09 , 2.71e-09 , 2.99e-09 , 3.04e-09 }; 
   
   
                               3.92e-09 , 1.18e-09 , 2.26e-09 , 1.57e-09 , 2.02e-09 , 2.71e-09 , 2.99e-09 , 3.04e-09 }; 
   
   

-  if (run==137161) {
+  if (esd->GetRunNumber() <= 137165) {

     par0=par0_137161;
     par1=par1_137161;
     par2=par2_137161;
     par0=par0_137161;
     par1=par1_137161;
     par2=par2_137161;


@@ -664,14 +663,7 @@ Float_t AliCentralitySelectionTask::GetCorrV0(const AliESDEvent* esd, float &v0C
   for(Int_t i = 0; i < 64; ++i) {
     Double_t b = (esdV0->GetMultiplicity(i)*par1[i]-par0[i]);
     Double_t s = (b*b-4.*par2[i]*esdV0->GetMultiplicity(i)*esdV0->GetMultiplicity(i));
   for(Int_t i = 0; i < 64; ++i) {
     Double_t b = (esdV0->GetMultiplicity(i)*par1[i]-par0[i]);
     Double_t s = (b*b-4.*par2[i]*esdV0->GetMultiplicity(i)*esdV0->GetMultiplicity(i));

-    Double_t n;
-    if (s<0) {
-      printf("FPE %d %.2f %.2f %.2e\n",i,esdV0->GetMultiplicity(i),b,(b*b-4.*par2[i]*esdV0->GetMultiplicity(i)*esdV0->GetMultiplicity(i)));
-      n = -b;
-    }
-    else {
-      n = (-b + TMath::Sqrt(s));
-    }
+    Double_t n = (s<0) ? -b : (-b + TMath::Sqrt(s));

     multChCorr[i] = 2.*esdV0->GetMultiplicity(i)/n*par0[i];
     multCorr += multChCorr[i];
     multCorr2 += (multChCorr[i]/par0[i]/64.);
     multChCorr[i] = 2.*esdV0->GetMultiplicity(i)/n*par0[i];
     multCorr += multChCorr[i];
     multCorr2 += (multChCorr[i]/par0[i]/64.);

diff --git a/ANALYSIS/AliCentralitySelectionTask.h b/ANALYSIS/AliCentralitySelectionTask.h
index e62af0878a83197490d1087518aa5d7ec94662d0..b63b84ab335eafb97dbd8e294f6eb094930242b2 100644 (file)
--- a/ANALYSIS/AliCentralitySelectionTask.h
+++ b/ANALYSIS/AliCentralitySelectionTask.h
@@ -42,7 +42,7 @@ class AliCentralitySelectionTask : public AliAnalysisTaskSE {
   void ReadCentralityHistos(TString filename);
   void ReadCentralityHistos2(TString filename);
   
   void ReadCentralityHistos(TString filename);
   void ReadCentralityHistos2(TString filename);
   

-  Float_t GetCorrV0(const AliESDEvent* esd, float &v0CorrResc, int run);
+  static Float_t GetCorrV0(const AliESDEvent* esd, float &v0CorrResc);

   Float_t GetCorrSPD2(Float_t spd2raw,Float_t zv);
 
  private:
   Float_t GetCorrSPD2(Float_t spd2raw,Float_t zv);
 
  private: