Changes in the way we define the corrections (one function instead of two)

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
index 27e0d67a670989867f9b64cbe9543188284c0019..df9991c37171eba020d6d2d6cb2b136ca1845e01 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
@@ -505,11 +505,12 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
 \r
 //________________________________________________________________________\r
 void AliAnalysisTaskBFPsi::SetInputCorrection(TString filename, \r
-                                             TString gCollSystem) {\r
+                                             Int_t nCentralityBins, \r
+                                             Double_t *centralityArrayForCorrections) {\r
   //Open files that will be used for correction\r
-  TString gCollidingSystem = gCollSystem;\r
-\r
-  cout<<filename<<endl;\r
+  fCentralityArrayBinsForCorrections = nCentralityBins;\r
+  for (Int_t i=0; i<nCentralityBins; i++)\r
+    fCentralityArrayForCorrections[i] = centralityArrayForCorrections[i];\r
 \r
   // No file specified -> run without corrections\r
   if(!filename.Contains(".root")) {\r
@@ -525,10 +526,8 @@ void AliAnalysisTaskBFPsi::SetInputCorrection(TString filename,
   }\r
     \r
   //TString listEffName = "";\r
-  for (Int_t iCent = 0; iCent < fCentralityArrayBinsForCorrections-1; iCent++) {\r
-    \r
-    //Printf("iCent %d:",iCent);\r
-    \r
+  for (Int_t iCent = 0; iCent < fCentralityArrayBinsForCorrections-1; iCent++) {    \r
+    //Printf("iCent %d:",iCent);    \r
     TString histoName = "fHistCorrectionPlus";\r
     histoName += Form("%d-%d",(Int_t)(fCentralityArrayForCorrections[iCent]),(Int_t)(fCentralityArrayForCorrections[iCent+1]));\r
     fHistCorrectionPlus[iCent]= dynamic_cast<TH3D *>(f->Get(histoName.Data()));\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
index 4c8b6afa859378a93283d5616f59e954bc570e42..57934e150900b90722355ae155f2b6f6b697a944 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
@@ -40,12 +40,9 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE {
   virtual void   Terminate(Option_t *);\r
 \r
   //========================correction\r
-  virtual void   SetInputCorrection(TString filename, TString gCollSystem);\r
-  virtual void   SetCentralityArrayForCorrections(Int_t nCentralityBins, Double_t *centralityArrayForCorrections) {\r
-    fCentralityArrayBinsForCorrections = nCentralityBins;\r
-  for (Int_t i=0; i<nCentralityBins; i++){\r
-    fCentralityArrayForCorrections[i] = centralityArrayForCorrections[i];}\r
-  }\r
+  virtual void   SetInputCorrection(TString filename, \r
+                                   Int_t nCentralityBins, \r
+                                   Double_t *centralityArrayForCorrections);\r
   //========================correction\r
 \r
   void SetAnalysisObject(AliBalancePsi *const analysis) {\r

diff --git a/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C b/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C
index a8ceeeae71572c2dda6f943068f58e3a06ec7769..bc62a52e3f8298eb66854c4673764474ed20101e 100644 (file)
--- a/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C
+++ b/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C
@@ -117,10 +117,9 @@ AliAnalysisTaskBFPsi *AddTaskBalancePsiCentralityTrain(Double_t centrMin=0.,
   //++++++++++++++++++++++\r
   // Efficiency + Contamination corrections\r
   // If correctionFileName = "", do not use corrections\r
-  if(correctionFileName != "") {\r
-    taskBF->SetInputCorrection(correctionFileName.Data(),"");\r
-    taskBF->SetCentralityArrayForCorrections(nCentralityArrayBinsForCorrection,gCentralityArrayForCorrections);\r
-  }\r
+  if(correctionFileName != "")\r
+    taskBF->SetInputCorrection(Form("$ALICE_ROOT/PWGCF/EBYE/BalanceFunctions/Corrections/%s",correctionFileName.Data()),nCentralityArrayBinsForCorrection,gCentralityArrayForCorrections);\r
+\r
   //+++++++++++++++++++++\r
 \r
   taskBF->SetAnalysisObject(bf);\r