Fix in the last caall to CleanOwnPrimaryVertex

[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / RunAnalysisAODVertexingHF.C

diff --git a/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C b/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
index 7e42c549a3a28ba4f7b78a840a5c8fcbf02db5e3..f28c70c6767fb09c70536f28975999fd790b991d 100644 (file)
--- a/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
+++ b/PWG3/vertexingHF/RunAnalysisAODVertexingHF.C
@@ -15,7 +15,7 @@ void RunAnalysisAODVertexingHF()
   //
 
 
-  gSystem->SetIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/CONTAINERS -I$ALICE_ROOT/STEER -I$ALICE_ROOT/TRD -I$ALICE_ROOT/macros -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/base -I$ALICE_ROOT/PWG3/vertexingHF -g"); 
+  gSystem->SetIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/CONTAINERS -I$ALICE_ROOT/STEER -I$ALICE_ROOT/TRD -I$ALICE_ROOT/macros -I$ALICE_ROOT/ANALYSIS  -I$ALICE_ROOT/OADB -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/base -I$ALICE_ROOT/PWG3/vertexingHF -g"); 
   //
   TString trainName = "D2H";
   TString analysisMode = "grid"; // "local", "grid", or "proof"
@@ -175,6 +175,10 @@ void RunAnalysisAODVertexingHF()
   //-------------------------------------------------------------------
   // Analysis tasks (wagons of the train)   
   //
+  // First add the task for the PID response setting
+  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
+  AliAnalysisTaskSE *setupTask = AddTaskPIDResponse(kFALSE,kTRUE);
+
   TString taskName;
   
   ////// ADD THE FULL D2H TRAIN
@@ -211,14 +215,6 @@ void RunAnalysisAODVertexingHF()
     gROOT->LoadMacro(taskName.Data());
     AliAnalysisTaskSEBkgLikeSignD0 *lsD0Task = AddTaskBkgLikeSignD0();
     
-    taskName="AddTaskBkgLikeSignJPSI.C"; taskName.Prepend(loadMacroPath.Data());
-    gROOT->LoadMacro(taskName.Data());
-    AliAnalysisTaskSEBkgLikeSignJPSI *lsJPSITask = AddTaskBkgLikeSignJPSI();
-    
-    //taskName="AddTaskBtoJPSItoEle.C"; taskName.Prepend(loadMacroPath.Data());
-    //gROOT->LoadMacro(taskName.Data());
-    //AliAnalysisTaskSEBtoJPSItoEle *jpsiTask = AddTaskBtoJPSItoEle();
-    
     taskName="AddTaskCFMultiVarMultiStep.C"; taskName.Prepend(loadMacroPath.Data());
     gROOT->LoadMacro(taskName.Data());
     AliCFHeavyFlavourTaskMultiVarMultiStep *cfmvmsTask = AddTaskCFMultiVarMultiStep();
@@ -289,6 +285,8 @@ AliAnalysisGrid* CreateAlienHandler(TString pluginmode="test",Bool_t useParFiles
    plugin->SetROOTVersion();
    plugin->SetAliROOTVersion();
 
+   gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/AddGoodRuns.C");
+
    // Declare input data to be processed.
    //************************************************
    // Set data search pattern for DATA
@@ -331,22 +329,27 @@ AliAnalysisGrid* CreateAlienHandler(TString pluginmode="test",Bool_t useParFiles
    //plugin->SetAnalysisSource("AliDStarJets.cxx");
    // Declare all libraries (other than the default ones for the framework. These will be
    // loaded by the generated analysis macro. Add all extra files (task .cxx/.h) here.
-   plugin->SetAdditionalLibs("libPWG3base.so libPWG3muon.so libPWG3vertexingHF.so");
+   plugin->SetAdditionalLibs("libPWG3base.so libPWG3vertexingHF.so");
    // use par files
    if(useParFiles) {
      plugin->EnablePackage("STEERBase.par");
      plugin->EnablePackage("ESD.par");
      plugin->EnablePackage("AOD.par");
      plugin->EnablePackage("ANALYSIS.par");
+     plugin->EnablePackage("OADB.par");
      plugin->EnablePackage("ANALYSISalice.par");
      plugin->EnablePackage("CORRFW.par");
      plugin->EnablePackage("PWG3base.par");
      plugin->EnablePackage("PWG3vertexingHF.par");
-     plugin->EnablePackage("PWG3muon.par");
    }
-   plugin->AddIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/CONTAINERS -I$ALICE_ROOT/STEER -I$ALICE_ROOT/TRD -I$ALICE_ROOT/macros -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/base -I$ALICE_ROOT/PWG3/vertexingHF -g");
+   plugin->AddIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/CONTAINERS -I$ALICE_ROOT/STEER -I$ALICE_ROOT/TRD -I$ALICE_ROOT/macros -I$ALICE_ROOT/ANALYSIS  -I$ALICE_ROOT/OADB -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/base -I$ALICE_ROOT/PWG3/vertexingHF -g");
 
    plugin->SetDefaultOutputs(kTRUE);
+   // merging via jdl
+   plugin->SetMergeViaJDL(kTRUE);
+   plugin->SetOneStageMerging(kFALSE);
+   plugin->SetMaxMergeStages(2);
+
    // Optionally set a name for the generated analysis macro (default MyAnalysis.C)
    plugin->SetAnalysisMacro("AnalysisHF.C");
    // Optionally set maximum number of input files/subjob (default 100, put 0 to ignore)
@@ -355,69 +358,3 @@ AliAnalysisGrid* CreateAlienHandler(TString pluginmode="test",Bool_t useParFiles
 
    return plugin;
 }
-//----------------------------------------------------------------------------
-Int_t AddGoodRuns(AliAnalysisAlien* plugin,TString lhcPeriod,TString mcprod="") {
-  //
-  // Adds good runs from the Monalisa Run Condition Table
-  //
-  if(mcprod=="") plugin->SetRunPrefix("000"); // DATA
-
-  Int_t firstrun=0,lastrun=9999999;
-  Int_t nruns=0,ngoodruns=0;
-
-  if(mcprod=="LHC10d3") {firstrun=117054;lastrun=117222;}
-  if(mcprod=="LHC10d5") {firstrun=117086;lastrun=117222;}
-  if(lhcPeriod=="LHC10d") {lastrun=126432;} // TEMPORARY!!!
-
-
-  if(lhcPeriod=="LHC10b") {
-    nruns=31;
-    Int_t runlist[31]={117222, 117220, 117116, 117112, 117109, 117099, 117092, 117086, 117077, 117065, 117063, 117060, 117059, 117054, 117053, 117052, 117050, 117048, 116645, 116643, 116574, 116571, 116562, 116403, 116288, 116102, 115401, 115393, 115193, 115186, 114931};
-   
-    for(Int_t k=0;k<nruns;k++){
-      if(runlist[k]<firstrun || runlist[k]>lastrun) continue;
-      plugin->AddRunNumber(runlist[k]);
-      ngoodruns++;
-    }
-    plugin->SetNrunsPerMaster(ngoodruns);
-  }
-
-  if(lhcPeriod=="LHC10c") { 
-    nruns=36;
-    Int_t runlist[36]={120829, 120825, 120824, 120823, 120822, 120821, 120820, 120758, 120750, 120741, 120671, 120617, 120616, 120505, 120504, 120503, 120244, 120079, 120076, 120073, 120072, 120069, 120067, 119862, 119859, 119856, 119853, 119849, 119846, 119845, 119844, 119842, 119841, 119163, 119161, 119159};
-   
-    for(Int_t k=0;k<nruns;k++){
-      if(runlist[k]<firstrun || runlist[k]>lastrun) continue;
-      plugin->AddRunNumber(runlist[k]);
-      ngoodruns++;
-    }
-    plugin->SetNrunsPerMaster(ngoodruns);
-  }
-
-  if(lhcPeriod=="LHC10dhighmu") { // only runs with high mu
-    nruns=19;
-    Int_t runlist[19]={124750, 124746, 124702, 124608, 124607, 124606, 124605, 124604, 124381, 124380, 124378, 124367, 124362, 124358, 124355, 124191, 124187, 122375, 122374};
-   
-    for(Int_t k=0;k<nruns;k++){
-      if(runlist[k]<firstrun || runlist[k]>lastrun) continue;
-      plugin->AddRunNumber(runlist[k]);
-      ngoodruns++;
-    }
-    plugin->SetNrunsPerMaster(ngoodruns);
-  }
-
-  if(lhcPeriod=="LHC10d") { // runs with high mu excluded
-    nruns=53;
-    Int_t runlist[53]={126437, 126432, 126425, 126424, 126422, 126409, 126408, 126407, 126406, 126405, 126404, 126403, 126359, 126352, 126351, 126350, 126285, 126284, 126283, 126168, 126167, 126160, 126158, 126097, 126090, 126088, 126082, 126081, 126078, 126073, 126008, 126007, 126004, 125855, 125851, 125850, 125849, 125848, 125847, 125844, 125843, 125842, 125633, 125632, 125630, 125296, 125134, 125101, 125100, 125097, 125085, 125023, 124751};
-   
-    for(Int_t k=0;k<nruns;k++){
-      if(runlist[k]<firstrun || runlist[k]>lastrun) continue;
-      plugin->AddRunNumber(runlist[k]);
-      ngoodruns++;
-    }
-    plugin->SetNrunsPerMaster(ngoodruns);
-  }
-
-
-  return ngoodruns;
-}