Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGJE / macros / AnalysisTrainPWGJets.C

diff --git a/PWGJE/macros/AnalysisTrainPWGJets.C b/PWGJE/macros/AnalysisTrainPWGJets.C
index 01ef4ca1376ee15de98e1ed994a31c990ad36e45..8da482f614c2115cbbc875b7c0fac63d15576120 100644 (file)
--- a/PWGJE/macros/AnalysisTrainPWGJets.C
+++ b/PWGJE/macros/AnalysisTrainPWGJets.C
@@ -22,6 +22,7 @@
 // ### General Steering variables
 // =============================================================================
 //== general setup variables
+Int_t       iRunFlag = 0;
 TString     kTrainName         = "testAnalysis"; // *CHANGE ME* (no blancs or special characters)
 TString     kJobTag            = "PWGJE Jet Tasks analysis train configured"; // *CHANGE ME*
 
@@ -41,7 +42,7 @@ Int_t       iAODanalysis       = 1;      // Analysis on input AOD's
 Int_t       iFilterAnalysis       = 0;      // Analysis on input AOD's
 Int_t       iAODhandler        = 1;      // Analysis produces an AOD or dAOD's
 Int_t       iCentralitySelection  = 0;      // Use the centrality
-Int_t       iESDfilter         = 0;      // ESD to AOD filter (barrel + muon tracks)
+Int_t       iESDfilter         = 1;      // ESD to AOD filter (barrel + muon tracks)
 Int_t       iPhysicsSelection  = 1;      // ESD to AOD filter (barrel + muon tracks)
 UInt_t      iPhysicsSelectionFlag = 1; // set by pyshics selection and passed to the task, kMB, kUserDefined etc
 Bool_t      useTender           = kFALSE; // use tender wagon 
@@ -85,7 +86,7 @@ Bool_t      kIsPbPb             = kFALSE;  // Pb+Pb
 Int_t       iJETAN             = 1;      // Jet analysis  // 1 write standard 2 write non-standard jets, 3 wrtie both
 Int_t       iJETANReader       = 0;      // Jet analysis  // DEV
 Int_t       iJETANFinder       = 0;      // Jet analysis  // DEV
-Int_t       iJETSUBTRACT        = 0;      // Jet background subtration
+Int_t       iJETSUBTRACT        = 1;      // Jet background subtration
 TList       kJetListSpectrum;             // list of jets contains TObjString of possible jet finder names
 TExMap      kJetMapSpectrum;             // Maps the jet finder pairs to be used in the spectrum task second number negative no pair other wise (j1+1) + (1000 * (j2+1)) +10000 * (j3+1)
 TExMap      kJetBackMapSpectrum;             // Maps the jet finder pairs with the background branch used, just for countint of trackrefs
@@ -339,7 +340,7 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
    }   
 
    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/ConfigLegoTrainPWGJE.C");
-   ConfigLegoTrainPWGJE(1013);
+   ConfigLegoTrainPWGJE(1008);
    // Create input handler (input container created automatically)
    if (iAODanalysis) {
    // AOD input handler
@@ -463,9 +464,9 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
    
    if (iESDfilter && !iAODanalysis) {
       //  ESD filter task configuration.
-      gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/AddTaskESDFilterPWG4Train.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/AddTaskESDFilterPWGJETrain.C");
       // switch on centrality make for PbPb
-      AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilterPWG4Train(kUseKinefilter); // carefull, if physics selection is enabled you may get not primary vertex pointer later on...
+      AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilterPWGJETrain(kUseKinefilter); // carefull, if physics selection is enabled you may get not primary vertex pointer later on...
       taskesdfilter->SetEnableFillAOD(!kFilterAOD);
       taskesdfilter->DisableV0s();
       taskesdfilter->DisableCascades();
@@ -958,7 +959,7 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
    if(iPWG4JetServices){
      gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/AddTaskJetServices.C");
      AliAnalysisTaskJetServices *taskjetServ = 0;
-     taskjetServ = AddTaskJetServices("/Users/kleinb/Dropbox/SharedJets/Christian/Files/PWG4_JetTasksOutput_110818a.root");
+     taskjetServ = AddTaskJetServices();
      if (!taskjetServ) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetServices cannot run for this train conditions - EXCLUDED");
      if(kGridRunRange[0]>0)taskjetServ->SetRunRange(kGridRunRange[0],kGridRunRange[1]);
      else taskjetServ->SetRunRange(110000,160000);
@@ -970,12 +971,14 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
      taskjetServ->SetZVertexCut(fVertexWindow);
      taskjetServ->SetFilterMask(kHighPtFilterMask);
 
+     taskjetServ->SetDebugLevel(10);
+
+
      if(kIsPbPb)taskjetServ->SetCollisionType(AliAnalysisTaskJetServices::kPbPb);
      else taskjetServ->SetCollisionType(AliAnalysisTaskJetServices::kPP);
      if(kIsPbPb){
        if(kDeltaAODJetName.Length()>0&&kFilterAOD)taskjetServ->SetFilterAODCollisions(kTRUE);
        //       else if(iAODanalysis)taskjetServ->SetFilterAODCollisions(kTRUE);
-       //       taskjetServ->SetDebugLevel(3);
      }
      if(iAODanalysis){
        //  
@@ -1484,7 +1487,7 @@ void CheckModuleFlags(const char *mode) {
    }
 
    // Decide if we have PbPb
-   if(kGridDataSet.CompareTo("LHC10h")==0||kGridDataSet.Contains("LHC10h")) {
+   if(kGridDataSet.CompareTo("LHC10h")==0||kGridDataSet.Contains("LHC10h")||kGridDataSet.CompareTo("LHC11h")==0||kGridDataSet.Contains("LHC11h")) {
      Printf("Using settings for Pb+Pb");
      kIsPbPb = true;
    }
@@ -1558,9 +1561,6 @@ void CheckModuleFlags(const char *mode) {
        iPWG4PtQAMC        = 0;
        if( iPWG4CorrectionsUE)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4 CorrectionsUE disabled in analysis without MC");
        iPWG4CorrectionsUE = 0;
-     }
-     if (iJETAN || iJETANReader || iJETANFinder){
-       iESDfilter=0;
      }
       if (!iESDfilter){
        kUseKinefilter = kFALSE;
@@ -1816,7 +1816,7 @@ Bool_t LoadAnalysisLibraries(const char *mode)
    }
 
    if(iPWG4JetTasks){
-     if (!LoadLibrary("PWGBase", mode, kTRUE)) return kFALSE;
+     if (!LoadLibrary("PWGTools", mode, kTRUE)) return kFALSE;
      if (!LoadLibrary("PWGJE", mode, kTRUE)) return kFALSE;
    }