]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/macros/AnalysisTrainPWG4Jets.C
adding TPC cosntrained tracks back in for comparison
[u/mrichter/AliRoot.git] / PWG4 / macros / AnalysisTrainPWG4Jets.C
index 3f2ead7603ebb690f3d0bac6d2e93fa4427a9047..edfd341aa04ab298445fa11f1614009787339aac 100644 (file)
@@ -31,12 +31,14 @@ TString     kJobTag            = "PWG4 Jet Tasks analysis train configured"; //
 // AliRoot.
 Bool_t      kUsePAR             = kFALSE;  // use par files for extra libs
 Bool_t      kUseCPAR            = kFALSE;  // use par files for common libs
-Bool_t      kFillAOD = kFALSE;  // switch of AOD filling for on the fly analysis
+Bool_t      kFillAOD = kTRUE;  // switch of AOD filling for on the fly analysis
 Bool_t      kFilterAOD = kTRUE;
+Float_t     kJetTriggerPtCut = 20; // pT for jet trigger in case of iFilter==2
 Int_t       kSaveAOD = 8;        // Bit switch 1 = Full AOD 2 = Jet AOD , 4 = PartCorr, 8 = JCORRAN 
 //== general input and output variables
 
 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)
@@ -82,10 +84,16 @@ Bool_t      kIsPbPb             = kFALSE;  // Pb+Pb
 //==============================================================================
 Int_t       iJETAN             = 1;      // Jet analysis (PWG4) // 1 write standard 2 write non-standard jets, 3 wrtie both
 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
+Int_t       kJetMapOffset[3] = {10000,100,1};
 TString     kDefaultJetBranch     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
 TString     kDefaultJetBackgroundBranch            = "";      // is currently set when filled (jet clsuters  
+TString     kDefaultJetBackgroundBranchCut1        = "";      // is currently set when filled (jet clsuters  
 TString     kDefaultJetBackgroundBranch_extra     = "";      // is currently set when filled (jet clsuters) 
 TString     kJetSubtractBranches     = "";      // is currently set when filled (jet clsuters  
+TString     kJetSubtractBranchesCut1     = "";      // is currently set when filled (jet clsuters  
 TString     kJetSubtractBranches_extra     = "";      // is currently set when filled (jet clsuters  
 
 TString     kDefaultJetBranchMC     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
@@ -107,9 +115,10 @@ Int_t       iPWG4UE            = 0;      // Underlying Event analysis
 Int_t       iPWG4LeadingUE     = 0;      // Underlying Event analysis
 Int_t       iPWG4CorrectionsUE = 0;      // Underlying Event analysis
 Int_t       iPWG4TmpSourceSara = 0;      // Underlying Event analysis not in svn
-Int_t       iPWG4Fragmentation = 0;      // Official Fragmentation
+Int_t       iPWG4Fragmentation = 1;      // Official Fragmentation
 Int_t       iPWG4JetChem       = 0;      // Jet chemistry 
 Int_t       iPWG4PtQAMC        = 0;      // Marta's QA tasks 
+Int_t       iPWG4PtTrackQA     = 0;      // Marta's QA tasks  
 Int_t       iPWG4PtSpectra     = 0;      // Marta's QA tasks 
 Int_t       iPWG4PtQATPC       = 0;      // Marta's QA tasks 
 Int_t       iPWG4Cosmics     = 0;      // Marta's Cosmics Taks 
@@ -130,6 +139,7 @@ Int_t       iPWG4GammaConv     = 0;      // Gamma Conversio
 Int_t       iPWG4CaloConv     = 0;      // Gamma Conversio
 Int_t       kHighPtFilterMask  = 32;     // change depending on the used AOD Filter
 TString     kDeltaAODJetName   = "AliAOD.Jets.root";     
+TString     kDeltaAODJetNameInput   = "";     
 TString     kDeltaAODJCORRANName   = "AliAOD.JCORRAN.root";     
 TString     kDeltaAODPartCorrName   = "AliAOD.PartCorr.root";     
 TString     kFastEmbeddingAOD  = "emb/AliAOD.root";
@@ -158,8 +168,8 @@ Int_t       kProofOffset = 0;
 //== grid plugin setup variables
 Bool_t      kPluginUse         = kTRUE;   // do not change
 Bool_t      kPluginUseProductionMode  = kFALSE;   // use the plugin in production mode
-TString     kPluginRootVersion       = "v5-27-06b";  // *CHANGE ME IF MORE RECENT IN GRID*
-TString     kPluginAliRootVersion    = "v4-19-15-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
+TString     kPluginRootVersion       = "v5-28-00c";  // *CHANGE ME IF MORE RECENT IN GRID*
+TString     kPluginAliRootVersion    = "v4-21-01a-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
 Bool_t      kPluginMergeViaJDL       = kTRUE;  // merge via JDL
 Bool_t      kPluginFastReadOption   = kFALSE;  // use xrootd tweaks
 Bool_t      kPluginOverwriteMode    = kTRUE;  // overwrite existing collections
@@ -174,6 +184,7 @@ Int_t         kGridOffsetRunFromList = 0; // skip the first n runs from the list
 TString     kGridLocalRunList = "";
 TString     kGridOutdir       = ""; // AliEn output directory. If blank will become output_<kTrainName>
 TString     kGridDataSet      = ""; // sub working directory not to confuse different run xmls 
+TString     kGridExtraAliendirLevel = ""; // sub working directory not to confuse different run xmls 
 Int_t         kGridRunRange[2]       =  {0, -1}; // Set the run range
 TString     kGridRunPattern        = "%03d"; // important for leading zeroes!!
 TString     kGridPassPattern       = "";
@@ -205,6 +216,7 @@ TString anaLibsExtra = "";
 TString anaSources = "";
 // Function signatures
 class AliAnalysisAlien;
+class AliAnalysisManager;
 
 //______________________________________________________________________________
 void AnalysisTrainPWG4Jets(const char *analysis_mode="local", 
@@ -268,6 +280,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    printf(printMask,"PWG4 Leading UE",iPWG4LeadingUE); 
    printf(printMask,"PWG4 Corrections UE",iPWG4CorrectionsUE); 
    printf(printMask,"PWG4 Pt QA MC",iPWG4PtQAMC);
+   printf(printMask,"PWG4 Pt QA track",iPWG4PtTrackQA);
    printf(printMask,"PWG4 Pt Spectra",iPWG4PtSpectra);
    printf(printMask,"PWG4 Pt QA TPC",iPWG4PtQATPC);     
    printf(printMask,"PWG4 Cosmics",iPWG4Cosmics);     
@@ -321,7 +334,10 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    // AOD input handler
       AliAODInputHandler *aodH = new AliAODInputHandler();
       mgr->SetInputEventHandler(aodH);
-      //      if (iPWG4JetTasks) aodH->AddFriend(Form("deltas/%s",kDeltaAODJetName.Data()));
+      if (kDeltaAODJetNameInput.Length()){
+       Printf("Adding Friend %s",kDeltaAODJetNameInput.Data());
+       aodH->AddFriend(kDeltaAODJetNameInput.Data());
+      }
       //      if (iPWG4PartCorr) aodH->AddFriend(Form("deltas/%s"kDeltaAODJetName.Data()));
    } else {   
    // ESD input handler
@@ -384,16 +400,26 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    //                                                                                                                              
 
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
       AliAnalysisTaskSE *tender = AddTaskTender(kTRUE);
       //      tender->SelectCollisionCandidates();                                                                                      
       tender->SetDebugLevel(2);
    }
 
+   
+   Float_t fTrackEtaWindow = 0.9;
+   Float_t fJetEtaWindow   = 0.5;
+
+   /*
+   if(kIsPbPb){// for pass1
+     Float_t fTrackEtaWindow = 0.8;
+     Float_t fJetEtaWindow   = 0.4;
+   }
+   */
 
 
    if(iPhysicsSelection && !iAODanalysis){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/ANALYSIS/macros/AddTaskPhysicsSelection.C");
+     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
      Int_t iTriggerHIC = 0;
      Bool_t rejectBkg = true;
      if(kIsPbPb){
@@ -401,26 +427,39 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        rejectBkg = false; // for the moment...
      }
      AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kIsMC,rejectBkg);  
-     iPhysicsSelectionFlag = AliVEvent::kMB;
+
      mgr->RegisterExtraFile("EventStat_temp.root");
      mgr->AddStatisticsTask();
    }
-
-   if(iCentralitySelection){
+   else{
+     iPhysicsSelectionFlag = AliVEvent::kMB;
+   }
+   
+   if(kIsPbPb&&!iAODanalysis){
 
      // has to run before AOD filter
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/ANALYSIS/macros/AddTaskCentrality.C");
-     //     const char* file1="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137161.root";
-     //     const char* file2="$ALICE_ROOT/ANALYSIS/macros/AliCentralityByFunction_137161.root";
+     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
      AliCentralitySelectionTask *taskC = AddTaskCentrality();
       if (!taskC) ::Warning("AnalysisTrainPWG4Jets", "AliCentralitySelectionTask cannot run for this train conditions - EXCLUDED");
-   }
 
+
+     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskEventplane.C");
+     AliEPSelectionTask *taskEP = AddTaskEventplane();
+     if (!taskEP) ::Warning("AnalysisTrainPWG4Jets", "AliEventplan cannot run for this train conditions - EXCLUDED");
+   }
+   
    if (iESDfilter && !iAODanalysis) {
       //  ESD filter task configuration.
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskESDFilterPWG4Train.C");
-      AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(kUseKinefilter,kUseMuonfilter);
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskESDFilterPWG4Train.C");
+      // switch on centrality make for PbPb
+      AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(kUseKinefilter); // carefull, if physics selection is enabled you may get not primary vertex pointer later on...
       taskesdfilter->SetEnableFillAOD(!kFilterAOD);
+      taskesdfilter->DisableV0s();
+      taskesdfilter->DisableCascades();
+      taskesdfilter->DisableKinks();
+      taskesdfilter->DisablePmdClusters();
+      taskesdfilter->DisableCaloClusters();
+      taskesdfilter->DisableCells();
 
       if(kIsMC){
        mgr->RegisterExtraFile("pyxsec_hists.root");
@@ -441,7 +480,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    }   
 
    if (iPWG4FastEmbedding) {
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskFastEmbedding.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFastEmbedding.C");
      AliAnalysisTaskFastEmbedding *taskEmbedding = 0;
      if(kFastEmbAODList.Length()) taskEmbedding = AddTaskFastEmbedding(kFastEmbAODList, 1);
      else                         taskEmbedding = AddTaskFastEmbedding(kFastEmbeddingAOD, 0);
@@ -452,7 +491,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
     // Jet analysis
    if (iJETAN) {
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJets.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJets.C");
       AliAnalysisTaskJets *taskjets = 0;
       if(iJETAN&1){
        /*
@@ -466,30 +505,56 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        
        taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
        if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       TString cTmp("");       
+       cTmp = taskjets->GetNonStdBranch();
+       if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
+
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,2.,0); // no background subtraction
+       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       TString cTmp("");       
+       cTmp = taskjets->GetNonStdBranch();
+       if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
+
 
        // STANDARD UA jet finders pT cut 1 GeV background mode 2 R = 0.4
        if(kIsPbPb){
          taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
          if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+         cTmp = taskjets->GetNonStdBranch();
+         if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
+         taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,2.,2); // background subtraction
+         if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+         cTmp = taskjets->GetNonStdBranch();
+         if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
        }
 
-       TString cTmp("");
+
 
        // SICONE 
+       /*
        taskjets = AddTaskJets("AOD","SISCONE",0.4,kHighPtFilterMask,0.15,0); //no background subtraction to be done later....
        if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
        cTmp = taskjets->GetNonStdBranch();
        if(cTmp.Length()>0)kJetSubtractBranches += Form("%s ",cTmp.Data());
-
+       if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
+       */
        if(kUseAODMC){
          // STANDARD UA jet finders pT cut 1 GeV background mode 2 R = 0.4
          if(kIsPbPb){
            taskjets = AddTaskJets("AODMC","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
+           cTmp = taskjets->GetNonStdBranch();
+           if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
            taskjets = AddTaskJets("AODMC2","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
+           cTmp = taskjets->GetNonStdBranch();
+           if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
          }
          else{
            taskjets = AddTaskJets("AODMC","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
+           cTmp = taskjets->GetNonStdBranch();
+           if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
            taskjets = AddTaskJets("AODMC2","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
+           cTmp = taskjets->GetNonStdBranch();
+           if(cTmp.Length())kJetListSpectrum.Add(new TObjString(cTmp.Data()));
          }
        }
        if(kDeltaAODJetName.Length()>0)mgr->RegisterExtraFile(kDeltaAODJetName.Data()); 
@@ -515,7 +580,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    }
 
    if(iPWG4Cluster){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetCluster.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetCluster.C");
      AliAnalysisTaskJetCluster *taskCl = 0;
      Float_t fCenUp = 0;
      Float_t fCenLo = 0;
@@ -526,101 +591,183 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if(iPWG4Cluster&1){
 
        if(kIsPbPb){
-        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow,0); // this one is for the background and random jets, random cones with no skip
         taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetNRandomCones(1);
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
+        //      taskCl->SetDebugLevel(11);
         taskCl->SetCentralityCut(fCenLo,fCenUp);
-        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
         kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
-        
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+        kJetListSpectrum.Add(new TObjString(Form("%sRandomConeSkip%02d",taskCl->GetJetOutputBranch(),0)));
+        kJetListSpectrum.Add(new TObjString(Form("%sRandomCone_random",taskCl->GetJetOutputBranch())));
+        kJetSubtractBranches += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomConeSkip00");
+        kJetSubtractBranches += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomCone_random");
+
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),2.0,fTrackEtaWindow,0); // this one is for the background and random jets, random cones with no skip
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
+        taskCl->SetNRandomCones(1);
+        taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        kDefaultJetBackgroundBranchCut1 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+        kJetSubtractBranchesCut1 += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomConeSkip00");
+        kJetSubtractBranchesCut1 += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomCone_random");
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+        kJetListSpectrum.Add(new TObjString(Form("%sRandomConeSkip%02d",taskCl->GetJetOutputBranch(),0)));
+        kJetListSpectrum.Add(new TObjString(Form("%sRandomCone_random",taskCl->GetJetOutputBranch())));
+
          if (iPWG4FastEmbedding) {
            AliAnalysisTaskJetCluster *taskClEmb = 0;
-           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
            taskClEmb->SetBackgroundCalc(kTRUE);
            taskClEmb->SetCentralityCut(fCenLo,fCenUp);
-           taskClEmb->SetGhostEtamax(0.9);
+           taskClEmb->SetGhostEtamax(fTrackEtaWindow);
+          if(iAODanalysis==2)taskClEmb->SetAODTrackInput(kTRUE);
           kDefaultJetBackgroundBranch_extra = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskClEmb->GetJetOutputBranch());
 
-           taskClEmb = AddTaskJetCluster("AODextraonly","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+           taskClEmb = AddTaskJetCluster("AODextraonly","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+          taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
            taskClEmb->SetBackgroundCalc(kFALSE);
            taskClEmb->SetCentralityCut(fCenLo,fCenUp);
-           taskClEmb->SetGhostEtamax(0.9);
-
-           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15);
+           taskClEmb->SetGhostEtamax(fTrackEtaWindow);
+          if(iAODanalysis==2)taskClEmb->SetAODTrackInput(kTRUE);
+          
+           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15,fTrackEtaWindow);
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
            taskClEmb->SetCentralityCut(fCenLo,fCenUp);
            taskClEmb->SetBackgroundBranch(kDefaultJetBackgroundBranch_extra.Data());
            kJetSubtractBranches_extra += Form("%s ",taskClEmb->GetJetOutputBranch());
+          if(iAODanalysis==2)taskClEmb->SetAODTrackInput(kTRUE);
 
-           taskClEmb = AddTaskJetCluster("AODextraonly","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15);
+           taskClEmb = AddTaskJetCluster("AODextraonly","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15,fTrackEtaWindow);
            taskClEmb->SetCentralityCut(fCenLo,fCenUp);
+          if(iAODanalysis==2)taskClEmb->SetAODTrackInput(kTRUE);
          }
 
         taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.2,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
         taskCl->SetBackgroundCalc(kTRUE);
         taskCl->SetCentralityCut(fCenLo,fCenUp);
-        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
        }
        else{
         taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1,kDeltaAODJetName.Data(),0.15); // this one is for the background jets
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
         taskCl->SetBackgroundCalc(kTRUE);
         kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
-        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
 
         taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1,kDeltaAODJetName.Data(),0.15); 
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
         taskCl->SetBackgroundCalc(kTRUE);
-        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
        } 
 
        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,2,1,kDeltaAODJetName.Data(),0.15);
+       taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
        taskCl->SetCentralityCut(fCenLo,fCenUp);
        if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
-       taskCl->SetNRandomCones(10);
-       kDefaultJetBranch = taskCl->GetJetOutputBranch();
-       if(kDeltaAODJetName.Length()==0&&kFilterAOD){
-        if(kIsPbPb)taskCl->SetJetTriggerPtCut(40.);
-        else taskCl->SetJetTriggerPtCut(20.);
+
+
+       if(iFilterAnalysis==2){
+        taskCl->SetJetTriggerPtCut(kJetTriggerPtCut);
        }
 
+
+       //       taskCl->SetDebugLevel(3);
+       taskCl->SetNRandomCones(1);
+       if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       kDefaultJetBranch = taskCl->GetJetOutputBranch();
        kJetSubtractBranches += Form("%s ",taskCl->GetJetOutputBranch());
-  
+       kJetSubtractBranches += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomConeSkip02");
+       kJetSubtractBranches += Form("%s%s ",taskCl->GetJetOutputBranch(),"RandomCone_random");
+       kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+       kJetListSpectrum.Add(new TObjString(Form("%sRandomConeSkip%02d",taskCl->GetJetOutputBranch(),2)));
+       kJetListSpectrum.Add(new TObjString(Form("%sRandomCone_random",taskCl->GetJetOutputBranch())));
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,2,1,kDeltaAODJetName.Data(),2.0);
+       taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchCut1.Data());
+       kJetSubtractBranchesCut1 += Form("%s ",taskCl->GetJetOutputBranch());
+       kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+
+       // tmp track qa...
+       taskCl = AddTaskJetCluster("AOD","",1<<8,iPhysicsSelectionFlag,"ANTIKT",0.4,2,1,kDeltaAODJetName.Data(),2.0);
+       taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetFilterMask(1<<4|1<<8,1);
+
        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data(),0.15);
        taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
+       if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
        if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
        kJetSubtractBranches += Form("%s ",taskCl->GetJetOutputBranch());
+       kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
 
        if(kUseAODMC){
         if(kIsPbPb){
-          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+          taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
           taskCl->SetBackgroundCalc(kTRUE);
           taskCl->SetGhostEtamax(0.9);
           kDefaultJetBackgroundBranchMC = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
-          
+          if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);     
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
+
           taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
           taskCl->SetBackgroundCalc(kTRUE);
-          taskCl->SetGhostEtamax(0.9);
-          kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch()); 
+          taskCl->SetGhostEtamax(fTrackEtaWindow);
+          kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch(),fTrackEtaWindow); 
+          if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+          kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
         }
         else{
-          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+          taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
           taskCl->SetBackgroundCalc(kTRUE);
-          taskCl->SetGhostEtamax(0.9);
+          taskCl->SetGhostEtamax(fTrackEtaWindow);
           kDefaultJetBackgroundBranchMC = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
-          
-          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));       
+
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+          taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
           taskCl->SetBackgroundCalc(kTRUE);
-          taskCl->SetGhostEtamax(0.9);
+          taskCl->SetGhostEtamax(fTrackEtaWindow);
           kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch()); 
+          if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+          kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
           // pp background calcs...
         }
         
-        taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
-        taskCl->SetGhostEtamax(0.9);
+        taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); 
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
         if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC.Data());   
         kDefaultJetBranchMC = taskCl->GetJetOutputBranch();
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
 
-        taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow);
+        taskCl->SetEventSelection(kTRUE); // saves some computing time, not all vertices are processed
         if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC2.Data());  
         kDefaultJetBranchMC2 = taskCl->GetJetOutputBranch();
-
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        kJetListSpectrum.Add(new TObjString(taskCl->GetJetOutputBranch()));
        }
        
        
@@ -629,31 +776,58 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    }
 
 
-   if(iJETSUBTRACT){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetBackgroundSubtract.C");
+   if(iJETSUBTRACT&&kJetSubtractBranches.Length()){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetBackgroundSubtract.C");
      AliAnalysisTaskJetBackgroundSubtract *taskSubtract = 0;
      if(kJetSubtractBranches.Length()){
 
-       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches,3,kJetSubtractMask1.Data(),kJetSubtractMask2.Data());
-       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data()); 
-       if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
 
-       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches,2,kJetSubtractMask1.Data(),kJetSubtractMask2.Data());
-       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());          taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
-       if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       
-       //      taskSubtract->SetDebugLevel(3);
-       
-       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches,1,kJetSubtractMask1.Data(),kJetSubtractMask2.Data());
-       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());          taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
+
+
+       for(int iB = 1;iB<3;iB++){
+        if(iB>2)continue;
+        taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches,iB,kJetSubtractMask1.Data(),kJetSubtractMask2.Data());
+        taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());         taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
+        if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
+        //      taskSubtract->SetDebugLevel(10);
+        TString cTmp;       
+        TObjArray *objArr = kJetSubtractBranches.Tokenize(" ");
+        for(int iJB = 0;iJB<objArr->GetEntries();iJB++){
+          TObjString *ostr = (TObjString*)objArr->At(iJB);
+          cTmp = ostr->GetString().Data();
+          cTmp.ReplaceAll(kJetSubtractMask1.Data(),Form(kJetSubtractMask2.Data(),iB));
+          kJetListSpectrum.Add(new TObjString(cTmp.Data()));
+        }
+        
+        //     taskSubtract->SetDebugLevel(3);
+        if(iB==2){
+          if(kJetSubtractBranches.Contains(kDefaultJetBranch.Data())&&kIsPbPb){
+            kDefaultJetBranch.ReplaceAll(taskSubtract->GetToReplace(),Form(taskSubtract->GetReplacementMask(),taskSubtract->GetSubtractionMethod()));
+          }
+        }
+        
+       }
+
+       //
+       // cut1
+       Int_t iB = 2;
+       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranchesCut1,iB,kJetSubtractMask1.Data(),kJetSubtractMask2.Data(),"Cut2000");
+       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranchCut1.Data());              
+       taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
        if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       
-       if(kJetSubtractBranches.Contains(kDefaultJetBranch.Data())&&kIsPbPb){
-        kDefaultJetBranch.ReplaceAll(taskSubtract->GetToReplace(),Form(taskSubtract->GetReplacementMask(),taskSubtract->GetSubtractionMethod()));
+
+       objArr = kJetSubtractBranchesCut1.Tokenize(" ");
+       for(int iJB = 0;iJB<objArr->GetEntries();iJB++){
+        TObjString *ostr = (TObjString*)objArr->At(iJB);
+        cTmp = ostr->GetString().Data();
+        cTmp.ReplaceAll(kJetSubtractMask1.Data(),Form(kJetSubtractMask2.Data(),iB));
+        kJetListSpectrum.Add(new TObjString(cTmp.Data()));
        }
+
+
      }
      if(kJetSubtractBranches_extra.Length()){
-       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches_extra,1,kJetSubtractMask1.Data(),kJetSubtractMask2.Data(),"extra");
+       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches_extra,2,kJetSubtractMask1.Data(),kJetSubtractMask2.Data(),"extra");
        taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch_extra.Data());
        taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
        //taskSubtract->SetDebugLevel(3);
@@ -666,7 +840,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    }
 
    if (iDIJETAN) {
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskDiJets.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskDiJets.C");
       AliAnalysisTaskDiJets *taskdijets = 0;
       if(iDIJETAN&1)taskdijets = AddTaskDiJets(); 
       if (!taskdijets) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJets cannot run for this train conditions - EXCLUDED");
@@ -681,7 +855,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    }
 
    if(iPWG1QASym){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG1/PilotTrain/AddTaskQAsym.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG1/PilotTrain/AddTaskQAsym.C");
      AliAnalysisTaskQASym *taskQASym = AddTaskQAsym(-1);
      if (!taskQASym) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQASym cannot run for this train conditions - EXCLUDED");
    }
@@ -689,14 +863,14 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
 
    if(iPWG4TmpSourceSara){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskEta.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskEta.C");
      AliAnalysisTaskEta *taskEta = AddTaskEta();
      if (!taskEta) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskEta cannot run for this train conditions - EXCLUDED");
    }
 
 
    if(iPWG4JetServices){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetServices.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetServices.C");
      AliAnalysisTaskJetServices *taskjetServ = 0;
      taskjetServ = AddTaskJetServices();
      if (!taskjetServ) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetServices cannot run for this train conditions - EXCLUDED");
@@ -706,109 +880,170 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      taskjetServ->SetUsePhysicsSelection((Bool_t)iPhysicsSelection);
      taskjetServ->SetPhysicsSelectionFlag(iPhysicsSelectionFlag); // 
      taskjetServ->SetNonStdFile(kDeltaAODJetName.Data());
+     taskjetServ->SetTrackEtaWindow(fTrackEtaWindow);
+     taskjetServ->SetFilterMask(kHighPtFilterMask);
+     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);
        taskjetServ->SetZVertexCut(8.);
      }
      if(iAODanalysis){
-       //       taskjetServ->SetDebugLevel(3);
+       //  
        taskjetServ->SetAODInput(kTRUE);
      }
    }
 
-if(iPWG4JetSpectrum){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetSpectrum2.C");
+   if(iPWG4JetSpectrum){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetSpectrum2.C");
      AliAnalysisTaskJetSpectrum2 *taskjetSpectrum = 0;
+     TString bkgClusters = kDefaultJetBackgroundBranch.Data(); 
+     bkgClusters.ReplaceAll(Form("%s_",AliAODJetEventBackground::StdBranchName()),"");
+     Printf("############# Possible jet branches ###################");
+     for(int iJF = 0;iJF < kJetListSpectrum.GetSize();iJF++){
+       TObjString *objStr = (TObjString*)kJetListSpectrum.At(iJF);
+       Printf("%3d: %s",iJF+1,objStr->GetString().Data());
+     }
+
+     // Printf("Type q to exit");if(getchar()=='q')return;
      if(iPWG4JetSpectrum&1){
        if(kIsPbPb){
-        for(int i = 0;i<5;i++){
-          TString tmp(kDefaultJetBranch.Data());
-          //      tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),1),kJetSubtractMask1.Data());
-          //      tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),1),kJetSubtractMask1.Data());
-          tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),1),Form(kJetSubtractMask1.Data(),0));
-
-          TString bkgClusters = kDefaultJetBackgroundBranch.Data(); 
-          bkgClusters.ReplaceAll(Form("%s_",AliAODJetEventBackground::StdBranchName()),"");
-          taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),tmp.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,i);
-          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
-          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
-
-          //      taskjetSpectrum->SetDebugLevel(3);
-          //      taskjetSpectrum->SetMinJetPt(10);
-          taskjetSpectrum->SetTrackEtaWindow(0.8);
-          taskjetSpectrum->SetJetEtaWindow(0.4);
-          if(iAODanalysis)SetAODInput(taskjetSpectrum);
-
+        for(int iJF = 0;iJF < kJetListSpectrum.GetSize();iJF++){
+          Long64_t value = kJetMapSpectrum(iJF+1);
+          Printf("iJF: %d value: %d", iJF+1,(Int_t)value);
+          if(value==0)continue;
+          TObjString *objStr = (TObjString*)kJetListSpectrum.At(iJF);
+          TString bName1 = objStr->GetString().Data();
+          TString bName2[3];
           
-          // check the old subtracted vs. the new subtracted
-          TString tmp2(kDefaultJetBranch.Data());
-          tmp2.ReplaceAll(Form(kJetSubtractMask2.Data(),1),Form(kJetSubtractMask2.Data(),2));
-          taskjetSpectrum = AddTaskJetSpectrum2(tmp2.Data(),kDefaultJetBranch.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,i);
-          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
-          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
-          //      taskjetSpectrum->SetDebugLevel(3);
-          //      taskjetSpectrum->SetMinJetPt(10);
-          taskjetSpectrum->SetTrackEtaWindow(0.8);
-          taskjetSpectrum->SetJetEtaWindow(0.4);
-          if(iAODanalysis)SetAODInput(taskjetSpectrum);
+          TObjString *objStrBkg = (TObjString*)kJetListSpectrum.At(iJF);
+          TString bBkgName1(""); 
+          TString bBkgName2[3];
+          
+          Long64_t valueBkg1 = kJetBackMapSpectrum(iJF+1);
+          if(valueBkg1>0){
+            TObjString *objStrBkg = (TObjString*)kJetListSpectrum.At(valueBkg1-1);
+            bBkgName1 = objStrBkg->GetString().Data();
+          }
+          Int_t iPartner = 0;
+          if(value>0){
+            Int_t iJF2 = -1; 
+            for(int i = 0;i<3;i++){
+              iJF2 = value/kJetMapOffset[i]-1;
+              value = value%kJetMapOffset[i];
+              Printf("%d %d", iJF2+1,(Int_t)value);
+              if(iJF2>=0&&iJF2<kJetListSpectrum.GetSize()){
+                TObjString *objStr2 = (TObjString*)kJetListSpectrum.At(iJF2);
+                bName2[iPartner] = objStr2->GetString().Data();
+                Long64_t valueBkg2 = kJetBackMapSpectrum(iJF2+1);
+                if(valueBkg2>0){
+                  TObjString *objStrBkg2 = (TObjString*)kJetListSpectrum.At(valueBkg2-1);
+                  bBkgName2[iPartner] = objStrBkg2->GetString().Data();
+                }
+                iPartner++;
+              }
+            }
+          }
+          
+          
+          // loop over all centralities
+          for(int ic = 0;ic<5;ic++){
+            if(ic!=0)continue;
+            Bool_t bDone = kFALSE;
+            for(int i = 0;i<TMath::Max(iPartner,1);i++){
+              if(bName2[i].Length()){
+                taskjetSpectrum = AddTaskJetSpectrum2(bName1.Data(),bName2[i].Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,ic);
+                bDone = kTRUE; 
+              }
+              else{
+                if(!bDone){
+                  taskjetSpectrum = AddTaskJetSpectrum2(bName1.Data(),bName2[i].Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,ic);
+                  bDone = kTRUE; 
+                }
+                else{
+                  continue;
+                }
+              }
+              Printf("%s/%s %s/%s",bName1.Data(),bBkgName1.Data(),bName2[i].Data(),bBkgName2[i].Data());
+
+              // setting all the other things...
+              taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+              taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+
+              // negative values do not fill the track histos
+              taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,-1);
+              taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGen,-1);              
+              if(!bName1.Contains("ANTIKT")||bName1.Contains("Cone")){
+                taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,-1);
+                taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRec,-1);            
+              }
+
+
+              if(bName2[i].Length()==0){
+                taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+                taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGen,0);
+              }
+              if(iAODanalysis==1){
+                taskjetSpectrum->SetAODJetInput(kTRUE);
+                taskjetSpectrum->SetAODTrackInput(kTRUE);
+              }
+              else if (iAODanalysis==2){
+                taskjetSpectrum->SetAODTrackInput(kTRUE);
+                taskjetSpectrum->SetAODJetInput(kFALSE);
+              }
+              //              taskjetSpectrum->SetDebugLevel(11);
+              taskjetSpectrum->SetBranchBkgRec(bBkgName1.Data());
+              taskjetSpectrum->SetBranchBkgGen(bBkgName2[i].Data());
+            } 
+          }
+        }
+       }
+       else{ // ! PbPb
+        Int_t i = 0;
 
-          // check the old subtracted vs. the new subtracted
-          TString tmp3(kDefaultJetBranch.Data());
-          tmp3.ReplaceAll(Form(kJetSubtractMask2.Data(),1),Form(kJetSubtractMask2.Data(),3));
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),
+                                              "",kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+        
 
-          taskjetSpectrum = AddTaskJetSpectrum2(tmp3.Data(),kDefaultJetBranch.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,i);
-          //      taskjetSpectrum->SetDebugLevel(3);
+        
+        if(kDefaultJetBranchMC.Length()){
+          taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),
+                                              kDefaultJetBranchMC.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
           //      taskjetSpectrum->SetMinJetPt(10);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
           taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
           taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
-          taskjetSpectrum->SetTrackEtaWindow(0.8);
-          taskjetSpectrum->SetJetEtaWindow(0.4);
           if(iAODanalysis)SetAODInput(taskjetSpectrum);
-
-
-          taskjetSpectrum = AddTaskJetSpectrum2(Form("jetsAOD_UA104_B2_Filter%05d_Cut01000",kHighPtFilterMask),kDefaultJetBranch.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,i);
-          //      taskjetSpectrum->SetDebugLevel(3);
+        }
+        if(kDefaultJetBranchMC2.Length()){
+          taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),
+                                                kDefaultJetBranchMC2.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
           //      taskjetSpectrum->SetMinJetPt(10);
-          taskjetSpectrum->SetTrackEtaWindow(0.8);
-          taskjetSpectrum->SetJetEtaWindow(0.4);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
           taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
           taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
           if(iAODanalysis)SetAODInput(taskjetSpectrum);
-
         }
-       }
-       else{ // ! PbPb
-        Int_t i = 0;
-        TString tmp(kDefaultJetBranch.Data());
-        //        tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),1),kJetSubtractMask1.Data());
-        //        tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),1),kJetSubtractMask1.Data());
-        tmp.ReplaceAll(Form(kJetSubtractMask2.Data(),0),Form(kJetSubtractMask1.Data(),1));
-        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),tmp.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,kFALSE,0,i);
-        taskjetSpectrum->SetDebugLevel(3);
-        //        taskjetSpectrum->SetMinJetPt(10);
-        taskjetSpectrum->SetTrackEtaWindow(0.8);
-        taskjetSpectrum->SetJetEtaWindow(0.4);
-        taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
-        taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
-        if(iAODanalysis)SetAODInput(taskjetSpectrum);
-        
 
+        /*
         TString tmp2(kDefaultJetBranch.Data());
         tmp2.ReplaceAll(Form(kJetSubtractMask2.Data(),0),Form(kJetSubtractMask2.Data(),2));
-        taskjetSpectrum = AddTaskJetSpectrum2(tmp2.Data(),kDefaultJetBranch.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,kFALSE,0,i);
+        taskjetSpectrum = AddTaskJetSpectrum2(tmp2.Data(),kDefaultJetBranch.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
         //      taskjetSpectrum->SetDebugLevel(3);
         //        taskjetSpectrum->SetMinJetPt(10);
         taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
         taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
-x       taskjetSpectrum->SetTrackEtaWindow(0.8);
+        taskjetSpectrum->SetTrackEtaWindow(0.8);
         taskjetSpectrum->SetJetEtaWindow(0.4);
 
         // check the old subtracted vs. the new subtracted
         TString tmp3(kDefaultJetBranch.Data());
         tmp3.ReplaceAll(Form(kJetSubtractMask2.Data(),0),Form(kJetSubtractMask2.Data(),3));
-        taskjetSpectrum = AddTaskJetSpectrum2(tmp3.Data(),kDefaultJetBranch.Data(),"",kHighPtFilterMask,AliVEvent::kMB,0,kFALSE,0,i);
+        taskjetSpectrum = AddTaskJetSpectrum2(tmp3.Data(),kDefaultJetBranch.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
         //      taskjetSpectrum->SetDebugLevel(3);
         //        taskjetSpectrum->SetMinJetPt(10);
         taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
@@ -816,31 +1051,69 @@ x         taskjetSpectrum->SetTrackEtaWindow(0.8);
         taskjetSpectrum->SetTrackEtaWindow(0.8);
         taskjetSpectrum->SetJetEtaWindow(0.4);
         if(iAODanalysis)SetAODInput(taskjetSpectrum);
+        */
        }
        if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
      }
    }
-
+   AliAnalysisManager::SetCommonFileName("PWG4_Fragmentation.root");
    if(iPWG4Fragmentation){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskFragmentationFunction.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
        AliAnalysisTaskFragmentationFunction *taskFrag = 0;
-     if(kUseAODMC){
+       if(kUseAODMC){
 
-     }
-     else{
-       taskFrag = AddTaskFragmentationFunction(kDefaultJetBranch.Data(),"","","",kHighPtFilterMask);
-     }
-     if (!taskFrag) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskFragmentationFunction cannot run for this train conditions - EXCLUDED");
+       }
+       else{
+
+
+        for(int ic = 1;ic < 5;ic++){
+          // Anti-kT
+          taskFrag = AddTaskFragmentationFunction(1<<23,kHighPtFilterMask, ic);
+          if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+          if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+          // UA1
+          taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask, ic); 
+          if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+          if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         // SISCONE 
+          if(ic==1){
+            /*
+              taskFrag = AddTaskFragmentationFunction(1<<28,kHighPtFilterMask, ic);
+              taskFrag = AddTaskFragmentationFunction(1<<29,kHighPtFilterMask, ic);
+              taskFrag = AddTaskFragmentationFunction(1<<30,kHighPtFilterMask, ic);
+            */
+
+
+
+            // Anti-kT B2 - B3
+            if(!iAODanalysis==1){
+              taskFrag = AddTaskFragmentationFunction(1<<26,kHighPtFilterMask, ic);
+              if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+              if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+              
+              taskFrag = AddTaskFragmentationFunction(1<<27,kHighPtFilterMask, ic);
+              if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+              if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+            }
+          }
+
+        } 
+
+
+       }
+       if (!taskFrag) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskFragmentationFunction cannot run for this train conditions - EXCLUDED");
    }
 
    if(iPWG4JetChem){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetChem.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetChem.C");
      AliAnalysisTask *taskChem = AddTaskJetChem(kHighPtFilterMask);
      if (!taskChem) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetChem cannot run for this train conditions - EXCLUDED");
    }
 
    if (iPWG4JetResponse) {
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetResponse.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetResponse.C");
      AliAnalysisTask *taskJetResponse = 0;
 
      if(iJETAN){
@@ -859,7 +1132,7 @@ x   taskjetSpectrum->SetTrackEtaWindow(0.8);
    }
 
    if(iPWG4JCORRAN){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJCORRANTask.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJCORRANTask.C");
      AliJCORRANTask* corran = AddTaskJCORRAN(kDeltaAODJCORRANName.Data(),0);
      if(!corran)::Warning("AnalysisTrainPWG4Jets", "AliJCORRANTask cannot run for this train conditions - EXCLUDED");
      else{
@@ -868,7 +1141,7 @@ x   taskjetSpectrum->SetTrackEtaWindow(0.8);
    }
 
    if(iPWG4UE){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskUE.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskUE.C");
      AliAnalysisTaskUE *taskUE = 0;
      if(iPWG4UE&1)taskUE = AddTaskUE(); 
      if(iPWG4UE&2){
@@ -887,7 +1160,7 @@ x   taskjetSpectrum->SetTrackEtaWindow(0.8);
    }
 
    if(iPWG4LeadingUE){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskLeadingTrackUE.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskLeadingTrackUE.C");
      AliAnalysisTaskLeadingTrackUE *taskLeadingUE = AddTaskLeadingTrackUE(kUseMC);
      if (!taskLeadingUE) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTasLeadingTrackkUE cannot run for this train conditions - EXCLUDED");
      //     taskLeadingUE->SetFilterBit(64);
@@ -895,47 +1168,51 @@ x         taskjetSpectrum->SetTrackEtaWindow(0.8);
 
 
    if(iPWG4CorrectionsUE){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskCorrectionsUE.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskCorrectionsUE.C");
      AliAnalysisTaskCorrectionsUE *taskCorrectionsUE = 0;
      if(iPWG4CorrectionsUE&1)taskCorrectionsUE = AddTaskCorrectionsUE("jetsAOD_NONE","CDF","MP_eta05","TRANSV","MSP",kFALSE);
      if (!taskCorrectionsUE) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskCorrectionsUE cannot run for this train conditions - EXCLUDED");
    }
 
    if(iPWG4ThreeJets){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskThreeJets.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskThreeJets.C");
      AliAnalysisTaskThreeJets *taskThree = AddTaskThreeJets();
      if(!taskThree)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskThreets cannot run for this train conditions - EXCLUDED");
    }
    if(iPWG4QGSep){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskQGSep.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskQGSep.C");
      AliAnalysisTaskQGSep *taskQGSep = AddTaskQGSep(kUseMC,iAODanalysis);
      if(!taskQGSep)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQGSep cannot run for this train conditions - EXCLUDED");
    }
   
 
    if(iPWG4Minijet){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskMinijet.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskMinijet.C");
      AliAnalysisTaskMinijet *taskMini = AddTaskMinijet(-1,"esd",kUseMC,kGridDataSet);
      // if we ha highmult trigger add another task
      if(!taskMini)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskMinjet cannot run for this train conditions - EXCLUDED");
    }
 
-
+   AliAnalysisManager::SetCommonFileName("PWG4_HighPtQA.root");
    if(iPWG4PtQAMC){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskPWG4HighPtQAMC.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtQAMC.C");
      AliPWG4HighPtQAMC *taskQAMC = 0;
      if(kUseMC){
        if(iPWG4PtQAMC&1){
-        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),0);
-        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),1);
-        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),2);
+        taskQAMC = AddTaskPWG4HighPtQAMCAll(kGridDataSet.Data());
        }
      }
      if (!taskQAMC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQAMC cannot run for this train conditions - EXCLUDED");
    }
 
+   if(iPWG4PtTrackQA){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtTrackQA.C");
+     if(iPWG4PtTrackQA&2)AddTaskPWG4HighPtTrackQAAll(kGridDataSet.Data(),kIsPbPb,iAODanalysis);
+     else AddTaskPWG4HighPtTrackQAAllReduced(kGridDataSet.Data(),kIsPbPb,iAODanalysis);
+   }
+
    if(iPWG4PtQATPC){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskPWG4HighPtQATPConly.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtQATPConly.C");
      AliPWG4HighPtQATPConly *taskQATPC = 0;
      if(iPWG4PtQATPC&1)taskQATPC = AddTaskPWG4HighPtQATPConly(kGridDataSet.Data(),1);
      if(iPWG4PtQATPC&2)taskQATPC = AddTaskPWG4HighPtQATPConly(kGridDataSet.Data(),2);
@@ -944,7 +1221,7 @@ x   taskjetSpectrum->SetTrackEtaWindow(0.8);
    }
 
    if(iPWG4Cosmics){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskPWG4CosmicCandidates.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4CosmicCandidates.C");
 
      AliPWG4CosmicCandidates *taskPWG4CosmicCandidates = AddTaskPWG4CosmicCandidates(0);
      taskPWG4CosmicCandidates = AddTaskPWG4CosmicCandidates(1);
@@ -954,18 +1231,18 @@ x         taskjetSpectrum->SetTrackEtaWindow(0.8);
 
 
    if(iPWG4PtSpectra){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskPWG4HighPtSpectra.C");
-     AliPWG4HighPtSpectra *taskPtSpectra = AddTaskPWG4HighPtSpectra(kGridDataSet.Data());
-     if (!taskPtSpectra) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskPtSpectra cannot run for this train conditions - EXCLUDED");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtSpectra.C");
+     AddTaskPWG4HighPtSpectraAll(kGridDataSet.Data(),kIsPbPb,iAODanalysis);
    }
+   
    if(iPWG4KMeans){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskKMeans.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskKMeans.C");
      AliAnalysisTaskKMeans *taskKMeans = AddTaskKMeans();
      if (!taskKMeans) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskKMenans cannot run for this train conditions - EXCLUDED");
    }
 
    if(iPWG4PartCorr){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskPartCorr.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPartCorr.C");
      AliAnalysisTaskParticleCorrelation *taskpartcorrPHOS = AddTaskPartCorr("AOD", "PHOS",kFALSE,kIsMC);
      if (!taskpartcorrPHOS) ::Warning("AnalysisTrainNew", "AliAnalysisTaskParticleCorrelation PHOS cannot run for this train conditions - EXCLUDED");
      AliAnalysisTaskParticleCorrelation *taskpartcorrEMCAL = AddTaskPartCorr("AOD", "EMCAL",kFALSE,kIsMC);
@@ -974,7 +1251,7 @@ x   taskjetSpectrum->SetTrackEtaWindow(0.8);
    } 
 
    if(iPWG4CaloQA){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/QA/AddTaskCalorimeterQA.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/QA/AddTaskCalorimeterQA.C");
      AliAnalysisTaskParticleCorrelation *taskcaloQA =  AddTaskCalorimeterQA("ESD",kFALSE,kIsMC,kCaloQAOutputFileName.Data());
      if(!taskcaloQA)::Warning("AnalysisTrainNew", "AliAnalysisTaskParticleCorrelation QA cannot run - EXCLUDED");
      //  if(kCaloQAOutputFileName.Length()>0)mgr->RegisterExtraFile(kCaloQAOutputFileName.Data());
@@ -983,21 +1260,21 @@ x         taskjetSpectrum->SetTrackEtaWindow(0.8);
    if(iPWG4JetCorr){
      //     using namespace JetCorrelHD;
      TString cdir = gSystem->WorkingDirectory();
-     gSystem->ChangeDirectory(gSystem->ExpandPathName("$ALICE_ROOT_SRC/PWG4/macros/"));
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskJetCorrel.C");
+     gSystem->ChangeDirectory(gSystem->ExpandPathName("$ALICE_ROOT/PWG4/macros/"));
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetCorrel.C");
      AliAnalysisTaskJetCorrel *taskjetcorr = AddTaskJetCorrel();
      gSystem->ChangeDirectory(cdir);
      if (!taskjetcorr) ::Warning("AnalysisTrainNew", "AliAnalysisTaskJetCorrel  cannot run for this train conditions - EXCLUDED");
    } 
 
    if(iPWG4Tagged){
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskTaggedPhotons.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskTaggedPhotons.C");
      AliAnalysisTaskTaggedPhotons * taskTagged = AddTaskTaggedPhotons(kFALSE); // EMCAL
      taskTagged = AddTaskTaggedPhotons(kTRUE); // PHOS 
      if (!taskTagged) ::Warning("AnalysisTrainNew", "AliAnalysisTaskTaggedPhotons  cannot run for this train conditions - EXCLUDED");     
    }
    if (iPWG4omega3pi) {
-     gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskomega3pi.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskomega3pi.C");
      AliAnalysisTaskOmegaPi0PiPi *taskomega3pi = AddTaskomega3pi();
      if (!taskomega3pi) ::Warning("AnalysisTrainNew", "AliAnalysisTaskomega3pi cannot run\
  for these train conditions - EXCLUDED");
@@ -1005,9 +1282,9 @@ x  taskjetSpectrum->SetTrackEtaWindow(0.8);
 
    // PWG4 gamma conversion analysis
    if (iPWG4GammaConv) {
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskGammaConversion.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskGammaConversion.C");
       TString cdir = gSystem->WorkingDirectory();
-      gSystem->ChangeDirectory(gSystem->ExpandPathName("$ALICE_ROOT_SRC/PWG4/macros/"));
+      gSystem->ChangeDirectory(gSystem->ExpandPathName("$ALICE_ROOT/PWG4/macros/"));
       //      TString gcArguments = "-run-on-train -run-jet -run-chic -run-neutralmeson -run-cf";
       //      TString gcArguments = "-run-on-train -run-jet -run-neutralmeson -run-cf -use-own-xyz";
       //      TString gcArguments = "-run-on-train -run-jet -run-neutralmeson -run-cf -use-own-xyz";
@@ -1023,7 +1300,7 @@ x  taskjetSpectrum->SetTrackEtaWindow(0.8);
    }   
 
    if (iPWG4CaloConv) {
-      gROOT->LoadMacro("$ALICE_ROOT_SRC/PWG4/macros/AddTaskCaloConv.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskCaloConv.C");
       AliAnalysisTaskCaloConv * taskCaloConv = AddTaskCaloConv();
       if (!taskCaloConv) ::Warning("AnalysisTrainNew", "AliAnalysisTaskCaloConv cannot run for these train conditions - EXCLUDED");
    }   
@@ -1046,7 +1323,7 @@ x  taskjetSpectrum->SetTrackEtaWindow(0.8);
        TString alien_workdir = gGrid->GetHomeDirectory();
        if (iAODanalysis) alien_workdir += "analysisAOD";
        else              alien_workdir += "analysisESD";
-       if(kGridDataSet.Length()>0)alien_workdir += Form("/%s",kGridDataSet.Data());
+       if(kGridDataSet.Length()>0)alien_workdir += Form("/%s%s",kGridDataSet.Data(),kGridExtraAliendirLevel.Data());
        AliAnalysisAlien *gridhandler = (AliAnalysisAlien*)mgr->GetGridHandler();
        printf("=== AnalysisTrainPWG4Jets:: Registering jdl in the work directory alien://%s/%s, should be done by the manager! ===\n",
              alien_workdir.Data(),gridhandler->GetGridOutputDir());
@@ -1077,17 +1354,6 @@ x         taskjetSpectrum->SetTrackEtaWindow(0.8);
        }
        Printf("%s copy ...",dest.Data());
        TFile::Cp(Form("file:%s_merge.jdl",kTrainName.Data()),Form("alien://%s",dest.Data()));
-
-
-       /*
-       dest = Form("%s/rootfiles/STEER/LQ1dRef_v1.root",gGrid->GetHomeDirectory());
-       if(AliAnalysisAlien::FileExists(dest.Data())){
-        Printf("%s exist on grid removing...",dest.Data());
-        gGrid->Rm(dest.Data());
-       }
-       TFile::Cp(Form("file:%s/STEER/LQ1dRef_v1.root",
-                     gSystem->ExpandPathName("$ALICE_ROOT")),Form("alien://%s",dest.Data()));
-       */
      }
      AliLog::SetGlobalLogLevel(AliLog::kError);
      if((kUseSysInfo>0&&smode=="LOCAL")||!strcmp(plugin_mode, "test")){
@@ -1116,7 +1382,7 @@ x  taskjetSpectrum->SetTrackEtaWindow(0.8);
        TString alien_workdir = gGrid->GetHomeDirectory();
        if (iAODanalysis) alien_workdir += "analysisAOD";
        else              alien_workdir += "analysisESD";
-       if(kGridDataSet.Length()>0)alien_workdir += Form("/%s",kGridDataSet.Data());
+       if(kGridDataSet.Length()>0)alien_workdir += Form("/%s%s",kGridDataSet.Data(),kGridExtraAliendirLevel.Data());
        //     kGridOutdir = gridhandler->GetGridOutputDir();
        printf("=== Registering ConfigTrain.C in the work directory <%s> ===\n",
                 alien_workdir.Data());
@@ -1163,7 +1429,7 @@ void StartAnalysis(const char *mode, TChain *chain) {
                ::Error("AnalysisTrainPWG4Jets.C::StartAnalysis", "Cannot create the chain");
                return;
             }   
-            mgr->StartAnalysis(mode, chain);
+           //            mgr->StartAnalysis(mode, chain);
             mgr->StartAnalysis(mode, chain,kNumberOfEvents);
          }   
          return;
@@ -1241,8 +1507,6 @@ void CheckModuleFlags(const char *mode) {
       if( iPWG4Cosmics)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4 Comics disabled in analysis on AOD's");
       iPWG4Cosmics        = 0;
 
-      if( iPWG4PtSpectra)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4 PtQAMC disabled in analysis on AOD's");
-      iPWG4PtSpectra     = 0;
       if(iPWG4KMeans)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4KMeans disabled on AOD's");
       iPWG4KMeans       = 0;
       if (iPWG4JetCorr)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4Jetcorr disabled on AOD's");
@@ -1278,10 +1542,6 @@ void CheckModuleFlags(const char *mode) {
        if( iPWG4CorrectionsUE)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4 CorrectionsUE disabled in analysis without MC");
        iPWG4CorrectionsUE = 0;
      }
-     if (!kUseTR) {
-       if(iPWG4PtQAMC)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "iPWG4QATPCMC disabled if not reading track references");
-       iPWG4PtQAMC        = 0;
-     }   
      if (iJETAN){
        iESDfilter=1;
      }
@@ -1293,12 +1553,12 @@ void CheckModuleFlags(const char *mode) {
        iPWG4JetSpectrum = iPWG4UE =  iPWG4CorrectionsUE = iPWG4ThreeJets = iPWG4QGSep = iDIJETAN = 0;
       }
    }
-   iPWG4JetTasks = iPWG4JetServices||iPWG4JetSpectrum||iPWG4UE||iPWG4LeadingUE||iPWG4PtQAMC||iPWG4PtSpectra||iPWG4PtQATPC||iPWG4Cosmics||iPWG4ThreeJets||iPWG4QGSep||iPWG4JetChem||iPWG4Minijet||iPWG4Fragmentation;
+   iPWG4JetTasks = iPWG4JetServices||iPWG4JetSpectrum||iPWG4UE||iPWG4LeadingUE||iPWG4PtQAMC||iPWG4PtTrackQA||iPWG4PtSpectra||iPWG4PtQATPC||iPWG4Cosmics||iPWG4ThreeJets||iPWG4QGSep||iPWG4JetChem||iPWG4Minijet||iPWG4Fragmentation;
    iPWG4PartCorrLibs = iPWG4PartCorr||iPWG4Tagged||iPWG4CaloQA;
    iPWG4GammaConvLib = iPWG4GammaConv||iPWG4CaloConv;
 
 
-   iEMCUtilLibs = iPWG4PartCorrLibs||iPWG4JCORRAN||iPWG4GammaConvLib;
+   iEMCUtilLibs = iPWG4JetTasks||iPWG4PartCorrLibs||iPWG4JCORRAN||iPWG4GammaConvLib||iJETAN;
    iJETANLib = iPWG4JetTasks||iJETAN||iDIJETAN;
 
    if (iESDfilter) {iAODhandler=1;}
@@ -1386,8 +1646,8 @@ Bool_t Connect(const char *mode) {
 //______________________________________________________________________________
 Bool_t LoadCommonLibraries(const char *mode)
 {
-   if (!gSystem->Getenv("ALICE_ROOT_SRC")) {
-      ::Error("AnalysisTrainPWG4Jets.C", "Analysis train requires that ALICE_ROOT_SRC is set to pick up Configurations"); 
+   if (!gSystem->Getenv("ALICE_ROOT")) {
+      ::Error("AnalysisTrainPWG4Jets.C", "Analysis train requires that ALICE_ROOT is set to pick up Configurations"); 
       return kFALSE;
    }   
    
@@ -1412,17 +1672,19 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("ESD", mode, kTRUE);
             success &= LoadLibrary("AOD", mode, kTRUE);
             success &= LoadLibrary("ANALYSIS", mode, kTRUE);
+            success &= LoadLibrary("OADB", mode, kTRUE);
             success &= LoadLibrary("ANALYSISalice", mode, kTRUE);
             success &= LoadLibrary("ROOTFILES", mode, kTRUE);
-            // success &= LoadLibrary("EventMixing", mode,kTRUE);
+           //            success &= LoadLibrary("EventMixing", mode,kTRUE);
             success &= LoadLibrary("CORRFW", mode, kTRUE);
          } else {   
             success &= LoadLibrary("libSTEERBase.so", mode);
             success &= LoadLibrary("libESD.so", mode);
             success &= LoadLibrary("libAOD.so", mode);
             success &= LoadLibrary("libANALYSIS.so", mode);
+            success &= LoadLibrary("libOADB.so", mode, kTRUE);
             success &= LoadLibrary("libANALYSISalice.so", mode);
-            // success &= LoadLibrary("libEventMixing.so", mode);
+           //            success &= LoadLibrary("libEventMixing.so", mode);
             success &= LoadLibrary("libCORRFW.so", mode);
             gROOT->ProcessLine(".include $ALICE_ROOT/include");
          }   
@@ -1477,6 +1739,10 @@ Bool_t LoadAnalysisLibraries(const char *mode)
    // JETAN
    if (iJETANLib) {
      // this part needs some rework in case we do not need the fastjed finders for processing
+     if(iEMCUtilLibs){
+       if (!LoadLibrary("EMCALUtils", mode, kTRUE) ||
+          !LoadLibrary("PHOSUtils", mode, kTRUE)) return kFALSE;
+     }
      if (!LoadLibrary("JETAN", mode, kTRUE)) return kFALSE;
      if (!strcmp(mode, "PROOF")){
        gProof->Exec("gSystem->Load\(\"/afs/cern.ch/user/d/dperrino/public/libCGAL.so\"\)", kTRUE); 
@@ -1506,23 +1772,11 @@ Bool_t LoadAnalysisLibraries(const char *mode)
    }
 
    if(iPWG1QASym){
-     if (!LoadSource(Form("%s/PWG1/AliAnalysisTaskQASym.cxx",gSystem->ExpandPathName("$ALICE_ROOT_SRC")), mode, kTRUE))return kFALSE;
+     if (!LoadSource(Form("%s/PWG1/AliAnalysisTaskQASym.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), mode, kTRUE))return kFALSE;
    }
    if(iPWG4TmpSourceSara){
      if(!kUsePAR)gSystem->AddIncludePath("-I$ALICE_ROOT/include/JetTasks"); // ugly hack!!
-     if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskEta.cxx",gSystem->ExpandPathName("$ALICE_ROOT_SRC")), mode, kTRUE))return kFALSE;
-   }
-
-   /*
-   if(iPWG4JetChem){
-     if(!kUsePAR)gSystem->AddIncludePath("-I$ALICE_ROOT/include/JetTasks"); // ugly hack!!
-     if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), mode, kTRUE))return kFALSE;
-   }
-   */
-
-   if(iEMCUtilLibs){
-     if (!LoadLibrary("EMCALUtils", mode, kTRUE) ||
-        !LoadLibrary("PHOSUtils", mode, kTRUE)) return kFALSE;
+     if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskEta.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), mode, kTRUE))return kFALSE;
    }
 
    if (iPWG4PartCorrLibs) {   
@@ -1832,8 +2086,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Define production directory LFN
    plugin->SetGridDataDir(kGridDatadir.Data());
 // Set data search pattern
-   if (iAODanalysis) plugin->SetDataPattern(" *AliAOD.Jets.root");
-   //   else              plugin->SetDataPattern(Form(" %s/*/*ESD.tag.root",kGridPassPattern.Data()));
+   if (iAODanalysis) plugin->SetDataPattern(Form(" %s/*/*AliAOD.root",kGridPassPattern.Data()));
    else              plugin->SetDataPattern(Form(" %s/*/*AliESDs.root",kGridPassPattern.Data()));
 // ...then add run numbers to be considered
 //   plugin->SetRunRange(kGridRunRange[0], kGridRunRange[1]);
@@ -1847,29 +2100,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
      in1.open(kGridLocalRunList.Data());
      int iRun;
      int icount = 0;
-     /*
-     char c;
-     char cLine[250];
-     while(!in1.eof()){
-       c = in1.get();
-       if ( (c >= '0') && (c <= '9') )
-        {
-          in1.putback (c)s;
-          in1>>iRun;
-          Printf("AnalysisTrainPWG4Jets Adding run number from File %s", Form(kGridRunPattern.Data(),iRun));
-          plugin->AddRunNumber(Form(kGridRunPattern.Data(),iRun));
-       }
-     else
-       {
-        in1.putback (c);
-        in1.getline(cLine,250);
-
-       }
-     }
-     */
-     
      Int_t nRun = 0;
-
      // just use run numbers, negatives will be excluded
      while(in1>>iRun){
        if(iRun>=0){
@@ -1888,7 +2119,6 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
        }
      }
    }
-
 // Method 2: Declare existing data files (raw collections, xml collections, root file)
 // If no path mentioned data is supposed to be in the work directory (see SetGridWorkingDir())
 // XML collections added via this method can be combined with the first method if
@@ -1900,7 +2130,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    
    if (iAODanalysis)  alien_workdir += "analysisAOD";
    else               alien_workdir += "analysisESD";    
-   if(kGridDataSet.Length()>0)alien_workdir += Form("/%s",kGridDataSet.Data());
+       if(kGridDataSet.Length()>0)alien_workdir += Form("/%s%s",kGridDataSet.Data(),kGridExtraAliendirLevel.Data());
    plugin->SetGridWorkingDir(alien_workdir.Data());
 
    // Declare alien output directory. Relative to working directory.
@@ -1908,11 +2138,9 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    plugin->SetGridOutputDir(kGridOutdir);
 
    // Add external packages
-   if (iJETAN||iDIJETAN) {
-      plugin->AddExternalPackage("boost::v1_43_0");
-      plugin->AddExternalPackage("cgal::v3.6");
-      plugin->AddExternalPackage("fastjet::v2.4.2");
-   }   
+   plugin->AddExternalPackage("boost::v1_43_0");
+   plugin->AddExternalPackage("cgal::v3.6");
+   plugin->AddExternalPackage("fastjet::v2.4.2");
 
 
    // set extra libs before par file compilation
@@ -2062,7 +2290,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    // Optionally resubmit threshold.
    // plugin->SetMasterResubmitThreshold(90);
    // Optionally set time to live (default 30000 sec)
-   plugin->SetTTL(54000); // 15h...
+   plugin->SetTTL(80000); // 22h...
    // Optionally set input format (default xml-single)
    plugin->SetInputFormat("xml-single");
    // Optionally modify the name of the generated JDL (default analysis.jdl)