declaring fData as integer and moving all containers to the AnalysisResults.root...

diff --git a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx
index 22cd25b13e1b0b570e0abfdd577b3bdde98ceb3d..d99d16fdf440bbfef74b88f22c7632163fb0568a 100644 (file)
--- a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx
+++ b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx
@@ -76,7 +76,7 @@ static Int_t   nMaxEvMix = 250;
 AliAnalysisTaskLambdaOverK0sJets::AliAnalysisTaskLambdaOverK0sJets(const char *name) :
   AliAnalysisTaskSE(name),
 
-  fAOD(0), fIsMC(kFALSE), fData("PbPb2010"), fUsePID(kFALSE), fCentMin(0.), fCentMax(90.), fDoQA(kFALSE), fDoMixEvt(kFALSE), fTrigPtMin(8.), fTrigPtMax(20.), fTrigEtaMax(0.8), fCheckIDTrig(kFALSE), fSeparateInjPart(kTRUE), fEndOfHijingEvent(-1),  fPIDResponse(0),
+  fAOD(0),  fData(2010), fIsMC(kFALSE), fUsePID(kFALSE), fCentMin(0.), fCentMax(90.), fDoQA(kFALSE), fDoMixEvt(kFALSE), fTrigPtMin(8.), fTrigPtMax(20.), fTrigEtaMax(0.8), fCheckIDTrig(kFALSE), fSeparateInjPart(kTRUE), fEndOfHijingEvent(-1),  fPIDResponse(0),
 
   fMinPtDaughter(0.160), fMaxEtaDaughter(0.8), fMaxDCADaughter(1.0), fYMax(0.5), fDCAToPrimVtx(0.1), fMinCPA(0.998), fNSigma(3.0), fMinCtau(0.), fMaxCtau(3.), fIdTrigger(-1), fIsV0LP(0), fPtV0LP(0.), fIsSndCheck(0),
 
@@ -2823,9 +2823,9 @@ void AliAnalysisTaskLambdaOverK0sJets::UserExec(Option_t *)
   UInt_t maskIsSelected = hdr->IsEventSelected();
   Bool_t isSelected = kFALSE;
 
-  if( fData.Contains("PbPb2010") )
+  if( fData==2010 )
     isSelected = (maskIsSelected & AliVEvent::kMB);
-  else if( fData.Contains("PbPb2011") ){
+  else if( fData==2011 ){
       Bool_t isSelectedCentral   =  maskIsSelected  &  AliVEvent::kCentral;
       Bool_t isSelectedSemiCentral   =  maskIsSelected  &  AliVEvent::kSemiCentral;
       Bool_t isSelectedMB   =  maskIsSelected   &  AliVEvent::kMB;

diff --git a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.h b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.h
index 526e12dd5fa0616517d5e7dfff8494b69977d796..9e6d9515716bc5bfba4f903572bec6d4176fd35c 100644 (file)
--- a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.h
+++ b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.h
@@ -50,7 +50,7 @@ class AliAnalysisTaskLambdaOverK0sJets : public AliAnalysisTaskSE {
   virtual ~AliAnalysisTaskLambdaOverK0sJets();
 
   // Setter for global variables in the event
-  void SetData(TString data="PbPb2010") {fData=data;}
+  void SetDataType(Int_t data=2010) {fData=data;}
   void SetMC(Bool_t isMC=kTRUE) {fIsMC=isMC;} 
   void SetPID(Bool_t usePID=kTRUE) {fUsePID=usePID;} 
   void SetCentrality(Float_t min=0., Float_t max=90.) {fCentMin=min;fCentMax=max;} 
@@ -93,8 +93,8 @@ class AliAnalysisTaskLambdaOverK0sJets : public AliAnalysisTaskSE {
   AliAnalysisTaskLambdaOverK0sJets& operator=(const AliAnalysisTaskLambdaOverK0sJets&);//not implemented 
 
   AliAODEvent *fAOD;
+  Int_t    fData;                        //  Data: PbPb2010 / PbPb2011
   Bool_t   fIsMC;                        //  Use MC data 
-  TString  fData;                        //  Data: PbPb2010 / PbPb2011
   Bool_t   fUsePID;                      //  Use PID for tracks
   Float_t  fCentMin;                     //  Minimum centrality
   Float_t  fCentMax;                     //  Maximum centrality

diff --git a/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C
index 3eacf740e672254d8213e500b01511177992c59b..0219b659e11892843325d7550e1df7187a5e4d1c 100644 (file)
--- a/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C
+++ b/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C
@@ -1,5 +1,5 @@
 AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString  name      = "LambdaOverK0sRatio", 
-                                                           TString  data      = "PbPb2010", 
+                                                           Int_t    data      = 2010, 
                                                            Float_t  minCen    = 0.,
                                                            Float_t  maxCen    = 90.,
                                                            Float_t  ptMinTrig = 8.,
@@ -23,7 +23,7 @@ AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString  name      =
   
   // Create and configure the task
   AliAnalysisTaskLambdaOverK0sJets *task = new AliAnalysisTaskLambdaOverK0sJets(name.Data());
-  task->SetData(data);
+  //task->SetDataType(data);
   task->SetCentrality(minCen,maxCen);
   task->SetTriggerPt(ptMinTrig,ptMaxTrig);
   task->SetTriggerEta(etaMaxTrig);
@@ -49,22 +49,23 @@ AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString  name      =
   
   AliAnalysisDataContainer *coutput1 =  
     mgr->CreateContainer(name, TList::Class(), 
-                        AliAnalysisManager::kOutputContainer, 
-                        name+".root");
+                         AliAnalysisManager::kOutputContainer, 
+                         "AnalysisResults.root");
 
   AliAnalysisDataContainer *coutput2 =  
     mgr->CreateContainer(name+"_ME", TList::Class(), 
-                        AliAnalysisManager::kOutputContainer, 
-                        name+"_ME.root");
+                         AliAnalysisManager::kOutputContainer, 
+                         "AnalysisResults.root");
 
   AliAnalysisDataContainer *coutput3 =  
     mgr->CreateContainer(name+"_QA", TList::Class(), 
-                        AliAnalysisManager::kOutputContainer, 
-                        name+"_QA.root");
+                         AliAnalysisManager::kOutputContainer, 
+                         "AnalysisResults.root");
   
   mgr->ConnectOutput(task,1,coutput1);
   mgr->ConnectOutput(task,2,coutput2);
   mgr->ConnectOutput(task,3,coutput3);
+
   
   return task;
 }   

diff --git a/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C
index 7a55ed34da483480fade59e20763a61301623dc5..c7749799e7eec92f3f25dc2c3945c1e1b8580f40 100644 (file)
--- a/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C
+++ b/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C
@@ -1,13 +1,13 @@
 class AliAnalysisAlien;\r
 \r
-void runGridLambdaOverK0sJets(TString  runMode    = "full", \r
-                             TString  alirootVer = "v5-04-14-AN",\r
+void runGridLambdaOverK0sJets(TString  runMode    = "test", \r
+                             TString  alirootVer = "v5-04-31LF-AN"/*"v5-04-14-AN"*/,\r
                              TString  rootVer    = "v5-34-02-1",\r
                              TString  dataPath   = "ESDs/pass2/AOD086/*/AliAOD.root",\r
                              TString  dataDir    = "/alice/data/2010/LHC10h",\r
-                             TString  workDir    = "work",\r
+                             TString  workDir    = "test",\r
                              TString  name       = "LambdaOverK0sRatio", \r
-                             TString  data       = "PbPb2010",\r
+                             Int_t    data       = 2010,\r
                              Float_t  minCen     = 0.,\r
                              Float_t  maxCen     = 90.,\r
                              Float_t  ptMinTrig  = 8.,\r
@@ -18,7 +18,7 @@ void runGridLambdaOverK0sJets(TString  runMode    = "full",
                              Bool_t   isMC       = kFALSE,\r
                              Bool_t   usePID     = kTRUE,\r
                              Bool_t   doQA       = kFALSE,\r
-                             Int_t    run        = 138624){\r
+                             Int_t    run        = 137530/*138624*/){\r
   \r
   Printf("   \nThe parameters of the programm are : \n ");\r
   Printf(" \t Analysis mode:\t %s\n \t Centrality:\t %.1lf - %.1lf\n \t Use MC Data?:\t %s\n \t Use PID?:\t %s\n",\r
@@ -48,7 +48,8 @@ void runGridLambdaOverK0sJets(TString  runMode    = "full",
   Float_t checkIDTrig= kTRUE;\r
 \r
   // My task\r
-  gROOT->LoadMacro("AliAnalysisTaskLambdaOverK0sJets.cxx+g"); \r
+  gROOT->LoadMacro("AliAnalysisTaskLambdaOverK0sJets.cxx++g"); \r
+  //gSystem->Load("libPWGLFSTRANGENESS");\r
   gROOT->LoadMacro("AddTaskLambdaOverK0sJets.C");\r
   AliAnalysisTaskLambdaOverK0sJets *task = AddTaskLambdaOverK0sJets(name,data,minCen,maxCen,ptMinTrig,ptMaxTrig,etaMaxTrig,checkIDTrig,rapMaxV0,sepInjec,isMC,usePID,doQA);\r
    // _____________________________________________________ //\r

diff --git a/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C
index 99fde65de13285a7d0f2ba8ac4ae78d6cb92c94e..fcc5c5a595e8420e99d6e1eaadb54c7c863d4025 100644 (file)
--- a/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C
+++ b/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C
@@ -4,7 +4,7 @@ void runProofLambdaOverK0sJets(TString  proofCluster  = "xsanchez@skaf.saske.sk"
                               TString  rootVer       = "VO_ALICE@ROOT::v5-34-02", \r
                               TString  path          = "/alice/data/LHC10h_000138624_p2_AOD049",\r
                               TString  name          = "LambdaOverK0sRatio", \r
-                              TString  data       = "PbPb2010",\r
+                              Int_t    data          = 2010,\r
                               Float_t  minCen        = 0.,\r
                               Float_t  maxCen        = 90.,\r
                               Float_t  ptMinTrig     = 5.,\r