]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/macros/AnalysisTrainPWG4Jets.C
Reader: Add option to remove or not event with primary vertex not reconstructed
[u/mrichter/AliRoot.git] / PWG4 / macros / AnalysisTrainPWG4Jets.C
index d36559df388db480ad6b3e20d79441a23bef605e..355aa1646e8c676524fda2427c8d8070d659c5e2 100644 (file)
@@ -31,14 +31,18 @@ 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;
 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       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       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 
 Bool_t      kUseKinefilter     = kFALSE; // use Kinematics filter
 Bool_t      kUseMuonfilter     = kFALSE; // use Kinematics filter
 TString     kCommonOutputFileName = "PWG4_JetTasksOutput.root";
@@ -63,7 +67,7 @@ Int_t         kErrorIgnoreLevel = -1; // takes the errror print level from .root
 // const Int_t kSysError =   5000;
 // const Int_t kFatal    =   6000; 
 Int_t         kUseSysInfo         = 0; // activate debugging
-Long_t     kNumberOfEvents     = 1234567890; // number of events to process from the chain
+Long64_t    kNumberOfEvents     = 1234567890; // number of events to process from the chain
 Bool_t      kUseMC              = kTRUE;  // use MC info
 Bool_t      kIsMC               = kTRUE;  // is MC info, if false it overwrites Use(AOD)MC
 Bool_t      kUseAODMC           = kTRUE;  // use MC infA
@@ -71,28 +75,50 @@ Bool_t      kUseESDTags         = kFALSE; // use ESD tags for selection
 Bool_t      kUseTR              = kFALSE;  // use track references
 Bool_t      kUseAODTags         = kFALSE;  // use AOD tags
 Bool_t      kSaveTrain          = kFALSE;  // save train configuration as: 
+Bool_t      kIsPbPb             = kFALSE;  // Pb+Pb
 
 
 // ### Analysis modules to be included. Some may not be yet fully implemented.
 //==============================================================================
 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
+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 
+TString     kDefaultJetBackgroundBranchMC     = "";      // is currently set when filled (jet clsuters  
+TString     kDefaultJetBranchMC2     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
+TString     kDefaultJetBackgroundBranchMC2     = "";      // is currently set when filled (jet clsuters  
+TString     kJetSubtractMask1 = "B0";
+TString     kJetSubtractMask2 = "B%d";
 Int_t       iDIJETAN           = 1;
 Int_t       iJETANLib          = 1;
 Int_t       iPWG1QASym         = 0;      // Eva's QA task compiled on the fly...
+Int_t       iPWG4FastEmbedding = 0;      // Generate non-standard AOD for embedding
 Int_t       iPWG4JetTasks      = 0;      // all jet tasks flag for lib laoding
 Int_t       iPWG4JetServices   = 0;      // jet spectrum analysis
 Int_t       iPWG4JetSpectrum   = 0;      // jet spectrum analysis
+Int_t       iPWG4JetResponse   = 0;      // jet response matrix
 Int_t       iPWG4JCORRAN       = 0;      // JCORRAN module
 Int_t       iPWG4UE            = 0;      // Underlying Event analysis
-Int_t       iPWG4CorrectionsUE            = 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 
 Int_t       iPWG4ThreeJets     = 0;      // Sona's thrust task
+Int_t       iPWG4QGSep     = 0;          // Sona's QG Separation task
+Int_t       iPWG4Minijet       = 0;      // Eva's Mini Jet Task cluster task 
 Int_t       iPWG4KMeans        = 0;      // Andreas' KMeans task 
 Int_t       iPWG4Cluster       = 0;      // CKB cluster task 
 Int_t       iEMCUtilLibs       = 0;      // Flag to satisfy dependence on EMC utils
@@ -105,11 +131,12 @@ Int_t       iPWG4omega3pi      = 0;      // Omega to 3 pi analysis (PWG4)
 Int_t       iPWG4GammaConvLib     = 0;      // Gamma Conversio
 Int_t       iPWG4GammaConv     = 0;      // Gamma Conversio
 Int_t       iPWG4CaloConv     = 0;      // Gamma Conversio
-Int_t       kHighPtFilterMask  = 16;     // change depending on the used AOD Filter
+Int_t       kHighPtFilterMask  = 32;     // change depending on the used AOD Filter
 TString     kDeltaAODJetName   = "AliAOD.Jets.root";     
 TString     kDeltaAODJCORRANName   = "AliAOD.JCORRAN.root";     
-TString     kDeltaAODPartCorrName   = "deltaAODPartCorr.root";     
-
+TString     kDeltaAODPartCorrName   = "AliAOD.PartCorr.root";     
+TString     kFastEmbeddingAOD  = "emb/AliAOD.root";
+TString     kFastEmbAODList    = "";
 
 //==============================================================================
 // ### PROOF Steering varibales
@@ -134,7 +161,7 @@ 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-26-00b-6";  // *CHANGE ME IF MORE RECENT IN GRID*
+TString     kPluginRootVersion       = "v5-28-00a";  // *CHANGE ME IF MORE RECENT IN GRID*
 TString     kPluginAliRootVersion    = "v4-19-15-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
 Bool_t      kPluginMergeViaJDL       = kTRUE;  // merge via JDL
 Bool_t      kPluginFastReadOption   = kFALSE;  // use xrootd tweaks
@@ -146,14 +173,16 @@ TString     kPluginExecutableCommand = "source /Users/kleinb/setup_32bit_aliroot
 // == grid plugin input and output variables
 TString     kGridDatadir      = "/alice/sim/PDC_08b/LHC09a1/AOD/";
 Int_t         kGridMaxRunsFromList = 999999999;
+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       = "";
 TString     kGridExtraFiles        = ""; // files that will be added to the input list in the JDL...
-Int_t         kGridMaxMergeFiles      = 12; // Number of files merged in a chunk grid run range
+Int_t         kGridMaxMergeFiles      = 25; // Number of files merged in a chunk grid run range
 TString     kGridMergeExclude       = "AliAOD.root"; // Files that should not be merged
 TString     kGridOutputStorages      = "disk=2"; // Make replicas on the storages
 // == grid process variables
@@ -169,6 +198,8 @@ TString     kLocalXMLDataset   = ""; // Change local xml dataset for local inter
 TString     kLocalDataList   = "local_deltaaod.txt"; // Change local xml dataset for local interactive analysis
 // == local process variables
 
+TString kPluginMode = "";
+TString kAnalysisMode = "";
 
 
 // Temporaries.
@@ -182,20 +213,27 @@ class AliAnalysisAlien;
 //______________________________________________________________________________
 void AnalysisTrainPWG4Jets(const char *analysis_mode="local", 
                           const char *plugin_mode="",
-                          const char *config_file="",Int_t iOffset = 0)
+                          const char *config_file="",Int_t iOffset = 0,Int_t iTotal = 0)
 {
 // Main analysis train macro. If a configuration file is provided, all parameters
 // are taken from there but may be altered by CheckModuleFlags.
 
-   if (strlen(config_file) && !LoadConfig(config_file)) return;
+  // these flag may be needed by the config file
+  kPluginMode   = plugin_mode;
+  kAnalysisMode = analysis_mode;
+  
+  if (strlen(config_file) && !LoadConfig(config_file)) return;
+  if(iTotal>0)kGridMaxRunsFromList = iTotal; // overwrites the settings from config file
+  if(iOffset)kGridOffsetRunFromList = iOffset;
+  if(iOffset)kProofOffset = iOffset;
+
 
-   if(iOffset)kProofOffset = iOffset;
    TString smode(analysis_mode);
    smode.ToUpper();
    if (kSaveTrain)WriteConfig();
-   // Check compatibility of selected modules
+   // Check compatibility of selected modules 
    CheckModuleFlags(smode);
-   //   gROOT->ProcessLine(".trace");
+   //     gROOT->ProcessLine(".trace");
 
    printf("==================================================================\n");
    printf("===========    RUNNING ANALYSIS TRAIN %s IN %s MODE   ==========\n", kTrainName.Data(),smode.Data());
@@ -204,6 +242,8 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    if (iAODanalysis) printf("=  AOD analysis                                                  =\n");
    else                     printf("=  ESD analysis                                                  =\n");
    if (iPhysicsSelection)   printf("=  Physics selection                                                =\n");
+   if(iCentralitySelection)printf("=  Centrality selection                                                =\n");
+   if (useTender)   printf("=  Using tender                                                =\n");
    if (iESDfilter)   printf("=  ESD filter                                                    =\n");
    if (iJETAN)       printf("=  Jet analysis                                                  =\n");
    printf("==================================================================\n");
@@ -219,6 +259,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    printf(printMask,"debugging", (UInt_t)kUseDebug);
    printf(printMask,"PAR files", (UInt_t)kUsePAR);
    printf(printMask,"AliEn plugin", (UInt_t)kPluginUse);
+   printf(printMask,"JETAN subtract", (UInt_t)iJETSUBTRACT);
    printf(printMask,"PWG1 QA sym", iPWG1QASym);
    printf(printMask,"PWG4 Source Sara",iPWG4TmpSourceSara);
    printf(printMask,"PWG4 Fragmentation",iPWG4Fragmentation);
@@ -228,12 +269,16 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    printf(printMask,"PWG4 Jet Spectrum",iPWG4JetSpectrum);
    printf(printMask,"PWG4 JCORRAN",iPWG4JCORRAN);
    printf(printMask,"PWG4 UE",iPWG4UE); 
+   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);     
    printf(printMask,"PWG4 Three Jets",iPWG4ThreeJets);
+   printf(printMask,"PWG4 QGSep",iPWG4QGSep);
+   printf(printMask,"PWG4 Minijet",iPWG4Minijet);
    printf(printMask,"PWG4 KMeans",iPWG4KMeans);
    printf(printMask,"PWG4 Cluster",iPWG4Cluster);
    printf(printMask,"PWG4 Part Corr",iPWG4PartCorr);
@@ -281,8 +326,8 @@ 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 (iPWG4PartCorr) aodH->AddFriend(Form("deltas/%s"kDeltaAODJetName.Data()));
+      //      if (iPWG4JetTasks) aodH->AddFriend(Form("deltas/%s",kDeltaAODJetName.Data()));
+      //      if (iPWG4PartCorr) aodH->AddFriend(Form("deltas/%s"kDeltaAODJetName.Data()));
    } else {   
    // ESD input handler
       AliESDInputHandler *esdHandler = new AliESDInputHandler();
@@ -305,14 +350,8 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       AliAODHandler* aodHandler   = new AliAODHandler();
       aodHandler->SetOutputFileName("AliAOD.root");
       aodHandler->SetFillAODforRun(kFillAOD);
-      
-      mgr->SetOutputEventHandler(aodHandler);
       //
-      if (iAODanalysis) {
-
-       //         aodHandler->SetCreateNonStandardAOD();
-       //      if (iJETAN)aodHandler->SetOutputFileName(kDeltaAODJetName.Data());
-      } 
+      mgr->SetOutputEventHandler(aodHandler);
       AliAnalysisDataContainer * cout_aod = mgr->GetCommonOutputContainer();
       cout_aod->SetSpecialOutput();
    }
@@ -344,16 +383,69 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    // For now connection to top input container and common AOD output container
    // is done in this macro, but in future these containers will be connected
    // from each task configuration macro.
+   
+   //                                                                                                                              
+   // Tender and supplies. Needs to be called for every event.                                                                     
+   //                                                                                                                              
+
+   if (useTender) {
+      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/ANALYSIS/macros/AddTaskPhysicsSelection.C");
-     AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kIsMC,kTRUE,kTRUE); // last flag also adds information on  
+     Int_t iTriggerHIC = 0;
+     Bool_t rejectBkg = true;
+     if(kIsPbPb){
+       iTriggerHIC = 2;
+       rejectBkg = false; // for the moment...
+     }
+     AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kIsMC,rejectBkg);  
+
+     mgr->RegisterExtraFile("EventStat_temp.root");
+     mgr->AddStatisticsTask();
+   }
+   else{
+     iPhysicsSelectionFlag = AliVEvent::kMB;
+   }
+
+   if(iCentralitySelection){
+
+     // has to run before AOD filter
+     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+     //     const char* file1="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137161.root";
+     //     const char* file2="$ALICE_ROOT/ANALYSIS/macros/AliCentralityByFunction_137161.root";
+     AliCentralitySelectionTask *taskC = AddTaskCentrality();
+      if (!taskC) ::Warning("AnalysisTrainPWG4Jets", "AliCentralitySelectionTask cannot run for this train conditions - EXCLUDED");
    }
 
    if (iESDfilter && !iAODanalysis) {
       //  ESD filter task configuration.
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskESDFilter.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskESDFilterPWG4Train.C");
       AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(kUseKinefilter,kUseMuonfilter);
-      taskesdfilter->SetEnableFillAOD(kFALSE);
+      taskesdfilter->SetEnableFillAOD(!kFilterAOD);
+      taskesdfilter->DisableV0s();
+      taskesdfilter->DisableCascades();
+      taskesdfilter->DisableKinks();
+      taskesdfilter->DisablePmdClusters();
+      taskesdfilter->DisableCaloClusters();
+      taskesdfilter->DisableCells();
+
       if(kIsMC){
        mgr->RegisterExtraFile("pyxsec_hists.root");
        if(kGridMergeExclude.Length())kGridMergeExclude += " ";
@@ -371,27 +463,270 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       mgr->ConnectInput (tagTask, 0, mgr->GetCommonInputContainer());
       mgr->ConnectOutput(tagTask, 1, coutTags);
    }   
-    
+
+   if (iPWG4FastEmbedding) {
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFastEmbedding.C");
+     AliAnalysisTaskFastEmbedding *taskEmbedding = 0;
+     if(kFastEmbAODList.Length()) taskEmbedding = AddTaskFastEmbedding(kFastEmbAODList, 1);
+     else                         taskEmbedding = AddTaskFastEmbedding(kFastEmbeddingAOD, 0);
+     taskEmbedding->SetJetBranch("jetsAOD_UA104_B0_Filter00256_Cut01000");
+     // taskEmbedding->SetEvtSelecMode(AliAnalysisTaskFastEmbedding::kEventsAll);
+     // taskEmbedding->SetDebugLevel(10);
+   }
+
     // Jet analysis
    if (iJETAN) {
       gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJets.C");
       AliAnalysisTaskJets *taskjets = 0;
-      if(iJETAN&1)taskjets = AddTaskJets(kHighPtFilterMask); 
+      if(iJETAN&1){
+       /*
+       taskjets = AddTaskJets(kHighPtFilterMask); 
+       taskjets->SetName("StandardJets");
+       taskjets->SetNonStdBranch("");
+       */
+      }
       if(iJETAN&2){
-       UInt_t selection = 0;
-       if(!kFillAOD){
-         selection = 0xffffff&~(1<<13)&~(1<<5)&~(1<<6); // switch OFF DA and all R = 0.7 to save processing time
-         selection &= ~(1<<1)&~(1<<2)&~(1<<4)&~(1<<6)&~(1<<8)&~(1<<10)&~(1<<12);
+       // Set only few jet finders  backgroudn subtraction w an wo 
+       
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
+       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.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());
        }
-       else {
-         selection = 0xffffff&~(1<<13)&~(1<<5)&~(1<<6); // switch OFF DA and all R = 0.7 to save processing time;
-         selection &= ~(1<<1)&~(1<<2)&~(1<<4)&~(1<<6)&~(1<<8)&~(1<<10)&~(1<<12);
+
+       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(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
+           taskjets = AddTaskJets("AODMC2","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
+         }
+         else{
+           taskjets = AddTaskJets("AODMC","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
+           taskjets = AddTaskJets("AODMC2","UA1",0.4,kHighPtFilterMask,1.,0); // no background subtraction
+         }
        }
-       AddTaskJetsDelta(kDeltaAODJetName.Data(),kHighPtFilterMask,kUseAODMC,selection); 
+       if(kDeltaAODJetName.Length()>0)mgr->RegisterExtraFile(kDeltaAODJetName.Data()); 
       }
       if (!taskjets) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJets cannot run for this train conditions - EXCLUDED");
    }
 
+
+   if (iPWG4FastEmbedding && iJETAN) {
+     AliAnalysisTaskJets *taskEmbJets = AddTaskJets("AODextra", "FASTJET", 0.4, kHighPtFilterMask);
+     taskEmbJets->ReadAODFromOutput();
+     kJetSubtractBranches_extra += Form("%s ", taskEmbJets->GetNonStdBranch());
+
+     taskEmbJets = AddTaskJets("AODextraonly", "FASTJET", 0.4, kHighPtFilterMask);
+     taskEmbJets->ReadAODFromOutput();
+    
+     taskEmbJets = AddTaskJets("AODextra", "UA1", 0.4, kHighPtFilterMask,1.,0);
+     taskEmbJets->ReadAODFromOutput();
+     taskEmbJets = AddTaskJets("AODextraonly", "UA1", 0.4, kHighPtFilterMask,1.,0);
+     taskEmbJets->ReadAODFromOutput();
+     taskEmbJets = AddTaskJets("AODextra", "UA1", 0.4, kHighPtFilterMask,1.,2);
+     taskEmbJets->ReadAODFromOutput();
+   }
+
+   if(iPWG4Cluster){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetCluster.C");
+     AliAnalysisTaskJetCluster *taskCl = 0;
+     Float_t fCenUp = 0;
+     Float_t fCenLo = 0;
+     if(kIsPbPb&&!kIsMC){
+       fCenLo = 0;
+       fCenUp = 80;
+     }
+     if(iPWG4Cluster&1){
+
+       if(kIsPbPb){
+        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->SetDebugLevel(11);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+
+
+        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->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());
+
+         if (iPWG4FastEmbedding) {
+           AliAnalysisTaskJetCluster *taskClEmb = 0;
+           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); // this one is for the background and random jets
+           taskClEmb->SetBackgroundCalc(kTRUE);
+           taskClEmb->SetCentralityCut(fCenLo,fCenUp);
+           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,fTrackEtaWindow); // this one is for the background and random jets
+           taskClEmb->SetBackgroundCalc(kFALSE);
+           taskClEmb->SetCentralityCut(fCenLo,fCenUp);
+           taskClEmb->SetGhostEtamax(fTrackEtaWindow);
+          if(iAODanalysis==2)taskClEmb->SetAODTrackInput(kTRUE);
+          
+           taskClEmb = AddTaskJetCluster("AODextra","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15,fTrackEtaWindow);
+           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,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->SetBackgroundCalc(kTRUE);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        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->SetBackgroundCalc(kTRUE);
+        kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1,kDeltaAODJetName.Data(),0.15); 
+        taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       } 
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,2,1,kDeltaAODJetName.Data(),0.15);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
+       taskCl->SetNRandomCones(1);
+       if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       kDefaultJetBranch = taskCl->GetJetOutputBranch();
+       kJetSubtractBranches += Form("%s ",taskCl->GetJetOutputBranch());
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,2,1,kDeltaAODJetName.Data(),2.0);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchCut1.Data());
+       kJetSubtractBranchesCut1 += Form("%s ",taskCl->GetJetOutputBranch());
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data(),0.15);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
+       kJetSubtractBranches += Form("%s ",taskCl->GetJetOutputBranch());
+
+
+
+       if(kDeltaAODJetName.Length()==0&&kFilterAOD){
+        if(kIsPbPb)taskCl->SetJetTriggerPtCut(0.0001);
+        else taskCl->SetJetTriggerPtCut(20.);
+       }
+
+       if(kUseAODMC){
+        if(kIsPbPb){
+          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->SetBackgroundCalc(kTRUE);
+          taskCl->SetGhostEtamax(0.9);
+          kDefaultJetBackgroundBranchMC = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+          if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);     
+
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+          taskCl->SetBackgroundCalc(kTRUE);
+          taskCl->SetGhostEtamax(fTrackEtaWindow);
+          kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch(),fTrackEtaWindow); 
+          if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+        }
+        else{
+          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->SetBackgroundCalc(kTRUE);
+          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,fTrackEtaWindow); // this one is for the background and random jets
+          taskCl->SetBackgroundCalc(kTRUE);
+          taskCl->SetGhostEtamax(fTrackEtaWindow);
+          kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch()); 
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+          // pp background calcs...
+        }
+        
+        taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow); 
+        taskCl->SetGhostEtamax(fTrackEtaWindow);
+        if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC.Data());   
+        kDefaultJetBranchMC = taskCl->GetJetOutputBranch();
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+
+        taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15,fTrackEtaWindow);
+        if(kIsPbPb)taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC2.Data());  
+        kDefaultJetBranchMC2 = taskCl->GetJetOutputBranch();
+        if(iAODanalysis==2)taskCl->SetAODTrackInput(kTRUE);
+       }
+       
+       
+       if (!taskCl) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskCluster cannot run for this train conditions - EXCLUDED");
+     }
+   }
+
+
+   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);
+       if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       
+       if(kJetSubtractBranches.Contains(kDefaultJetBranch.Data())&&kIsPbPb){
+        kDefaultJetBranch.ReplaceAll(taskSubtract->GetToReplace(),Form(taskSubtract->GetReplacementMask(),taskSubtract->GetSubtractionMethod()));
+       }
+
+       // cut1
+       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranchesCut1,1,kJetSubtractMask1.Data(),kJetSubtractMask2.Data(),"Cut2000");
+       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranchCut1.Data());              
+       taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
+       if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
+     }
+     if(kJetSubtractBranches_extra.Length()){
+       taskSubtract = AddTaskJetBackgroundSubtract(kJetSubtractBranches_extra,1,kJetSubtractMask1.Data(),kJetSubtractMask2.Data(),"extra");
+       taskSubtract->SetBackgroundBranch(kDefaultJetBackgroundBranch_extra.Data());
+       taskSubtract->SelectCollisionCandidates(iPhysicsSelectionFlag);
+       //taskSubtract->SetDebugLevel(3);
+       if(kDeltaAODJetName.Length()>0)taskSubtract->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       if(kJetSubtractBranches_extra.Contains(kDefaultJetBranch.Data())){
+        kDefaultJetBranch.ReplaceAll(taskSubtract->GetToReplace(),Form(taskSubtract->GetReplacementMask(),taskSubtract->GetSubtractionMethod()));
+       }
+     }
+     if (!taskSubtract) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetBackgroundSubtrac cannot run for this train conditions - EXCLUDED");     
+   }
+
    if (iDIJETAN) {
       gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskDiJets.C");
       AliAnalysisTaskDiJets *taskdijets = 0;
@@ -421,19 +756,6 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if (!taskEta) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskEta cannot run for this train conditions - EXCLUDED");
    }
 
-   if(iPWG4Fragmentation){
-     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
-     AliAnalysisTaskFragmentationFunction *taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask);
-     if (!taskFrag) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskFragmentationFunction cannot run for this train conditions - EXCLUDED");
-   }
-
-
-   if(iPWG4JetChem){
-     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetChem.C");
-     AliAnalysisTask *taskChem = AddTaskJetChem();
-     if (!taskChem) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetChem cannot run for this train conditions - EXCLUDED");
-   }
-
 
    if(iPWG4JetServices){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetServices.C");
@@ -441,62 +763,285 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      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(104000,125000);
-     if(!kIsMC) taskjetServ->SetRealData(kTRUE);
+     else taskjetServ->SetRunRange(110000,160000);
+     taskjetServ->SetMCData(kIsMC);
      taskjetServ->SetUsePhysicsSelection((Bool_t)iPhysicsSelection);
-     taskjetServ->SetDebugLevel(0);
+     taskjetServ->SetPhysicsSelectionFlag(iPhysicsSelectionFlag); // 
+     taskjetServ->SetNonStdFile(kDeltaAODJetName.Data());
+     taskjetServ->SetTrackEtaWindow(fTrackEtaWindow);
+     taskjetServ->SetFilterMask(kHighPtFilterMask);
+     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->SetAODInput(kTRUE);
+     }
    }
 
    if(iPWG4JetSpectrum){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetSpectrum2.C");
      AliAnalysisTaskJetSpectrum2 *taskjetSpectrum = 0;
-     if(iPWG4JetSpectrum&1){
-       taskjetSpectrum = AddTaskJetSpectrum2("jets","","",kHighPtFilterMask,iPhysicsSelection);      
-       if(!iAODanalysis){
-        //      taskjetSpectrum = AddTaskJetSpectrum2("jets","tracks32",32,iPhysicsSelection);       // tmp hack to give it a different name
-        //      taskjetSpectrum = AddTaskJetSpectrum2("jets","tracks64",64,iPhysicsSelection);      
-
-        if(kIsMC){
+     TString bkgClusters = kDefaultJetBackgroundBranch.Data(); 
+     bkgClusters.ReplaceAll(Form("%s_",AliAODJetEventBackground::StdBranchName()),"");
 
-          UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |=  AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);  
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
 
-          eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
+     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));
+
+          taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),tmp.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
+
+          //      taskjetSpectrum->SetDebugLevel(3);
+          //      taskjetSpectrum->SetMinJetPt(10);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+          if(i!=1){
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,0);
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+          }
+          if(iAODanalysis)SetAODInput(taskjetSpectrum);
+
+          TString tmpCut1(kDefaultJetBranch.Data());
+          TString tmp2Cut1(kDefaultJetBranch.Data());
+          tmp2Cut1.ReplaceAll(Form(kJetSubtractMask2.Data(),1),Form(kJetSubtractMask1.Data(),0));
+          tmp2Cut1.ReplaceAll("00150","02000");
+          tmpCut1.ReplaceAll("00150","02000");
+          TString bkgClustersCut1 = tmpCut1.Data();
+          bkgClustersCut1.ReplaceAll(Form("%s_",AliAODJetEventBackground::StdBranchName()),"");
 
-          eventSelection =  AliAnalysisHelperJetTasks::kNone;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
+       
+          taskjetSpectrum = AddTaskJetSpectrum2(tmpCut1.Data(),tmp2Cut1.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+          taskjetSpectrum->SetBranchBkgRec(bkgClustersCut1.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClustersCut1.Data());
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+          if(i!=1){
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,0);
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+          }
+       
+          // 
+
+          // the random jets...
+          taskjetSpectrum = AddTaskJetSpectrum2(
+                                                Form("clustersAOD_KT04_B0_Filter%05d_Cut00150_Skip00RandomConeSkip00",kHighPtFilterMask),
+                                                Form("clustersAOD_KT04_B0_Filter%05d_Cut00150_Skip00RandomCone_random",kHighPtFilterMask),
+                                                kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+
+          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
+          taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,0);
+          taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+
+          taskjetSpectrum = AddTaskJetSpectrum2(
+                                                Form("clustersAOD_KT04_B0_Filter%05d_Cut02000_Skip00RandomConeSkip00",kHighPtFilterMask),
+                                                Form("clustersAOD_KT04_B0_Filter%05d_Cut02000_Skip00RandomCone_random",kHighPtFilterMask),
+                                                kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+          taskjetSpectrum->SetBranchBkgRec(bkgClustersCut1.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClustersCut1.Data());
+          taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,0);
+          taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+
+
+          // 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(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
+          //      taskjetSpectrum->SetDebugLevel(3);
+          //      taskjetSpectrum->SetMinJetPt(10);
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+          if(iAODanalysis)SetAODInput(taskjetSpectrum);
+          */
+          // check the old subtracted vs. the new subtracted
+          /*
+          TString tmp3(kDefaultJetBranch.Data());
+          tmp3.ReplaceAll(Form(kJetSubtractMask2.Data(),1),Form(kJetSubtractMask2.Data(),3));
+
+          taskjetSpectrum = AddTaskJetSpectrum2(tmp3.Data(),kDefaultJetBranch.Data(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+          //      taskjetSpectrum->SetDebugLevel(3);
+          //      taskjetSpectrum->SetMinJetPt(10);
+          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(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);    
+          taskjetSpectrum->SetTrackEtaWindow(fTrackEtaWindow);
+          taskjetSpectrum->SetJetEtaWindow(fJetEtaWindow);
+          taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
+          taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
+          if(i!=1){
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetRecFull,0);
+            taskjetSpectrum->SetFlagJetType(AliAnalysisTaskJetSpectrum2::kJetGenFull,0);
+          }
+          if(iAODanalysis)SetAODInput(taskjetSpectrum);
 
         }
-        else{
-          UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
-
-          eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelection,eventSelection); 
+       }
+       else{ // ! PbPb
+        Int_t i = 0;
+
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),
+                                              "",kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+        
+
+        
+        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());
+          if(iAODanalysis)SetAODInput(taskjetSpectrum);
+        }
+        if(kDefaultJetBranchMC2.Length()){
+          taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),
+                                                kDefaultJetBranchMC2.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());
+          if(iAODanalysis)SetAODInput(taskjetSpectrum);
         }
+
+        /*
+        TString tmp2(kDefaultJetBranch.Data());
+        tmp2.ReplaceAll(Form(kJetSubtractMask2.Data(),0),Form(kJetSubtractMask2.Data(),2));
+        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());
+        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(),kDeltaAODJetName.Data(),kHighPtFilterMask,AliVEvent::kMB,0,i);
+        //      taskjetSpectrum->SetDebugLevel(3);
+        //        taskjetSpectrum->SetMinJetPt(10);
+        taskjetSpectrum->SetBranchBkgRec(bkgClusters.Data());
+        taskjetSpectrum->SetBranchBkgGen(bkgClusters.Data());
+        taskjetSpectrum->SetTrackEtaWindow(0.8);
+        taskjetSpectrum->SetJetEtaWindow(0.4);
+        if(iAODanalysis)SetAODInput(taskjetSpectrum);
+        */
        }
        if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
-       //       taskjetSpectrum->SetDebugLevel(1);
      }
+   }
+   AliAnalysisManager::SetCommonFileName("PWG4_Fragmentation.root");
+   if(iPWG4Fragmentation){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
+       AliAnalysisTaskFragmentationFunction *taskFrag = 0;
+       if(kUseAODMC){
+
+       }
+       else{
+         // Anti-kT
+         taskFrag = AddTaskFragmentationFunction(1<<23,kHighPtFilterMask, 1);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         taskFrag = AddTaskFragmentationFunction(1<<23,kHighPtFilterMask, 2);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         taskFrag = AddTaskFragmentationFunction(1<<23,kHighPtFilterMask, 3);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         taskFrag = AddTaskFragmentationFunction(1<<23,kHighPtFilterMask, 4);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         // UA1
+         taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask, 1); 
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+        taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask, 2); 
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+        taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask, 3); 
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+        taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask, 4); 
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+         // SISCONE 
+        /*
+         taskFrag = AddTaskFragmentationFunction(1<<28,kHighPtFilterMask, 1);
+         taskFrag = AddTaskFragmentationFunction(1<<29,kHighPtFilterMask, 1);
+         taskFrag = AddTaskFragmentationFunction(1<<30,kHighPtFilterMask, 1);
+        */
+
+         // Anti-kT B2 - B3
+         taskFrag = AddTaskFragmentationFunction(1<<26,kHighPtFilterMask, 1);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
+
+
+         taskFrag = AddTaskFragmentationFunction(1<<27,kHighPtFilterMask, 1);
+        if(kDeltaAODJetName.Length()>0)taskFrag->SetNonStdFile(kDeltaAODJetName.Data());
+        if(iAODanalysis==2)taskFrag->UseAODInputJets(kFALSE);
 
-     if(iPWG4JetSpectrum&2){
-       UInt_t selection = 0;
-       if(!iAODanalysis){
-        selection = 0xffffff;
-        // switch off 07 radii
-        selection &= ~(1<<6)&~(1<<11)&~(1<<12)&~(1<<13)&~(1<<14);
        }
-       else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9;
-       AddTaskJetSpectrum2Delta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,selection);
+       if (!taskFrag) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskFragmentationFunction cannot run for this train conditions - EXCLUDED");
+   }
+
+   if(iPWG4JetChem){
+     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/PWG4/macros/AddTaskJetResponse.C");
+     AliAnalysisTask *taskJetResponse = 0;
+
+     if(iJETAN){
+        taskJetResponse = AddTaskJetResponse("jets", "FASTJET", 0.4, kHighPtFilterMask, 0.15, 0);
+        taskJetResponse = AddTaskJetResponse("jets", "FASTJET", 0.4, kHighPtFilterMask, 0.15, 1);
+
+        taskJetResponse = AddTaskJetResponse("jets", "UA1", 0.4, kHighPtFilterMask, 1., 0);
+        taskJetResponse = AddTaskJetResponse("jets", "UA1", 0.4, kHighPtFilterMask, 1., 2);
      }
+     if(iPWG4Cluster){
+        taskJetResponse = AddTaskJetResponse("clusters", "ANTIKT", 0.4, kHighPtFilterMask, 0.15, 0);
+        taskJetResponse = AddTaskJetResponse("clusters", "ANTIKT", 0.4, kHighPtFilterMask, 0.15, 1);
+     }
+     if (!taskJetResponse) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetResponse cannot run for this train conditions - EXCLUDED");
+
    }
+
    if(iPWG4JCORRAN){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJCORRANTask.C");
      AliJCORRANTask* corran = AddTaskJCORRAN(kDeltaAODJCORRANName.Data(),0);
@@ -524,6 +1069,15 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
      if (!taskUE) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskUE cannot run for this train conditions - EXCLUDED");
    }
+
+   if(iPWG4LeadingUE){
+     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);
+   }
+
+
    if(iPWG4CorrectionsUE){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskCorrectionsUE.C");
      AliAnalysisTaskCorrectionsUE *taskCorrectionsUE = 0;
@@ -536,17 +1090,47 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      AliAnalysisTaskThreeJets *taskThree = AddTaskThreeJets();
      if(!taskThree)::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskThreets cannot run for this train conditions - EXCLUDED");
    }
+   if(iPWG4QGSep){
+     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/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/PWG4/macros/AddTaskPWG4HighPtQAMC.C");
-     AliPWG4HighPtQAMC *taskQAMC = AddTaskPWG4HighPtQAMC();
+     AliPWG4HighPtQAMC *taskQAMC = 0;
+     if(kUseMC){
+       if(iPWG4PtQAMC&1){
+        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),0);
+        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),1);
+        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),2);
+        taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),3);
+       }
+     }
      if (!taskQAMC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQAMC cannot run for this train conditions - EXCLUDED");
    }
 
+   if(iPWG4PtTrackQA){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtTrackQA.C");
+
+     AddTaskPWG4HighPtTrackQAAll(kGridDataSet.Data(),kIsPbPb,iAODanalysis);
+
+   }
+
    if(iPWG4PtQATPC){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtQATPConly.C");
      AliPWG4HighPtQATPConly *taskQATPC = 0;
-     if(iPWG4PtQATPC&1)taskQATPC = AddTaskPWG4HighPtQATPConly(1);
-     if(iPWG4PtQATPC&2)taskQATPC = AddTaskPWG4HighPtQATPConly(2);
+     if(iPWG4PtQATPC&1)taskQATPC = AddTaskPWG4HighPtQATPConly(kGridDataSet.Data(),1);
+     if(iPWG4PtQATPC&2)taskQATPC = AddTaskPWG4HighPtQATPConly(kGridDataSet.Data(),2);
 
  if (!taskQATPC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQATPC cannot run for this train conditions - EXCLUDED");
    }
@@ -563,42 +1147,15 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    if(iPWG4PtSpectra){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtSpectra.C");
-     AliPWG4HighPtSpectra *taskPtSpectra = AddTaskPWG4HighPtSpectra();
-     if (!taskPtSpectra) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskPtSpectra cannot run for this train conditions - EXCLUDED");
+     AddTaskPWG4HighPtSpectraAll(kGridDataSet.Data(),kIsPbPb);
    }
+
    if(iPWG4KMeans){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskKMeans.C");
      AliAnalysisTaskKMeans *taskKMeans = AddTaskKMeans();
      if (!taskKMeans) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskKMenans cannot run for this train conditions - EXCLUDED");
    }
 
-   if(iPWG4Cluster){
-     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetCluster.C");
-     AliAnalysisTaskJetCluster *taskCl = 0;
-     if(iPWG4Cluster&1){
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT");
-     }
-     if(iPWG4Cluster&2){
-       UInt_t selection = 0;
-       if(!iAODanalysis) selection = 0xffffff;
-       else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9;
-       selection&=~(1<<4); // exluded R = .04 already the dafault
-       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"KT",selection);
-     }
-     if(iPWG4Cluster&4){
-       UInt_t selection = 0;
-       if(!iAODanalysis){
-        selection = 0xffffff;
-        selection &= ~(1<<1)&~(1<<3)&~(1<<5)&~(1<<7)&~(1<<9);
-       }
-       else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9;
-       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"ANTIKT",selection);
-     }
-
-
-     if (!taskCl) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskCluster cannot run for this train conditions - EXCLUDED");
-
-   }
    if(iPWG4PartCorr){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPartCorr.C");
      AliAnalysisTaskParticleCorrelation *taskpartcorrPHOS = AddTaskPartCorr("AOD", "PHOS",kFALSE,kIsMC);
@@ -646,9 +1203,10 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       //      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";
-      TString gcArguments = "-run-on-train -run-jet -run-omega-meson -run-neutralmeson";
-      TString kGCAnalysisCutSelectionId="9002111000";
-      gcArguments.Append(Form("-set-cut-selection  %s ",kGCAnalysisCutSelectionId.Data()));
+      TString gcArguments = "-run-on-train -run-jet -run-omega-meson -use-own-xyz -run-neutralmeson -no-aod";
+      //      TString kGCAnalysisCutSelectionId="9003562000100310";
+      //      TString kGCAnalysisCutSelectionId="9003562000100312";
+      //      gcArguments.Append(Form(" -set-cut-selection %s ",kGCAnalysisCutSelectionId.Data()));
       if(!kIsMC)gcArguments += " -mc-off";
       AliAnalysisTaskGammaConversion * taskGammaConversion = AddTaskGammaConversion(gcArguments,mgr->GetCommonInputContainer());
       gSystem->ChangeDirectory(cdir);
@@ -680,7 +1238,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        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());
@@ -688,21 +1246,32 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        TString dest;
        dest = Form("%s/%s/%s.jdl",alien_workdir.Data(),gridhandler->GetGridOutputDir(),kTrainName.Data());
        if(AliAnalysisAlien::FileExists(dest.Data())){
-        //      Printf("%s exist on grid removing...",dest.Data());
-        //      gGrid->Rm(dest.Data());
+        Printf("%s exist on grid removing...",dest.Data());
+        gGrid->Rm(dest.Data());
        }
+       Printf("%s copy ...",dest.Data());
        TFile::Cp(Form("file:%s.jdl",kTrainName.Data()),Form("alien://%s",dest.Data()));
 
 
        TString dest;
        dest = Form("%s/%s/%s_merge.jdl",alien_workdir.Data(),gridhandler->GetGridOutputDir(),kTrainName.Data());
        if(AliAnalysisAlien::FileExists(dest.Data())){
-        //      Printf("%s exist on grid removing...",dest.Data());
-        //      gGrid->Rm(dest.Data());
+        Printf("%s exist on grid removing...",dest.Data());
+        gGrid->Rm(dest.Data());
        }
+       Printf("%s copy ...",dest.Data());
        TFile::Cp(Form("file:%s_merge.jdl",kTrainName.Data()),Form("alien://%s",dest.Data()));
-
        
+       dest = Form("%s/%s/%s_merge_final.jdl",alien_workdir.Data(),gridhandler->GetGridOutputDir(),kTrainName.Data());
+       if(AliAnalysisAlien::FileExists(dest.Data())){
+        Printf("%s exist on grid removing...",dest.Data());
+        gGrid->Rm(dest.Data());
+       }
+       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());
@@ -710,6 +1279,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        }
        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")){
@@ -730,7 +1300,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if (!strcmp(plugin_mode, "offline")&&smode=="GRID"){
        // Offline mode path files
        //      PatchJDL();
-       PatchAnalysisMacro();
+       //       PatchAnalysisMacro();
      }
 
      if (kSaveTrain && smode=="GRID") {
@@ -738,7 +1308,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        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());
@@ -779,13 +1349,14 @@ void StartAnalysis(const char *mode, TChain *chain) {
                ::Error("AnalysisTrainPWG4Jets.C::StartAnalysis", "Grid plugin not initialized");
                return;
             }   
-            mgr->StartAnalysis("grid");
+            mgr->StartAnalysis("grid",chain,kNumberOfEvents);
          } else {
             if (!chain) {
                ::Error("AnalysisTrainPWG4Jets.C::StartAnalysis", "Cannot create the chain");
                return;
             }   
-            mgr->StartAnalysis(mode, chain);
+           //            mgr->StartAnalysis(mode, chain);
+            mgr->StartAnalysis(mode, chain,kNumberOfEvents);
          }   
          return;
    }      
@@ -823,6 +1394,14 @@ void CheckModuleFlags(const char *mode) {
      kUseTR = kFALSE;
    }
 
+   // Decide if we have PbPb
+   if(kGridDataSet.CompareTo("LHC10h")==0||kGridDataSet.Contains("LHC10h")) {
+     Printf("Using settings for Pb+Pb");
+     kIsPbPb = true;
+   }
+
+   
+
    if (iAODanalysis) {
    // AOD analysis
       if (kUseMC)
@@ -873,8 +1452,14 @@ void CheckModuleFlags(const char *mode) {
       if (iPWG4GammaConv)::Info("AnalysisPWG4Jets.C::CheckModuleFlags", "PWG4gammaconv disabled on AOD's");
       iPWG4GammaConv = 0;   
       iPWG1QASym     = 0;
+      iCentralitySelection = 0;
    } else {   
    // ESD analysis
+
+     if(kIsPbPb){
+       iCentralitySelection = 1;
+     }
+
      if (!kUseMC){
        kUseTR = kFALSE;
        
@@ -885,10 +1470,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;
      }
@@ -897,15 +1478,15 @@ void CheckModuleFlags(const char *mode) {
        kUseMuonfilter = kFALSE;
       }
       if(!iJETAN){
-       iPWG4JetSpectrum = iPWG4UE =  iPWG4CorrectionsUE = iPWG4ThreeJets = iDIJETAN = 0;
+       iPWG4JetSpectrum = iPWG4UE =  iPWG4CorrectionsUE = iPWG4ThreeJets = iPWG4QGSep = iDIJETAN = 0;
       }
    }
-   iPWG4JetTasks = iPWG4JetServices||iPWG4JetSpectrum||iPWG4UE||iPWG4PtQAMC||iPWG4PtSpectra||iPWG4PtQATPC||iPWG4Cosmics||iPWG4ThreeJets||iPWG4JetChem||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 = iPWG4PartCorrLibs||iPWG4JCORRAN||iPWG4GammaConvLib||iJETAN;
    iJETANLib = iPWG4JetTasks||iJETAN||iDIJETAN;
 
    if (iESDfilter) {iAODhandler=1;}
@@ -993,15 +1574,16 @@ Bool_t Connect(const char *mode) {
 //______________________________________________________________________________
 Bool_t LoadCommonLibraries(const char *mode)
 {
-// Load common analysis libraries.
+   if (!gSystem->Getenv("ALICE_ROOT")) {
+      ::Error("AnalysisTrainPWG4Jets.C", "Analysis train requires that ALICE_ROOT is set to pick up Configurations"); 
+      return kFALSE;
+   }   
+   
+   // Load common analysis libraries.
    Int_t imode = -1;
    if (!strcmp(mode, "LOCAL")) imode = 0;
    if (!strcmp(mode, "PROOF")) imode = 1;
    if (!strcmp(mode, "GRID"))  imode = 2;
-   if (!gSystem->Getenv("ALICE_ROOT")) {
-      ::Error("AnalysisTrainPWG4Jets.C::LoadCommonLibraries", "Analysis train requires that analysis libraries are compiled with a local AliRoot"); 
-      return kFALSE;
-   }   
    Bool_t success = kTRUE;
    // ROOT libraries
    gSystem->Load("libTree.so");
@@ -1019,6 +1601,9 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("AOD", mode, kTRUE);
             success &= LoadLibrary("ANALYSIS", mode, kTRUE);
             success &= LoadLibrary("ANALYSISalice", mode, kTRUE);
+            success &= LoadLibrary("OADB", mode, kTRUE);
+            success &= LoadLibrary("ROOTFILES", mode, kTRUE);
+           //            success &= LoadLibrary("EventMixing", mode,kTRUE);
             success &= LoadLibrary("CORRFW", mode, kTRUE);
          } else {   
             success &= LoadLibrary("libSTEERBase.so", mode);
@@ -1026,6 +1611,8 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("libAOD.so", mode);
             success &= LoadLibrary("libANALYSIS.so", mode);
             success &= LoadLibrary("libANALYSISalice.so", mode);
+            success &= LoadLibrary("libOADB.so", mode, kTRUE);
+           //            success &= LoadLibrary("libEventMixing.so", mode);
             success &= LoadLibrary("libCORRFW.so", mode);
             gROOT->ProcessLine(".include $ALICE_ROOT/include");
          }   
@@ -1039,6 +1626,7 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("AOD", mode);
             success &= LoadLibrary("ANALYSIS", mode);
             success &= LoadLibrary("ANALYSISalice", mode);
+            success &= LoadLibrary("EventMixing", mode);
             success &= LoadLibrary("CORRFW", mode);
          } else { 
             ires = gProof->EnablePackage(kProofAFversion);
@@ -1066,13 +1654,23 @@ Bool_t LoadAnalysisLibraries(const char *mode)
 {
 // Load common analysis libraries.
   Bool_t success = kTRUE;
+  if (useTender) {
+      if (!LoadLibrary("TENDER", mode, kTRUE) ||
+          !LoadLibrary("TENDERSupplies", mode, kTRUE)) return kFALSE;
+   }
    if (iESDfilter) {
+     /*
       if (!LoadLibrary("PWG3base", mode, kTRUE) ||
           !LoadLibrary("PWG3muon", mode, kTRUE)) return kFALSE;
+     */
    }   
    // 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); 
@@ -1109,18 +1707,6 @@ Bool_t LoadAnalysisLibraries(const char *mode)
      if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskEta.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), 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 (iPWG4PartCorrLibs) {   
       if (!LoadLibrary("PWG4PartCorrBase", mode, kTRUE) ||
           !LoadLibrary("PWG4PartCorrDep", mode, kTRUE)) return kFALSE;
@@ -1288,11 +1874,13 @@ TChain *CreateChain(const char *mode, const char *plugin_mode)
               TString line;
               ifstream in;
               in.open(kLocalDataList.Data());
+              Int_t ic = 0;
               while (in.good()) {
                 in >> line;
                 if (line.Length() == 0) continue;
-                // cout << " line = " << line << endl;
+                Printf("%d adding %s",ic,line.Data());
                 chain->Add(line.Data());
+                ic++;
               }       
             } else {
                // Interactive AOD
@@ -1394,7 +1982,10 @@ Int_t SetupPar(char* pararchivename)
            printf("*******************************\n");
            gROOT->Macro("PROOF-INF/SETUP.C");
        }       
-       if (!gSystem->ChangeDirectory(ocwd.Data())) return -1;
+       if (!gSystem->ChangeDirectory(ocwd.Data())){
+         Error("Change back directory",Form("Cannot change to %s",ocwd.Data()));
+         return -1;
+       }
    return 0;
 }
 
@@ -1404,13 +1995,13 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Check if user has a valid token, otherwise make one. This has limitations.
 // One can always follow the standard procedure of calling alien-token-init then
 //   source /tmp/gclient_env_$UID in the current shell.
-   if (!AliAnalysisGrid::CreateToken()) return NULL;
+//   if (!AliAnalysisGrid::CreateToken()) return NULL;
    AliAnalysisAlien *plugin = new AliAnalysisAlien();
 // Set the run mode (can be "full", "test", "offline", "submit" or "terminate")
    plugin->SetRunMode(plugin_mode);
    if (kPluginUseProductionMode) plugin->SetProductionMode();
    plugin->SetJobTag(kJobTag);
-   plugin->SetNtestFiles(2);
+   plugin->SetNtestFiles(1);
 //   plugin->SetPreferedSE("ALICE::NIHAM::File");
 // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
@@ -1424,7 +2015,8 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    plugin->SetGridDataDir(kGridDatadir.Data());
 // Set data search pattern
    if (iAODanalysis) plugin->SetDataPattern(" *AliAOD.root");
-   else              plugin->SetDataPattern(Form(" %s/*/*ESD.tag.root",kGridPassPattern.Data()));
+   //   else              plugin->SetDataPattern(Form(" %s/*/*ESD.tag.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]);
    for (Int_t i=kGridRunRange[0]; i<=kGridRunRange[1]; i++) {
@@ -1436,7 +2028,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
      ifstream in1;
      in1.open(kGridLocalRunList.Data());
      int iRun;
-
+     int icount = 0;
      /*
      char c;
      char cLine[250];
@@ -1444,7 +2036,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
        c = in1.get();
        if ( (c >= '0') && (c <= '9') )
         {
-          in1.putback (c);
+          in1.putback (c)s;
           in1>>iRun;
           Printf("AnalysisTrainPWG4Jets Adding run number from File %s", Form(kGridRunPattern.Data(),iRun));
           plugin->AddRunNumber(Form(kGridRunPattern.Data(),iRun));
@@ -1462,14 +2054,19 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 
      // just use run numbers, negatives will be excluded
      while(in1>>iRun){
-       
-       if(iRun>0&&(nRun<kGridMaxRunsFromList)){
-          Printf("AnalysisTrainPWG4Jets Adding run number from File %s", Form(kGridRunPattern.Data(),iRun));
+       if(iRun>=0){
+        if(iRun>=0&&nRun>=kGridOffsetRunFromList&&(nRun<kGridMaxRunsFromList)){
+          Printf("AnalysisTrainPWG4Jets Adding run number from File %d: %s",nRun,Form(kGridRunPattern.Data(),iRun));
           plugin->AddRunNumber(Form(kGridRunPattern.Data(),iRun));
-          nRun++;
+
+        }
+        else{
+          Printf("AnalysisTrainPWG4Jets Skipping run number from File %d: %d",nRun, iRun);
+        }
+        nRun++;
        }
        else{
-        Printf("AnalysisTrainPWG4Jets Skipping run number from File %d", iRun);
+        Printf("AnalysisTrainPWG4Jets Skipping run number from File %d: %d",nRun, iRun);
        }
      }
    }
@@ -1485,7 +2082,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.
@@ -1572,7 +2169,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    // if we do not fill the aod we do not need to store it
    //   kGridMergeExclude = listaods;
    
-   if(kSaveAOD!=0){
+   if(kSaveAOD>=0){
      TString outputFiles =  "";
      outputFiles += mgr->GetExtraFiles();
      if (listhists.Length()) outputFiles += " ";
@@ -1600,52 +2197,63 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
      }
      
      // 
+     plugin->SetDefaultOutputs(kFALSE);
      Printf("%s:%d Saving the files %s",(char*)__FILE__,__LINE__,outputFiles.Data());
      plugin->SetOutputFiles(outputFiles.Data());
    }
 
    TString outputArchive;
-   outputArchive = Form("log_archive.zip:std*@%s",kGridOutputStorages.Data());
+   outputArchive = Form("log_archive.zip:std*@%s","disk=1");
    listaods.ReplaceAll(" ", ",");
    listhists.ReplaceAll(" ", ",");
-   if (listhists.Length()) listhists = Form("hist_archive.zip:%s@%s", listhists.Data(), kGridOutputStorages.Data());
-   if (listaods.Length())  listaods  = Form("aod_archive.zip:%s@%s", listaods.Data(), kGridOutputStorages.Data());
-
-   if (!listhists.Length() && !listaods.Length()) {
+   if (listhists.Length()){
+     outputArchive += " ";
+     outputArchive += "root_archive.zip:";
+     outputArchive += listhists;
+     if (listaods.Length()){
+       outputArchive += ",";
+       outputArchive += listaods;
+     }
+     outputArchive += Form("@%s", kGridOutputStorages.Data());
+   }
+   else{
+     
+     if (listaods.Length()){
+       // we have only aod'ish output
+       outputArchive += " ";
+       outputArchive += "root_archive.zip:";
+       outputArchive += listaods;
+       outputArchive += Form("@%s", kGridOutputStorages.Data());
+     }
+     else{
+       // no other outputs than std..
       ::Fatal("AnalysisTrainPWG4Jets", "No task output !");
+     }
    }
-   
-   if (listaods.Length()) {
-      outputArchive += " ";
-      outputArchive += listaods;
-   }   
-   if (listhists.Length()) {
-      outputArchive += " ";
-      outputArchive += listhists;
-   }   
+
    plugin->SetDefaultOutputs(kFALSE);
    plugin->SetOutputArchive(outputArchive);
 
 
-// Optionally set a name for the generated analysis macro (default MyAnalysis.C)
+   // Optionally set a name for the generated analysis macro (default MyAnalysis.C)
    plugin->SetAnalysisMacro(Form("%s.C", kTrainName.Data()));
-// Optionally set maximum number of input files/subjob (default 100, put 0 to ignore)
+   // Optionally set maximum number of input files/subjob (default 100, put 0 to ignore)
    plugin->SetSplitMaxInputFileNumber(kGridFilesPerJob);
-// Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
-//   plugin->SetMaxInitFailed(5);
-// Optionally resubmit threshold.
-//   plugin->SetMasterResubmitThreshold(90);
-// Optionally set time to live (default 30000 sec)
-   plugin->SetTTL(50400); // 14h...
-// Optionally set input format (default xml-single)
+   // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
+   //   plugin->SetMaxInitFailed(5);
+   // Optionally resubmit threshold.
+   // plugin->SetMasterResubmitThreshold(90);
+   // Optionally set time to live (default 30000 sec)
+   plugin->SetTTL(54000); // 15h...
+   // Optionally set input format (default xml-single)
    plugin->SetInputFormat("xml-single");
-// Optionally modify the name of the generated JDL (default analysis.jdl)
+   // Optionally modify the name of the generated JDL (default analysis.jdl)
    plugin->SetJDLName(Form("%s.jdl", kTrainName.Data()));
-// Optionally modify the executable name (default analysis.sh)
+   // Optionally modify the executable name (default analysis.sh)
    plugin->SetExecutable(Form("%s.sh", kTrainName.Data()));
-// Optionally modify job price (default 1)
+   // Optionally modify job price (default 1)
    plugin->SetPrice(1);      
-// Optionally modify split mode (default 'se')    
+   // Optionally modify split mode (default 'se')    
    plugin->SetSplitMode("se");
    return plugin;
 }
@@ -1777,12 +2385,18 @@ Bool_t PatchAnalysisMacro(){
   add += "\n\n // added by CKB \n";
   if(kErrorIgnoreLevel>0)add += Form("gErrorIgnoreLevel = %d;\n",kErrorIgnoreLevel);
   add += "\n gSystem->AddIncludePath(\"./\"); \n";
+  add += "\n gSystem->SetFPEMask(); \n";
+
+
   if(gGrid&&kPluginAliRootVersion.Length()==0){
+    /*
     add += "\n // Dirty hack for TRD reference data \n";
     add += "\n gSystem->Setenv(\"ALICE_ROOT\",\"";
     add += Form("alien://%s/rootfiles/",gGrid->GetHomeDirectory());
     add += "\"); \n";
+    */
   }
+
   add += "// BKC \n\n";
   st.Insert(index,add.Data());
 
@@ -1829,10 +2443,12 @@ Bool_t PatchAnalysisMacro(){
   TString add2 = "";
   add2 += "\n gSystem->AddIncludePath(\"./\"); \n";
   if(gGrid&&kPluginAliRootVersion.Length()==0){
+    /*
     add2 += "\n // Dirty hack for TRD reference data \n";
     add2 += "\n gSystem->Setenv(\"ALICE_ROOT\",\"";
     add2 += Form("alien://%s/rootfiles/",gGrid->GetHomeDirectory());
     add2 += "\"); \n";
+    */
   }
   add2 += "// BKC \n\n";
   if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__);
@@ -1850,9 +2466,9 @@ Bool_t PatchAnalysisMacro(){
   }
 
   // do not exclude the extra files from merign, this is done explicitly in this train script
-  index = st2.Index("mergeExcludes +="); // uncommen $ALICE_ROOT include for par files
-  if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__);
-  st2.Insert(index,"// CKB comment out, handled explicitly by the train macro \n //");
+  //  index = st2.Index("mergeExcludes +="); // uncommen $ALICE_ROOT include for par files
+  //  if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__);
+  // st2.Insert(index,"// CKB comment out, handled explicitly by the train macro \n //");
 
 
   ofstream out2;