Added Ds and Dstar tasks

diff --git a/PWG3/vertexingHF/AddD2HTrain.C b/PWG3/vertexingHF/AddD2HTrain.C
index 578258debea6bbf95dcb9176f38b7e120852815b..b965d4f4bb4589501d6a911a7b50134d1621de3f 100644 (file)
--- a/PWG3/vertexingHF/AddD2HTrain.C
+++ b/PWG3/vertexingHF/AddD2HTrain.C
@@ -5,9 +5,13 @@ Int_t AddD2HTrain(Bool_t readMC=kTRUE,
                  Int_t addLSD0=1,
                  Int_t addLSJpsi=1,
                  Int_t addCFD0=1,
-                 Int_t addPromptD0=1) {
+                 Int_t addPromptD0=1,
+                 Int_t addDs=1,
+                 Int_t addDStar=1,
+                 Int_t addDStarJets=1,
+                 Int_t addCFDStar=1) {
   // 
-  // Task of the D2H subgroup of PWG3 that can run in the Official Train
+  // Tasks of the D2H subgroup of PWG3 that can run in the Official Train
   //
   // They all use AOD+AOD.VertexingHF as input. 
   // They need to read the cuts from the macro 
@@ -83,5 +87,34 @@ Int_t AddD2HTrain(Bool_t readMC=kTRUE,
     ntasks++;
   }
 
+  if(addDs) {
+    taskName="AddTaskDs.C"; taskName.Prepend(loadMacroPath.Data());
+    gROOT->LoadMacro(taskName.Data());
+    AliAnalysisTaskSEDs *dsTask = AddTaskDs(readMC);
+    ntasks++;
+  }  
+
+  if(addDStar) {
+    taskName="AddTaskDStar.C"; taskName.Prepend(loadMacroPath.Data());
+    gROOT->LoadMacro(taskName.Data());
+    AliAnalysisTaskSEDStar *dstarTask = AddTaskDStar(readMC);
+    ntasks++;
+  }  
+
+  if(addDStarJets) {
+    taskName="AddTaskDStarJets.C"; taskName.Prepend(loadMacroPath.Data());
+    gROOT->LoadMacro(taskName.Data());
+    AliAnalysisTaskSEDStarJets *dstarjetsTask = AddTaskDStarJets(readMC);
+    ntasks++;
+  }  
+
+  if(addCFDStar && readMC) {
+    taskName="AddTaskCFDStar.C"; taskName.Prepend(loadMacroPath.Data());
+    gROOT->LoadMacro(taskName.Data());
+    AliCFTaskForDStarAnalysis *cfDstarTask = AddTaskCFDStar();
+    ntasks++;
+  }
+
+
   return ntasks;
 }

diff --git a/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C b/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
index 51b6f4170e333c6dc996a83595f3a9a7bf98e8f6..5b3f16579aeb87d56320e590a218932dd0838b6a 100644 (file)
--- a/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
+++ b/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
@@ -176,6 +176,14 @@ void RunAnalysisAODVertexingHF()
   // Analysis tasks (wagons of the train)   \r
   //\r
   TString taskName;\r
+  ////// ADD THE FULL D2H TRAIN\r
+  taskName="AddD2HTrain.C"; taskName.Prepend(loadMacroPath.Data());\r
+  gROOT->LoadMacro(taskName.Data());\r
+  Bool_t readMC=kFALSE;\r
+  AddD2HTrain(readMC);//,1,0,0,0,0,0,0,0,0,0,0);\r
+\r
+  ////// OR ADD INDIVIDUAL TASKS\r
+  /*\r
   \r
   //taskName="AddTaskCompareHF.C"; taskName.Prepend(loadMacroPath.Data());\r
   //gROOT->LoadMacro(taskName.Data());\r
@@ -217,8 +225,8 @@ void RunAnalysisAODVertexingHF()
   taskName="AddTaskCharmFraction.C"; taskName.Prepend(loadMacroPath.Data());\r
   gROOT->LoadMacro(taskName.Data());\r
   Int_t switchMC[5]={1,1,1,1,1};\r
-  AliAnalysisTaskSECharmFraction *cFractTask = AddTaskCharmFraction("d0D0.root",switchMC);\r
-  \r
+  AliAnalysisTaskSECharmFraction *cFractTask = AddTaskCharmFraction("d0D0",switchMC);\r
+  */\r
   // attach a private task (not committed)\r
   // (the files MyTask.h MyTask.cxx AddMyTask.C have to be declared in plugin\r
   // configuration, see below)\r
@@ -279,9 +287,8 @@ AliAnalysisGrid* CreateAlienHandler(TString pluginmode="test",Bool_t useParFiles
    // Declare input data to be processed.\r
    // Method 1: Create automatically XML collections using alien 'find' command.\r
    // Define production directory LFN\r
-   //plugin->SetGridDataDir("/alice/cern.ch/user/r/rbala/newtrain/out_lhc08x/");\r
-   //plugin->SetGridDataDir("/alice/cern.ch/user/m/mgheata/analysisESD/output_train_default_28May2009_09h33/");\r
-   plugin->SetGridDataDir("/alice/sim/PDC_08b/LHC09a2/AOD1/");\r
+   plugin->SetGridDataDir("/alice/cern.ch/user/r/rbala/data_pass4_good_runCINT1B_8thfeb/");\r
+   //plugin->SetGridDataDir("/alice/sim/PDC_09/LHC09a4/AOD3/");\r
    // Set data search pattern\r
    plugin->SetDataPattern("AliAOD.root");\r
    plugin->SetFriendChainName("./AliAOD.VertexingHF.root");\r