sync with GSI svn

diff --git a/PWGGA/GammaConv/macros/AddTask_ConversionAODProduction.C b/PWGGA/GammaConv/macros/AddTask_ConversionAODProduction.C
index 97018042311cf7badd1ecd142e71a22fa492c88b..b7dd698052c732b3dd0284997c2dd6c6bfc408cc 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_ConversionAODProduction.C
+++ b/PWGGA/GammaConv/macros/AddTask_ConversionAODProduction.C
@@ -1,5 +1,7 @@
 AliAnalysisTask *AddTask_ConversionAODProduction(Int_t dataset=1){
 
+   // Before doing anything, we load the needed library
+    gSystem->Load("libPWGGAGammaConv.so");
     // dataset 0: pp
     // dataset 1: PbPb
 
@@ -8,18 +10,22 @@ AliAnalysisTask *AddTask_ConversionAODProduction(Int_t dataset=1){
     //get the current analysis manager
     AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
     if (!mgr) {
-       Error("AddTask_V0ReaderV1", "No analysis manager found.");
-       return 0;
+      Error("AddTask_V0ReaderV1", "No analysis manager found.");
+      return 0;
     }
 
   
     TString analysiscut;
 
     if(IsHeavyIon){
-       analysiscut="900177009350113211200001000000000";
+     // Old cut string, no longer compatible with AliConversionCuts
+     // analysiscut="900177009350113211200001000000000";
+     // New cut string as of April 2013
+      analysiscut="1000000032091071001000000";
     }
     else{
-       analysiscut="900397209450304221200000002000000";
+      // analysiscut="900397209450304221200000002000000";
+      analysiscut="0000000002084000002200000";
     }
 
     //========= Add V0 Reader to  ANALYSIS manager =====
@@ -30,7 +36,7 @@ AliAnalysisTask *AddTask_ConversionAODProduction(Int_t dataset=1){
     // Set AnalysisCut Number
     AliConversionCuts *fCuts= new AliConversionCuts(analysiscut.Data(),analysiscut.Data());
     if(fCuts->InitializeCutsFromCutString(analysiscut.Data())){
-       fV0Reader->SetConversionCuts(fCuts);
+      fV0Reader->SetConversionCuts(fCuts);
     }
     fV0Reader->Init();
     mgr->AddTask(fV0Reader);

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvV1.C b/PWGGA/GammaConv/macros/AddTask_GammaConvV1.C
index 48a4167dbdd23b58fdc146db8963eb32125888e0..569351d8792e619a2593a1d40f19cc9746294ba6 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvV1.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvV1.C
@@ -31,9 +31,7 @@ void AddTask_GammaConvV1(TString trainConfig = "pp",   Bool_t isMC    = kFALSE){
    else if (trainConfig.Contains("pPb")) IsHeavyIon=2;
 
    Bool_t doEtaShift = kFALSE;
-   Int_t forceEtaShift = 0; // Carefull !!! Should be zero otherwise will shift eta cut for all periods
-                            // Use doEtaShift flag for pPb or Pbp instead (1: shift +0.465, 2: shift -0.465)
-
+   
    TString cutnumber = "";
    if(IsHeavyIon == 1){
       cutnumber = "1000000002084001001500000";
@@ -81,7 +79,6 @@ void AddTask_GammaConvV1(TString trainConfig = "pp",   Bool_t isMC    = kFALSE){
             fCuts->SelectCollisionCandidates(AliVEvent::kINT7);
             fCuts->DoEtaShift(doEtaShift);
          }
-         fCuts->ForceEtaShift(forceEtaShift);
          fV0ReaderV1->SetConversionCuts(fCuts);
          fCuts->SetFillCutHistograms("",kTRUE);
       }
@@ -128,7 +125,7 @@ void AddTask_GammaConvV1(TString trainConfig = "pp",   Bool_t isMC  = kFALSE){
      cutarray[ 0] = "8020000082093172023290000"; mesonCutArray[0] = "01629045000";  //standard cut Pi0 Pb 00-20 shifted Eta 0.4
      cutarray[ 1] = "8240000082093172023290000"; mesonCutArray[1] = "01629045000";  //standard cut Pi0 Pb 20-40 shifted Eta 0.4
      cutarray[ 2] = "8460000082093172023290000"; mesonCutArray[2] = "01629045000";  //standard cut Pi0 Pb 40-60 shifted Eta 0.4
-     cutarray[ 3] = "8680000082093172023290000"; mesonCutArray[3] = "01629045000";  //standard cut Pi0 Pb 60-80 shifted Eta 0.4
+     cutarray[ 3] = "8600000082093172023290000"; mesonCutArray[3] = "01629045000";  //standard cut Pi0 Pb 60-100 shifted Eta 0.4
    } else {
       cutarray[ 0] = "0000012002093663003800000"; mesonCutArray[0] = "01631031009"; //standard cut Pi0 pp 2.76TeV without SDD , only boxes
       cutarray[ 1] = "0001012002093663003800000"; mesonCutArray[1] = "01631031009"; //standard cut Pi0 pp 2.76TeV without SDD, V0AND , only boxes

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_2.C b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_2.C
index d2faa74ca46f99bc3ffef16f6349e73de1c91088..fd0df7093afccd82834f5f1b0124cf0c6e0c4f7d 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_2.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_2.C
@@ -31,9 +31,7 @@ void AddTask_GammaConvV1_2(TString trainConfig = "pp",   Bool_t isMC  = kFALSE){
    else if (trainConfig.Contains("pPb")) IsHeavyIon=2;
 
    Bool_t doEtaShift = kFALSE;
-   Int_t forceEtaShift = 0; // Carefull !!! Should be zero otherwise will shift eta cut for all periods
-                            // Use doEtaShift flag for pPb or Pbp instead (1: shift +0.465, 2: shift -0.465)
-
+   
    TString cutnumber = "";
    if(IsHeavyIon == 1){
       cutnumber = "1000000002084001001500000";
@@ -81,7 +79,6 @@ void AddTask_GammaConvV1_2(TString trainConfig = "pp",   Bool_t isMC  = kFALSE){
             fCuts->SelectCollisionCandidates(AliVEvent::kINT7);
             fCuts->DoEtaShift(doEtaShift);
          }
-         fCuts->ForceEtaShift(forceEtaShift);
          fV0ReaderV1->SetConversionCuts(fCuts);
          fCuts->SetFillCutHistograms("",kTRUE);
       }

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_3.C b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_3.C
index 25367c790af090890a027eacd08bc7d796534f3e..3a4d33346462f2aa23de9d19ace95d69454173fd 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_3.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_3.C
@@ -31,8 +31,6 @@ void AddTask_GammaConvV1_3(TString trainConfig = "pp",   Bool_t isMC  = kFALSE){
    else if (trainConfig.Contains("pPb")) IsHeavyIon=2;
 
    Bool_t doEtaShift = kFALSE;
-   Int_t forceEtaShift = 0; // Carefull !!! Should be zero otherwise will shift eta cut for all periods
-                            // Use doEtaShift flag for pPb or Pbp instead (1: shift +0.465, 2: shift -0.465)
 
    TString cutnumber = "";
    if(IsHeavyIon == 1){
@@ -81,7 +79,6 @@ void AddTask_GammaConvV1_3(TString trainConfig = "pp",   Bool_t isMC  = kFALSE){
             fCuts->SelectCollisionCandidates(AliVEvent::kINT7);
             fCuts->DoEtaShift(doEtaShift);
          }
-         fCuts->ForceEtaShift(forceEtaShift);
          fV0ReaderV1->SetConversionCuts(fCuts);
          fCuts->SetFillCutHistograms("",kTRUE);
       }
@@ -129,7 +126,7 @@ void AddTask_GammaConvV1_3(TString trainConfig = "pp",   Bool_t isMC        = kFALSE){
      cutarray[ 0] = "8020000072093172023290000"; mesonCutArray[0] = "01627045000";  //standard cut Pi0 Pb 00-20  wo shifted Eta 0.3
      cutarray[ 1] = "8240000072093172023290000"; mesonCutArray[1] = "01627045000";  //standard cut Pi0 Pb 20-40 wo shifted Eta 0.3
      cutarray[ 2] = "8460000072093172023290000"; mesonCutArray[2] = "01627045000";  //standard cut Pi0 Pb 40-60 wo shifted Eta 0.3
-     cutarray[ 3] = "8680000072093172023290000"; mesonCutArray[3] = "01627045000";  //standard cut Pi0 Pb 60-80 wo shifted Eta 0.3
+     cutarray[ 3] = "8600000072093172023290000"; mesonCutArray[3] = "01627045000";  //standard cut Pi0 Pb 60-100 wo shifted Eta 0.3
    } else {
       cutarray[ 0] = "0002011002093663003800000"; mesonCutArray[0] = "01631031009"; //standard cut Pi0 pp 2.76TeV with SDD , only Minbias MC
       cutarray[ 1] = "0003011002093663003800000"; mesonCutArray[1] = "01631031009"; //standard cut Pi0 pp 2.76TeV with SDD, V0AND , only Minbias MC