]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/macros/AnalysisTrainPWG4Jets.C
updates for differnt jet configs (including background), reduced number of UA1 Jets
[u/mrichter/AliRoot.git] / PWG4 / macros / AnalysisTrainPWG4Jets.C
index feae4c69f7631dcdf2397297e4d920c46ed473b0..46db041384327d6a06c492f4a5d3eabef5e3132e 100644 (file)
@@ -37,11 +37,15 @@ Int_t       kSaveAOD = 8;        // Bit switch 1 = Full AOD 2 = Jet AOD , 4 = Pa
 
 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 = 0; // 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";
+TString     kCaloQAOutputFileName = "PWG4_CaloQAOutput.root";
 
 
 //== general process variables
@@ -51,8 +55,18 @@ TString     kCommonOutputFileName = "PWG4_JetTasksOutput.root";
 Bool_t      kSkipTerminate      = kTRUE; // Do not call Teminate
 Bool_t      kUseDate            = kFALSE; // use date in train name
 Bool_t      kUseDebug           = kTRUE; // activate debugging
-Int_t       kUseSysInfo         = 0; // activate debugging
-Long_t      kNumberOfEvents     = 1234567890; // number of events to process from the chain
+Int_t         kErrorIgnoreLevel = -1; // takes the errror print level from .rootrc 
+// From TError.h:
+// const Int_t kUnset    =  -1;
+// const Int_t kPrint    =   0;
+// const Int_t kInfo     =   1000;
+// const Int_t kWarning  =   2000;
+// const Int_t kError    =   3000;
+// const Int_t kBreak    =   4000;
+// const Int_t kSysError =   5000;
+// const Int_t kFatal    =   6000; 
+Int_t         kUseSysInfo         = 0; // activate debugging
+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
@@ -60,6 +74,7 @@ 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.
@@ -73,14 +88,18 @@ Int_t       iPWG4JetServices   = 0;      // jet spectrum analysis
 Int_t       iPWG4JetSpectrum   = 0;      // jet spectrum analysis
 Int_t       iPWG4JCORRAN       = 0;      // JCORRAN module
 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       iPWG4TmpSourceFrag = 0;      // Bastian's Fragmentation function not in svn
+Int_t       iPWG4Fragmentation = 0;      // Official Fragmentation
 Int_t       iPWG4JetChem       = 0;      // Jet chemistry 
 Int_t       iPWG4PtQAMC        = 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
@@ -90,11 +109,13 @@ Int_t       iPWG4CaloQA        = 0;      // Gustavo's part corr analysis
 Int_t       iPWG4JetCorr       = 0;     // Paul's jet corr analysis
 Int_t       iPWG4Tagged        = 0;      // Gustavo's part corr analysis
 Int_t       iPWG4omega3pi      = 0;      // Omega to 3 pi analysis (PWG4) 
+Int_t       iPWG4GammaConvLib     = 0;      // Gamma Conversio
 Int_t       iPWG4GammaConv     = 0;      // Gamma Conversio
-Int_t       kHighPtFilterMask  = 16;     // change depending on the used AOD Filter
+Int_t       iPWG4CaloConv     = 0;      // Gamma Conversio
+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";     
 
 
 //==============================================================================
@@ -120,7 +141,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-27-06b";  // *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
@@ -131,14 +152,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 
-Int_t       kGridRunRange[2]       =  {0, -1}; // Set the run range
+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      = 12; // 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
@@ -154,6 +177,7 @@ 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;
 
 
 // Temporaries.
@@ -167,65 +191,80 @@ 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;
+  
+  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());
    printf("==================================================================\n");
-   printf("=  Configuring analysis train for:                               =\n");
+                              printf("=  Configuring analysis train for:                               =\n");
    if (iAODanalysis) printf("=  AOD analysis                                                  =\n");
-   else              printf("=  ESD analysis                                                  =\n");
-   if (iPhysicsSelection)   printf("=  Physics selection                                                    =\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");
-   printf(":: use Fill AOD      %d\n", (UInt_t)kFillAOD);
-   printf(":: use Save AOD      %d\n", (UInt_t)kSaveAOD);
-   printf(":: use MC truth      %d\n", (UInt_t)kUseMC);
-   printf(":: use KINE filter   %d\n", (UInt_t)kUseKinefilter);
-   printf(":: use track refs    %d\n", (UInt_t)kUseTR);
-   printf(":: use tags          %d\n", (UInt_t)kUseESDTags);
-   printf(":: use AOD tags      %d\n", (UInt_t)kUseAODTags);
-   printf(":: use debugging     %d\n", (UInt_t)kUseDebug);
-   printf(":: use PAR files     %d\n", (UInt_t)kUsePAR);
-   printf(":: use AliEn plugin  %d\n", (UInt_t)kPluginUse);
-   printf(":: use PWG1 QA sym         %d\n", iPWG1QASym);
-   printf(":: use PWG4 Source Sara    %d\n",iPWG4TmpSourceSara);
-   printf(":: use PWG4 Source BB      %d\n",iPWG4TmpSourceFrag);
-   printf(":: use PWG4 Jet Chem       %d\n",iPWG4JetChem);
-   printf(":: use PWG4 Jet tasks      %d\n",iPWG4JetTasks);
-   printf(":: use PWG4 Jet Services   %d\n",iPWG4JetServices);     
-   printf(":: use PWG4 Jet Spectrum   %d\n",iPWG4JetSpectrum);
-   printf(":: use PWG4 JCORRAN        %d\n",iPWG4JCORRAN);
-   printf(":: use PWG4 UE             %d \n",iPWG4UE); 
-   printf(":: use PWG4 Pt QA MC       %d\n",iPWG4PtQAMC);
-   printf(":: use PWG4 Pt Spectra     %d\n",iPWG4PtSpectra);
-   printf(":: use PWG4 Pt QA TPC      %d\n",iPWG4PtQATPC);     
-   printf(":: use PWG4 Cosmics        %d\n",iPWG4Cosmics);     
-   printf(":: use PWG4 Three Jets     %d\n",iPWG4ThreeJets);
-   printf(":: use PWG4 KMeans         %d\n",iPWG4KMeans);
-   printf(":: use PWG4 Cluster        %d\n",iPWG4Cluster);
-   printf(":: use PWG4 Part Corr      %d\n",iPWG4PartCorr);
-   printf(":: use PWG4 Calo QA        %d\n",iPWG4CaloQA);
-   printf(":: use PWG4 Jet Corr       %d\n",iPWG4JetCorr);
-   printf(":: use PWG4 JCORRAN        %d\n",iPWG4JCORRAN);
-   printf(":: use PWG4 Tagged         %d\n",iPWG4Tagged);
-   printf(":: use PWG4 omega to 3 pi  %d\n",iPWG4omega3pi);
-   printf(":: use PWG4 Gamma Conv     %d\n",iPWG4GammaConv);
-   printf(":: use HighPt FilterMask   %d\n",kHighPtFilterMask);    
+
+   char *printMask = ":: %20s  %10d\n";
+   printf(printMask,"Fill AOD",(UInt_t)kFillAOD);
+   printf(printMask,"Save AOD", (UInt_t)kSaveAOD);
+   printf(printMask,"MC truth", (UInt_t)kUseMC);
+   printf(printMask,"KINE filter", (UInt_t)kUseKinefilter);
+   printf(printMask,"track refs", (UInt_t)kUseTR);
+   printf(printMask,"tags", (UInt_t)kUseESDTags);
+   printf(printMask,"AOD tags", (UInt_t)kUseAODTags);
+   printf(printMask,"debugging", (UInt_t)kUseDebug);
+   printf(printMask,"PAR files", (UInt_t)kUsePAR);
+   printf(printMask,"AliEn plugin", (UInt_t)kPluginUse);
+   printf(printMask,"PWG1 QA sym", iPWG1QASym);
+   printf(printMask,"PWG4 Source Sara",iPWG4TmpSourceSara);
+   printf(printMask,"PWG4 Fragmentation",iPWG4Fragmentation);
+   printf(printMask,"PWG4 Jet Chem",iPWG4JetChem);
+   printf(printMask,"PWG4 Jet tasks",iPWG4JetTasks);
+   printf(printMask,"PWG4 Jet Services",iPWG4JetServices);     
+   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 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);
+   printf(printMask,"PWG4 Calo QA",iPWG4CaloQA);
+   printf(printMask,"PWG4 Jet Corr",iPWG4JetCorr);
+   printf(printMask,"PWG4 JCORRAN",iPWG4JCORRAN);
+   printf(printMask,"PWG4 Tagged",iPWG4Tagged);
+   printf(printMask,"PWG4 omega to 3 pi ",iPWG4omega3pi);
+   printf(printMask,"PWG4 Gamma Conv",iPWG4GammaConv);
+   printf(printMask,"PWG4 Calo Conv",iPWG4CaloConv);
+   printf(printMask,"HighPt FilterMask",kHighPtFilterMask);    
    
    //==========================================================================
    // Connect to back-end system
@@ -262,8 +301,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();
@@ -286,14 +325,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();
    }
@@ -307,10 +340,11 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if(kGridMergeExclude.Length())kGridMergeExclude += " ";
      kGridMergeExclude += "syswatch.root";
    }
-
    else{
      AliLog::SetGlobalLogLevel(AliLog::kError);
    }
+
+
    //==========================================================================
    // Create the chain. In this example it is created only from ALIEN files but
    // can be done to work in batch or grid mode as well.
@@ -324,15 +358,47 @@ 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);
+   }
+
+
+
    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);  
+     iPhysicsSelectionFlag = AliVEvent::kMB;
+   }
+
+   if(iCentralitySelection){
+
+     // has to run before AOD filter
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskCentralitySelection.C");
+     const char* file1="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137161_v5.root";
+     const char* file2="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137366_v3.root";
+     AliCentralitySelectionTask *taskC = AddTaskCentralitySelection(file1,file2);
+      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);
+
       if(kIsMC){
        mgr->RegisterExtraFile("pyxsec_hists.root");
        if(kGridMergeExclude.Length())kGridMergeExclude += " ";
@@ -355,14 +421,180 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    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);
-       else selection = 0xffffff&~(1<<13);  // selection = 1<<0|1<<1|1<<2|1<<5|1<<6|1<<7|1<<8|1<<9|1<<10|1<<11|1<<12; (DA takes quite long....)
+       // Set only few jet finders  backgroudn subtraction w an wo 
+       
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,0.15,0); // low p_T no background subtraction
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,0.15,1); // low p_T background subtraction
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1,0);     // high p_T no abackground subtraction
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1,1);     // high p_T abackground subtraction
+
+
+       /*
+         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);
+       }
+       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);
+       }
        AddTaskJetsDelta(kDeltaAODJetName.Data(),kHighPtFilterMask,kUseAODMC,selection); 
+       AddTaskJets("AOD","FASTKT",0.2,kHighPtFilterMask); 
+       */
       }
       if (!taskjets) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJets cannot run for this train conditions - EXCLUDED");
+       if(kDeltaAODJetName.Length()>0)mgr->RegisterExtraFile(kDeltaAODJetName.Data()); 
+   }
+
+   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.2,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetBackgroundCalc(kTRUE);       
+        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        */
+
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(0.9);
+
+        taskCl = AddTaskJetCluster("AOD","",256,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(0.9);
+
+
+        /*
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.2,0,1, kDeltaAODJetName.Data()); // this one is for the background and random jets
+        taskCl->SetBackgroundCalc(kTRUE);       
+        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        */
+
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),1.); // this one is for the background and random jets
+        taskCl->SetBackgroundCalc(kTRUE);
+        taskCl->SetCentralityCut(fCenLo,fCenUp);
+        taskCl->SetGhostEtamax(0.9);
+
+
+       }
+       else{
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1,kDeltaAODJetName.Data()); // this one is for the background jets
+        taskCl->SetBackgroundCalc(kTRUE);
+       }
+
+       /*
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data()); 
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04");
+       */
+
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetJetTriggerPtCut(40.);//
+       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00144_Cut0150_Skip00");
+
+
+       taskCl = AddTaskJetCluster("AOD","",256,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetJetTriggerPtCut(40.);//
+       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00256_Cut0150_Skip00");
+
+
+
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),1);
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00144_Cut01000_Skip00");
+
+
+
+       if(kUseAODMC){
+        if(kIsPbPb){
+          // calcluate the backgrounds first, but only R = 0.4
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1,kDeltaAODJetName.Data()); // this one is for the background random jets
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1,kDeltaAODJetName.Data()); // this one is for the background random jets
+          
+          
+          
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC_KT04");
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC_KT04");
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC2_KT04");
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC2_KT04");
+        }
+        else{
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1,kDeltaAODJetName.Data()); // this one is for the background jets
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.6,0,1,kDeltaAODJetName.Data()); // this one is for the background jets
+
+          
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC_KT06");
+          taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC_KT06");
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC2_KT06");
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data());
+          taskCl->SetBackgroundBranch("jeteventbackground_clustersAODMC2_KT06");
+
+
+
+        }
+       }
+
+       if (!taskCl) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskCluster cannot run for this train conditions - EXCLUDED");
+     }
+     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;
+       if(kIsPbPb){
+        selection&=~(1<<2); // exluded R = .04 already the dafault
+        selection&=~(1<<4); // exluded R = .04 already the dafault
+       }
+       else{
+        selection&=~(1<<6); // exluded R = .04 already the dafault
+       }
+       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelectionFlag,"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;
+       selection&=~(1<<2); // exluded R = .04 already the dafault
+       selection&=~(1<<4); // exluded R = .04 already the dafault
+       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelectionFlag,"ANTIKT",selection);
+       //       AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"ANTIKT",0.4,0,1);
+
+     }
    }
 
    if (iDIJETAN) {
@@ -394,17 +626,34 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if (!taskEta) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskEta cannot run for this train conditions - EXCLUDED");
    }
 
-   if(iPWG4TmpSourceFrag){
-     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragFunc.C");
-     UInt_t selection = 1<<2;
-     AliAnalysisTaskFragFunc *taskFrag = AddTaskFragFunc(kHighPtFilterMask, kUseAODMC,iPhysicsSelection, selection);
-     if (!taskFrag) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskFragFunc cannot run for this train conditions - EXCLUDED");
+   if(iPWG4Fragmentation){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
+       AliAnalysisTaskFragmentationFunction *taskFrag = 0;
+     if(kUseAODMC){
+       taskFrag = AddTaskFragmentationFunction(1<<1,kHighPtFilterMask);
+       taskFrag = AddTaskFragmentationFunction(1<<2,kHighPtFilterMask);
+       //       taskFrag = AddTaskFragmentationFunction(1<<3,kHighPtFilterMask);
+       taskFrag = AddTaskFragmentationFunction(1<<5,kHighPtFilterMask);
+       taskFrag = AddTaskFragmentationFunction(1<<11);  // w/o acceptance cuts       
+       taskFrag =  AddTaskFragmentationFunction(1<<12);  // with acceptance cuts
+       // anti-kt
+       taskFrag = AddTaskFragmentationFunction(1<<21);  // w/o acceptance cuts
+       taskFrag = AddTaskFragmentationFunction(1<<22);  // with acceptance cuts
+
+     }
+     else{
+       taskFrag = AddTaskFragmentationFunction(1<<0,kHighPtFilterMask);
+       taskFrag = AddTaskFragmentationFunction(1<<10,kHighPtFilterMask);
+       taskFrag = AddTaskFragmentationFunction(1<<20,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();
+     AliAnalysisTask *taskChem = AddTaskJetChem(kHighPtFilterMask);
      if (!taskChem) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetChem cannot run for this train conditions - EXCLUDED");
    }
 
@@ -415,38 +664,82 @@ 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->SetPhysicsSelectionFlag(iPhysicsSelectionFlag); // 
      taskjetServ->SetDebugLevel(0);
+     taskjetServ->SetNonStdFile(kDeltaAODJetName.Data());
+     if(kIsPbPb){
+       taskjetServ->SetFilterAODCollisions(kTRUE);
+     }
+     if(iAODanalysis){
+       taskjetServ->SetAODInput(kTRUE);
+     }
    }
 
    if(iPWG4JetSpectrum){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetSpectrum2.C");
      AliAnalysisTaskJetSpectrum2 *taskjetSpectrum = 0;
+
+     TString cBack;
+     if(kIsPbPb){
+       cBack = "jeteventbackground_clustersAOD_KT04";
+     }
+     else{
+       cBack = "jeteventbackground_clustersAOD_KT06";
+     }
+
      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);      
-        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","",kHighPtFilterMask,iPhysicsSelection, AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kPhysicsSelection);      
-        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,AliAnalysisHelperJetTasks::kNone);      
-        if(kIsMC){
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04",kHighPtFilterMask,iPhysicsSelection,AliAnalysisHelperJetTasks::kNone);      
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04",kHighPtFilterMask,iPhysicsSelection,AliAnalysisHelperJetTasks::kNone);      
-        }
+       // add the dfault jet finders with R = 0.4 
+       UInt_t iSelection = 0xfffff; 
+       
+       //  taskJetSpectrum = AddTaskJetSpectrum2Delta(kHighPtFilterMask,kUseAODMC,iPhysicsSelectionFlag,iSelection,0,kTRUE,cBack.Data());  // bug fixed 10.11.10
+       taskJetSpectrum = AddTaskJetSpectrum2("clustersAOD_ANTIKT04","",cBack.Data(),kHighPtFilterMask,iPhysicsSelectionFlag,0,kTRUE,1);
+       if(iAODanalysis){
+        taskJetSpectrum->SetDebugLevel(1);
+        taskJetSpectrum->SetAODJetInput(kTRUE);
+        taskJetSpectrum->SetAODTrackInput(kTRUE);
+        taskJetSpectrum->SetUseGlobalSelection(kFALSE);
        }
-       if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
-       taskjetSpectrum->SetDebugLevel(1);
      }
-
      if(iPWG4JetSpectrum&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;
-       AddTaskJetSpectrum2Delta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,selection);
+       if(kIsMC){
+        UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
+        if(iPhysicsSelection)eventSelection |=  AliAnalysisHelperJetTasks::kPhysicsSelection;
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);  
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);
+        
+        eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
+        if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);
+        
+        eventSelection =  AliAnalysisHelperJetTasks::kNone;
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);     
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);     
+       }
+       else{
+        UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
+        if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection);       
+        eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
+        if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelectionFlag,eventSelection); 
+       }
+     }
+     if(iPWG4JetSpectrum&4){
+       // central events backgrounds... just for testing...
+       if(kIsPbPb){
+        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","",cBack.Data(),kHighPtFilterMask,iPhysicsSelectionFlag,0,kTRUE,1,1); 
+        taskjetSpectrum->SetDebugLevel(10);
+       }
      }
+     if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
+     
    }
+
+
    if(iPWG4JCORRAN){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJCORRANTask.C");
      AliJCORRANTask* corran = AddTaskJCORRAN(kDeltaAODJCORRANName.Data(),0);
@@ -462,12 +755,12 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if(iPWG4UE&1)taskUE = AddTaskUE(); 
      if(iPWG4UE&2){
        taskUE  =AddTaskUE("jetsAOD_CDF04","CDF", "LJ", "TRANSV","MSP"); //finder not yet in train
-       taskUE  =AddTaskUE("jetsAOD_CDF07","CDF", "LJ", "TRANSV","MSP");
+       //       taskUE  =AddTaskUE("jetsAOD_CDF07","CDF", "LJ", "TRANSV","MSP");
        taskUE  =AddTaskUE("jetsAOD_SISCONE04","CDF", "LJ", "TRANSV","MSP");
-       taskUE  =AddTaskUE("jetsAOD_SISCONE07","CDF", "LJ", "TRANSV","MSP"); //finder not yet in train
+       //       taskUE  =AddTaskUE("jetsAOD_SISCONE07","CDF", "LJ", "TRANSV","MSP"); //finder not yet in train
        taskUE  =AddTaskUE("jetsAOD_ICDF","CDF","LJ","TRANSV","MSP");
        taskUE  =AddTaskUE("jetsAOD_FASTKT04","CDF", "LJ", "TRANSV","MSP");
-       taskUE  =AddTaskUE("jetsAOD_FASTKT07","CDF", "LJ", "TRANSV","MSP"); //finder not yet in train
+       //       taskUE  =AddTaskUE("jetsAOD_FASTKT07","CDF", "LJ", "TRANSV","MSP"); //finder not yet in train
        taskUE  =AddTaskUE("jetsAOD_NONE","CDF", "MP_eta05", "TRANSV","MSP");
        taskUE  =AddTaskUE("jetsAOD_NONE","CDF", "MP_eta09", "TRANSV","MSP");
      }
@@ -475,22 +768,56 @@ 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;
+     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/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/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");
+   }
+
+
    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);
+       if(iPWG4PtQAMC&1)taskQAMC = AddTaskPWG4HighPtQAMC(kGridDataSet.Data(),1);
+     }
      if (!taskQAMC) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskQAMC cannot run for this train conditions - EXCLUDED");
    }
 
    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");
    }
@@ -507,7 +834,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    if(iPWG4PtSpectra){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPWG4HighPtSpectra.C");
-     AliPWG4HighPtSpectra *taskPtSpectra = AddTaskPWG4HighPtSpectra();
+     AliPWG4HighPtSpectra *taskPtSpectra = AddTaskPWG4HighPtSpectra(kGridDataSet.Data());
      if (!taskPtSpectra) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskPtSpectra cannot run for this train conditions - EXCLUDED");
    }
    if(iPWG4KMeans){
@@ -516,30 +843,6 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      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;
-       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"KT",selection);
-     }
-     if(iPWG4Cluster&4){
-       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;
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"ANTIKT");
-       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);
@@ -551,8 +854,9 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    if(iPWG4CaloQA){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/QA/AddTaskCalorimeterQA.C");
-     AliAnalysisTaskParticleCorrelation *taskcaloQA =  AddTaskCalorimeterQA("ESD",kFALSE,kIsMC);
+     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());
    } 
 
    if(iPWG4JetCorr){
@@ -586,9 +890,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);
@@ -596,6 +901,13 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       if (!taskGammaConversion) ::Warning("AnalysisTrainNew", "AliAnalysisTaskGammaConversion cannot run for these train conditions - EXCLUDED");
    }   
 
+   if (iPWG4CaloConv) {
+      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskCaloConv.C");
+      AliAnalysisTaskCaloConv * taskCaloConv = AddTaskCaloConv();
+      if (!taskCaloConv) ::Warning("AnalysisTrainNew", "AliAnalysisTaskCaloConv cannot run for these train conditions - EXCLUDED");
+   }   
+
+
 
    //==========================================================================
    // FOR THE REST OF THE TASKS THE MACRO AddTaskXXX() is not yet implemented/
@@ -642,8 +954,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
         gGrid->Rm(dest.Data());
        }
        TFile::Cp(Form("file:%s/STEER/LQ1dRef_v1.root",
-                     gSystem->ExpandPathName("$ALICE_ROOT")), 
-                Form("alien://%s",dest.Data()));
+                     gSystem->ExpandPathName("$ALICE_ROOT")),Form("alien://%s",dest.Data()));
      }
      AliLog::SetGlobalLogLevel(AliLog::kError);
      if((kUseSysInfo>0&&smode=="LOCAL")||!strcmp(plugin_mode, "test")){
@@ -651,9 +962,11 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        mgr->Write();
        fM->Close();
      }
-
+     
+     // grmpf, aliroot error handler overwrites root
+     gErrorIgnoreLevel = kErrorIgnoreLevel;
+     if(gErrorIgnoreLevel>3000) AliLog::SetGlobalLogLevel(AliLog::kFatal);
      StartAnalysis(smode, chain);
-       
      if((kUseSysInfo>0&&smode=="LOCAL")||!strcmp(plugin_mode, "test")){
        for(int i = 0;i < mgr->GetTopTasks()->GetEntries();i++){
         mgr->ProfileTask(i);
@@ -711,13 +1024,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,kNumberOfEvents);
          }   
          return;
    }      
@@ -755,6 +1069,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)
@@ -805,8 +1127,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;
        
@@ -814,7 +1142,8 @@ void CheckModuleFlags(const char *mode) {
        kUseKinefilter = kFALSE;
        if( iPWG4PtQAMC)::Info("AnalysisTrainPWG4Jets.C::CheckModuleFlags", "PWG4 PtQAMC disabled in analysis without MC");
        iPWG4PtQAMC        = 0;
-
+       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");
@@ -828,13 +1157,17 @@ void CheckModuleFlags(const char *mode) {
        kUseMuonfilter = kFALSE;
       }
       if(!iJETAN){
-       iPWG4JetSpectrum = iPWG4UE = iPWG4ThreeJets = iDIJETAN = 0;
+       iPWG4JetSpectrum = iPWG4UE =  iPWG4CorrectionsUE = iPWG4ThreeJets = iPWG4QGSep = iDIJETAN = 0;
       }
    }
-   iPWG4JetTasks = iPWG4JetServices||iPWG4JetSpectrum||iPWG4UE||iPWG4PtQAMC||iPWG4PtSpectra||iPWG4PtQATPC||iPWG4Cosmics||iPWG4ThreeJets||iPWG4JetChem;
+   iPWG4JetTasks = iPWG4JetServices||iPWG4JetSpectrum||iPWG4UE||iPWG4LeadingUE||iPWG4PtQAMC||iPWG4PtSpectra||iPWG4PtQATPC||iPWG4Cosmics||iPWG4ThreeJets||iPWG4QGSep||iPWG4JetChem||iPWG4Minijet||iPWG4Fragmentation;
    iPWG4PartCorrLibs = iPWG4PartCorr||iPWG4Tagged||iPWG4CaloQA;
-   iEMCUtilLibs = iPWG4PartCorrLibs||iPWG4JCORRAN;
+   iPWG4GammaConvLib = iPWG4GammaConv||iPWG4CaloConv;
+
+
+   iEMCUtilLibs = iPWG4PartCorrLibs||iPWG4JCORRAN||iPWG4GammaConvLib;
    iJETANLib = iPWG4JetTasks||iJETAN||iDIJETAN;
+
    if (iESDfilter) {iAODhandler=1;}
    if (kUseKinefilter && !kUseMC) kUseKinefilter = kFALSE;
    if (kUseAODTags && !iAODhandler) kUseAODTags = kFALSE;
@@ -926,7 +1259,7 @@ Bool_t LoadCommonLibraries(const char *mode)
    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"); 
+      ::Error("AnalysisTrainPWG4Jets.C::LoadCommonLibraries", "Analysis train requires that ALICE_ROOT is set to pick up Configurations"); 
       return kFALSE;
    }   
    Bool_t success = kTRUE;
@@ -946,6 +1279,7 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("AOD", mode, kTRUE);
             success &= LoadLibrary("ANALYSIS", mode, kTRUE);
             success &= LoadLibrary("ANALYSISalice", mode, kTRUE);
+            success &= LoadLibrary("EventMixing", mode,kTRUE);
             success &= LoadLibrary("CORRFW", mode, kTRUE);
          } else {   
             success &= LoadLibrary("libSTEERBase.so", mode);
@@ -953,6 +1287,7 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("libAOD.so", mode);
             success &= LoadLibrary("libANALYSIS.so", mode);
             success &= LoadLibrary("libANALYSISalice.so", mode);
+            success &= LoadLibrary("libEventMixing.so", mode);
             success &= LoadLibrary("libCORRFW.so", mode);
             gROOT->ProcessLine(".include $ALICE_ROOT/include");
          }   
@@ -966,6 +1301,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);
@@ -992,10 +1328,16 @@ Bool_t LoadCommonLibraries(const char *mode)
 Bool_t LoadAnalysisLibraries(const char *mode)
 {
 // Load common analysis libraries.
-   Bool_t success = kTRUE;
+  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) {
@@ -1035,11 +1377,6 @@ Bool_t LoadAnalysisLibraries(const char *mode)
      if(!kUsePAR)gSystem->AddIncludePath("-I$ALICE_ROOT/include/JetTasks"); // ugly hack!!
      if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskEta.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), mode, kTRUE))return kFALSE;
    }
-   if(iPWG4TmpSourceFrag){
-     if(!kUsePAR)gSystem->AddIncludePath("-I$ALICE_ROOT/include/JetTasks"); // ugly hack!!
-     if(!LoadSource(Form("%s/PWG4/JetTasks/AliAnalysisTaskFragFunc.cxx",gSystem->ExpandPathName("$ALICE_ROOT")), mode, kTRUE))return kFALSE;
-   }
-
 
    /*
    if(iPWG4JetChem){
@@ -1067,7 +1404,7 @@ Bool_t LoadAnalysisLibraries(const char *mode)
    if (iPWG4omega3pi) {
      if (!LoadLibrary("PWG4omega3pi", mode, kTRUE)) return kFALSE;
    }
-   if (iPWG4GammaConv) {
+   if (iPWG4GammaConvLib) {
       if (!LoadLibrary("PWG4GammaConv", mode, kTRUE)) return kFALSE;
    }      
 
@@ -1295,8 +1632,8 @@ Int_t SetupPar(char* pararchivename)
    if (gSystem->AccessPathName(Form("%s.par", pararchivename))) {
       if (!gSystem->AccessPathName(Form("%s/%s.par", gSystem->Getenv("ALICE_ROOT"),pararchivename))) {
          ::Info("AnalysisTrainPWG4Jets.C::SetupPar", "Getting %s.par from $ALICE_ROOT", pararchivename);
-         TFile::Cp(gSystem->ExpandPathName(Form("$ALICE_ROOT/%s.par", pararchivename)), 
-                   Form("%s.par",pararchivename));
+       TFile::Cp(gSystem->ExpandPathName(Form("$ALICE_ROOT/%s.par", pararchivename)), 
+                 Form("%s.par",pararchivename));
       } else {
          ::Error("AnalysisTrainPWG4Jets.C::SetupPar", "Cannot find %s.par", pararchivename);
          return -1;
@@ -1336,7 +1673,7 @@ 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);
@@ -1356,7 +1693,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++) {
@@ -1368,7 +1706,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
      ifstream in1;
      in1.open(kGridLocalRunList.Data());
      int iRun;
-
+     int icount = 0;
      /*
      char c;
      char cLine[250];
@@ -1389,12 +1727,21 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
        }
      }
      */
+     
+     Int_t nRun = 0;
 
      // just use run numbers, negatives will be excluded
      while(in1>>iRun){
-       if(iRun>0){
+       if(iRun>=0){
+        if(iRun>=0&&nRun>=kGridOffsetRunFromList&&(nRun<kGridMaxRunsFromList)){
           Printf("AnalysisTrainPWG4Jets Adding run number from File %s", Form(kGridRunPattern.Data(),iRun));
           plugin->AddRunNumber(Form(kGridRunPattern.Data(),iRun));
+
+        }
+        else{
+          Printf("AnalysisTrainPWG4Jets Skipping run number from File %d", iRun);
+        }
+        nRun++; 
        }
        else{
         Printf("AnalysisTrainPWG4Jets Skipping run number from File %d", iRun);
@@ -1500,7 +1847,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 += " ";
@@ -1528,51 +1875,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(36000); // 10h...
-// 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;
 }
@@ -1702,7 +2061,11 @@ Bool_t PatchAnalysisMacro(){
 
   if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__);
   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\",\"";
@@ -1722,6 +2085,12 @@ Bool_t PatchAnalysisMacro(){
     st.Insert(index,"// CKB comment out whehn no aliroot is provided \n //");
   }
 
+  if(AliLog::GetGlobalLogLevel()==AliLog::kFatal){
+    index = st.Index("AliLog::SetGlobal"); // ncomment setting of log level, do my own
+    if(index<0)Printf("%s:%d index out of bounds",(char*)__FILE__,__LINE__);
+    st.Insert(index,"AliLog::SetGlobalLogLevel(AliLog::kFatal);// CKB \n  // CKB comment out for own setting \n  //");
+  }
+
   ofstream out;
   out.open(Form("%s.C", kTrainName.Data()));
   if (out.bad()) {
@@ -1764,15 +2133,15 @@ Bool_t PatchAnalysisMacro(){
   }
 
   if(kUseCPAR&&kPluginAliRootVersion.Length()==0){
-    index = st2.Index("gSystem->AddIncludePath(\"-I$"); // uncommen $ALICE_ROOT include for par files
+    index = st2.Index("gSystem->AddIncludePath(\"-I$"); // uncomment $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 whehn no aliroot is provided \n //");
   }
 
   // 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;