]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ANALYSIS/macros/AnalysisTrainNew.C
Plot rather virtual memory usage per process than total memory.
[u/mrichter/AliRoot.git] / ANALYSIS / macros / AnalysisTrainNew.C
index 7f7e0584b68e8c898c7b8f8788b2c56a961f6782..eb9053aec6b2cf60170219bee28df221207cbc46 100644 (file)
@@ -16,8 +16,8 @@
 //    root[1] AnalysisTrainNew(ana_mode, plugin_mode, "train_default_<date>/ConfigTrain.C")
 
 //==================   TRAIN NAME   ============================================
-TString     train_name         = "TR004_LHC09a3ESD"; // *CHANGE ME* (no blancs or special characters)
-TString     job_tag            = "ESD+MC analysis -> AOD + delta AOD + histograms"; // *CHANGE ME*
+TString     train_name         = "test"; // *CHANGE ME* (no blancs or special characters)
+TString     job_tag            = "test"; // *CHANGE ME*
 //==============================================================================
 
 // ### Settings that make sense in PROOF only
@@ -31,6 +31,8 @@ TString     proof_outdir       = "";
 
 // ### Settings that make sense when using the Alien plugin
 //==============================================================================
+Int_t       runOnData          = 0;       // Set to 1 if processing real data
+Int_t       iCollision         = 0;       // 0=pp, 1=Pb-Pb
 Bool_t      usePLUGIN          = kTRUE;   // do not change
 Bool_t      useProductionMode  = kTRUE;   // use the plugin in production mode
 // Usage of par files ONLY in grid mode and ONLY if the code is not available
@@ -39,26 +41,29 @@ Bool_t      useProductionMode  = kTRUE;   // use the plugin in production mode
 // AliRoot.
 Bool_t      usePAR             = kFALSE;  // use par files for extra libs
 Bool_t      useCPAR            = kFALSE;  // use par files for common libs
-TString     root_version       = "v20091109";  // *CHANGE ME IF MORE RECENT IN GRID*
-TString     aliroot_version    = "v4-18-10-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
+TString     root_version       = "v5-25-04-3";  // *CHANGE ME IF MORE RECENT IN GRID*
+TString     aliroot_version    = "v4-18-16-AN";  // *CHANGE ME IF MORE RECENT IN GRID*                                          
 // Change production base directory here
-TString     alien_datadir      = "/alice/sim/PDC_08b/LHC09a3";
+TString     alien_datadir      = "/alice/sim/PDC_09/LHC09a4";
 // AliEn output directory. If blank will become output_<train_name>
-TString     alien_outdir       = "/alice/sim/PDC_08b/LHC09a3/AOD";
+TString     alien_outdir       = "/alice/sim/PDC_09/LHC09a4/AOD3";
 // TString     alien_outdir       = "";
+// Output folder to write delta AOD's. Considered if not null.
+TString     outputSingleFolder = "";
+//TString     outputSingleFolder = "deltas";
 // Number of files merged in a chunk
-Int_t       maxMergeFiles      = 50;
+Int_t       maxMergeFiles      = 20;
 // Files that should not be merged
-TString     mergeExclude       = "AliAOD.root AliAOD.VertexingHF.root AliAOD.Jets.root deltaAODPartCorr.root";
+TString     mergeExclude       = "AliAOD.root AliAOD.VertexingHF.root AliAOD.Jets.root deltaAODPartCorr.root AliAOD.Muons.root resonances.root forward.root";
 // Make replicas on the storages below
-TString     outputStorages      = "ALICE::NIHAM::File,ALICE::CNAF::SE,ALICE::FZK::SE,ALICE::GSI::SE,ALICE::Legnaro::SE";
+TString     outputStorages      = "disk=4";
 // Number of runs per master job
 Int_t       nRunsPerMaster     = 10;
 // Maximum number of files per job (gives size of AOD)
-Int_t       nFilesPerJob       = 50;
+Int_t       nFilesPerJob       = 100;
+// Int_t       nFilesPerJob       = 1; (AOD->delta AOD production case)
 // Set the run range
-//Int_t       run_range[2]       =  {70000, 70220};  // LHC09a4   *CHANGE ME*
-Int_t       run_range[2]       =  {90000, 90025};
+Int_t       run_range[2]       =  {81007, 81656};  // LHC09a7   *CHANGE ME*
 // ### Settings that make sense only for local analysis
 //==============================================================================
 // Change local xml dataset for local interactive analysis
@@ -75,49 +80,62 @@ Bool_t      useTR              = kTRUE;  // use track references
 Bool_t      useCORRFW          = kFALSE; // do not change
 Bool_t      useAODTAGS         = kFALSE;  // use AOD tags
 Bool_t      saveTrain          = kTRUE;  // save train configuration as: 
+Bool_t      saveCanvases       = kTRUE; // save canvases created in Terminate
 Bool_t      saveProofToAlien   = kFALSE; // save proof outputs in AliEn
                                          // train_[trainName]_ddMonthyyyy_time.C
 // ### Analysis modules to be included. Some may not be yet fully implemented.
 //==============================================================================
 Int_t       iAODanalysis       = 0;      // Analysis on input AOD's
-Int_t       iAODhandler        = 1;      // Analysis produces an AOD or dAOD's
-Int_t       iESDfilter         = 1;      // ESD to AOD filter (barrel + muon tracks)
+Int_t       iAODhandler        = 0;      // Analysis produces an AOD or dAOD's
+Int_t       iESDfilter         = 0;      // ESD to AOD filter (barrel + muon tracks)
 Int_t       iMUONcopyAOD       = 0;      // Task that copies only muon events in a separate AOD (PWG3)
-Int_t       iJETAN             = 1;      // Jet analysis (PWG4) - needs ESD filter
-Int_t       iPWG4partcorr      = 1;      // Gamma-hadron correlations task (PWG4)
-Int_t       iPWG4gammaconv     = 1;      // Gamma conversion analysis (PWG4)
-Int_t       iPWG4omega3pi      = 1;      // Omega to 3 pi analysis (PWG4)
-Int_t       iPWG3vertexing     = 1;      // Vertexing HF task (PWG2)
-Int_t       iPWG3hfe           = 1;      // Electrons analysis (PWG3)
-Int_t       iPWG3d2h           = 1;      // D0->2 hadrons (PWG3)
-Int_t       iPWG2femto         = 1;      // Femtoscopy task (PWG2)
+Int_t       iJETAN             = 0;      // Jet analysis (PWG4)
+Int_t       iJETANdelta        = 0;      // Jet delta AODs
+Int_t       iPWG4partcorr      = 0;      // Gamma-hadron correlations task (PWG4)
+Int_t       iPWG4gammaconv     = 0;      // Gamma conversion analysis (PWG4)
+Int_t       iPWG4omega3pi      = 0;      // Omega to 3 pi analysis (PWG4)
+Int_t       iPWG3vertexing     = 0;      // Vertexing HF task (PWG3)
+Int_t       iPWG3hfe           = 0;      // Electrons analysis (PWG3)
+Int_t       iPWG3d2h           = 0;      // D0->2 hadrons (PWG3)
+Int_t        iPWG3d0mass       = 0;      // D0 mass (PWG3D2H)                                                                              
+Int_t        iPWG3d0massLS     = 0;      // D0 mass LS (PWG3D2H)                                                                           
+Int_t        iPWG3dplus        = 0;      // D+ analysis (PWG3D2H)                                                                          
+Int_t        iPWG3LSd0         = 0;      // LS D0 analysis (PWG3D2H)                                                                       
+Int_t        iPWG3LSjpsi       = 0;      // LS J/Psi analysis (PWG3D2H)                                                                    
+Int_t        iPWG3CFd0         = 0;      // CF D0 analysis (PWG3D2H)                                                                       
+Int_t        iPWG3promptd0     = 0;      // prompt D0 analysis (PWG3D2H)                                                                   
+Int_t       iPWG3MuonTrain     = 0;      // Muon analysis train
+Int_t       iPWG2femto         = 0;      // Femtoscopy task (PWG2)
 Int_t       iPWG2spectra       = 1;      // Spectra tasks (PWG2
-Int_t        iPWG2protons      = 1;         // Proton-antiproton analysis
+Int_t        iPWG2protons      = 0;         // Proton-antiproton analysis
 Int_t        iPWG2checkcascade = 1;         // Check cascades task
-Int_t        iPWG2perfcascade  = 1;         // Check performance cascade
-Int_t        iPWG2checkv0      = 1;         // Check V0 task
-Int_t        iPWG2strange      = 1;         // Strangeness task
-Int_t       iPWG2flow          = 1;      // Flow analysis tasks (PWG2)
-Int_t       iPWG2res           = 1;      // Resonances task (PWG2)
-Int_t        iPWG2rsneff       = 1;      // Resonances efficiency
-Int_t       iPWG2kink          = 1;      // Kink analysis tasks (PWG2)
-Int_t        iPWG2kinkESDMC    = 1;         // Kink ESD-MC comparison (PWG2)
-Int_t        iPWG2kinklikesign = 1;         // Kink like-sign (PWG2)
-Int_t        iPWG2kinkKstarESD = 1;      // Kink Kstar ESD (PWG2)
-Int_t        iPWG2kinkKstarMC  = 1;      // Kink Kstar MC (PWG2)
-Int_t        iPWG2kinkL1520ESD = 1;      // Kink L1520 ESD (PWG2)
-Int_t        iPWG2kinkL1520MC  = 1;      // Kink L1520 MC (PWG2)
-Int_t        iPWG2kinkPhiESD   = 1;      // Kink resonances Phi ESD (PWG2)
-Int_t        iPWG2kinkPhiMC    = 1;      // Kink resonances Phi MC (PWG2)
-Int_t       iPWG2evchar        = 1;      // Event characteristics (PWG2)
-Int_t       iPWG2unicor        = 1;      // Unicor analysis (PWG2)
-Int_t       iPWG2forward       = 1;      // FMD analysis (PWG2)
+Int_t        iPWG2perfcascade  = 0;         // Check performance cascade
+Int_t        iPWG2checkv0      = 0;         // Check V0 task
+Int_t        iPWG2strange      = 0;         // Strangeness task
+Int_t        iPWG2central      = 0;         // Anisothropy in central collisions
+Int_t       iPWG2flow          = 0;      // Flow analysis tasks (PWG2)
+Int_t       iPWG2res           = 0;      // Resonances task (PWG2)
+Int_t        iPWG2rsneff       = 0;      // Resonances efficiency
+Int_t       iPWG2kink          = 0;      // Kink analysis tasks (PWG2)
+Int_t        iPWG2kinkESDMC    = 0;         // Kink ESD-MC comparison (PWG2)
+Int_t        iPWG2kinkLSKstar  = 0;      // Kink like-sign K* (PWG2)
+Int_t        iPWG2kinkLSL1520  = 0;      // Kink like-sign L1520 (PWG2)
+Int_t        iPWG2kinkLSPhi    = 0;      // Kink like-sign Phi (PWG2)
+Int_t        iPWG2kinkKstarESD = 0;      // Kink Kstar ESD (PWG2)
+Int_t        iPWG2kinkKstarMC  = 0;      // Kink Kstar MC (PWG2)
+Int_t        iPWG2kinkL1520ESD = 0;      // Kink L1520 ESD (PWG2)
+Int_t        iPWG2kinkL1520MC  = 0;      // Kink L1520 MC (PWG2)
+Int_t        iPWG2kinkPhiESD   = 0;      // Kink resonances Phi ESD (PWG2)
+Int_t        iPWG2kinkPhiMC    = 0;      // Kink resonances Phi MC (PWG2)
+Int_t       iPWG2evchar        = 0;      // Event characteristics (PWG2)
+Int_t       iPWG2unicor        = 0;      // Unicor analysis (PWG2)
+Int_t       iPWG2forward       = 0;      // FMD analysis (PWG2)
 
 // ### Configuration macros used for each module
 //==============================================================================
 TString     configPWG2femto    = "$ALICE_ROOT/PWG2/FEMTOSCOPY/macros/Train/Train3/ConfigFemtoAnalysis.C";
 //TString     configPWG3d2h      = "$ALICE_ROOT/PWG3/vertexingHF/ConfigVertexingHF_highmult.C";
-TString     configPWG3d2h      = "$ALICE_ROOT/PWG3/vertexingHF/ConfigVertexingHF_highmult.C";
+TString     configPWG3d2h      = "$ALICE_ROOT/PWG3/vertexingHF/ConfigVertexingHF.C";
 // Temporaries.
 TString anaPars = "";
 TString anaLibs = "";
@@ -147,6 +165,7 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    if (iESDfilter)   printf("=  ESD filter                                                    =\n");
    if (iMUONcopyAOD) printf("=  MUON copy AOD                                                 =\n");
    if (iJETAN)       printf("=  Jet analysis                                                  =\n");
+   if (iJETANdelta)  printf("=     Jet delta AODs                                             =\n");
    if (iPWG2spectra) {
       printf("=  PWG2 SPECTRA tasks :                                          =\n");
       if (iPWG2protons)      printf("=     PWG2 proton-antiproton                                     =\n");
@@ -154,6 +173,7 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
       if (iPWG2perfcascade)  printf("=     PWG2 performance cascades                                  =\n");
       if (iPWG2checkv0)      printf("=     PWG2 check V0                                              =\n");
       if (iPWG2strange)      printf("=     PWG2 strangeness                                           =\n");
+      if (iPWG2central)      printf("=     PWG2 central                                               =\n");
    }   
    if (iPWG2femto) {
       printf("=  PWG2 femtoscopy                                               =\n");
@@ -165,7 +185,9 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    if (iPWG2kink) {
       printf("=  PWG2 kink analysis tasks:                                     =\n");
       if (iPWG2kinkESDMC)    printf("=     PWG2 ESD-MC kinks                                          =\n");
-      if (iPWG2kinklikesign) printf("=     PWG2 kink like-sign analysis                               =\n");
+      if (iPWG2kinkLSKstar)  printf("=     PWG2 kink like-sign analysis K*                            =\n");
+      if (iPWG2kinkLSL1520)  printf("=     PWG2 kink like-sign analysis L1520                         =\n");
+      if (iPWG2kinkLSPhi)    printf("=     PWG2 kink like-sign analysis Phi                           =\n");
       if (iPWG2kinkKstarESD) printf("=     PWG2 kink Kstar ESD analysis                               =\n");
       if (iPWG2kinkKstarMC)  printf("=     PWG2 kink Kstar MC analysis                                =\n");
       if (iPWG2kinkL1520ESD) printf("=     PWG2 kink L1520 ESD analysis                               =\n");
@@ -181,7 +203,15 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    if (iPWG3d2h) {
       printf("=  PWG3 D0->2 hadrons tasks                                      =\n");
       printf("   +++ configured by: %s\n", configPWG3d2h.Data());
+      if (iPWG3d0mass)       printf("=     PWG3 D0 mass                                               =\n");                               
+      if (iPWG3d0massLS)     printf("=     PWG3 D0 mass LS                                            =\n");                               
+      if (iPWG3dplus)        printf("=     PWG3 D+ analysis                                           =\n");                               
+      if (iPWG3LSd0)         printf("=     PWG3 LS D0                                                 =\n");                               
+      if (iPWG3LSjpsi)       printf("=     PWG3 LS J/Psi                                              =\n");                               
+      if (iPWG3CFd0)         printf("=     PWG3 CF D0                                                 =\n");                               
+      if (iPWG3promptd0)     printf("=     PWG3 prompt D0                                             =\n");                               
    }         
+   if (iPWG3MuonTrain) printf("=  PWG3 muon train                                               =\n");
    if (iPWG4partcorr)  printf("=  PWG4 gamma-hadron, pi0 and gamma-jet correlations             =\n");
    if (iPWG4gammaconv) printf("=  PWG4 gamma conversion                                         =\n");
    if (iPWG4omega3pi)  printf("=  PWG4 omega to 3 pions                                         =\n");
@@ -251,6 +281,7 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    }
    // Debugging if needed
    if (useDBG) mgr->SetDebugLevel(3);
+   if (saveCanvases) mgr->SetSaveCanvases(kTRUE);
 
    //==========================================================================
    // Create the chain. In this example it is created only from ALIEN files but
@@ -265,11 +296,52 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    // 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.
+                                                                                                                                           
+   AddAnalysisTasks();                                                                                                                     
+                                                                                                                                           
+   // Run the analysis                                                                                                                     
+   //                                                                                                                                      
+   if (usePLUGIN) {                                                                                                                        
+      AliAnalysisGrid *alienHandler = CreateAlienHandler(plugin_mode);                                                                     
+      AliAnalysisManager::GetAnalysisManager()->SetGridHandler(alienHandler);                                                              
+   }                                                                                                                                       
+                                                                                                                                           
+   if (mgr->InitAnalysis()) {                                                                                                              
+      mgr->PrintStatus();                                                                                                                  
+      if (saveTrain || strlen(config_file)) gSystem->ChangeDirectory(train_name);                                                          
+      StartAnalysis(smode, chain);                                                                                                         
+      if (saveTrain && smode=="GRID") {                                                                                                    
+         AliAnalysisAlien *gridhandler = (AliAnalysisAlien*)mgr->GetGridHandler();                                                         
+         TString alien_workdir = gGrid->GetHomeDirectory();                                                                                
+         if (iAODanalysis) alien_workdir += "analysisAOD";                                                                                 
+         else              alien_workdir += "analysisESD";                                                                                 
+         alien_outdir = gridhandler->GetGridOutputDir();                                                                                   
+         printf("=== Registering ConfigTrain.C in the work directory <%s> ===\n",                                                          
+                alien_workdir.Data());                                                                                                     
+         if (AliAnalysisAlien::FileExists(Form("%s/%sConfig.C", alien_workdir.Data(), train_name.Data())))                                 
+            gGrid->Rm(Form("%s/%sConfig.C", alien_workdir.Data(), train_name.Data()));                                                     
+         if (strcmp(plugin_mode, "test"))                                                                                                  
+            TFile::Cp(Form("file:%sConfig.C",train_name.Data()), Form("alien://%s/%sConfig.C", alien_workdir.Data(), train_name.Data()));  
+      }                                                                                                                                    
+   }                                                                                                                                       
+}                                                                                                                                          
+                                                                                                                                            
+//______________________________________________________________________________                                                           
+void AddAnalysisTasks()                                                                                                                    
+{                                                                                                                                          
+// Add all analysis task wagons to the train                                                                                               
+   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();                                                                     
 
    if (iESDfilter && !iAODanalysis) {
       //  ESD filter task configuration.
       gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskESDFilter.C");
-      AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(useKFILTER);
+      if (iMUONcopyAOD) {
+         printf("Registering delta AOD file\n");
+         mgr->RegisterExtraFile("AliAOD.Muons.root");
+         AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(useKFILTER, kTRUE);
+      } else {
+         AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(useKFILTER, kFALSE);      
+      }   
    }   
 
    // AOD tags
@@ -296,7 +368,7 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
       // cascades
       if (iPWG2checkcascade) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/SPECTRA/macros/AddTaskCheckCascade.C");
-        AliAnalysisTaskCheckCascade *taskcheckcascade = AddTaskCheckCascade();      
+        AliAnalysisTaskCheckCascade *taskcheckcascade = AddTaskCheckCascade(iCollision,runOnData);
         if (!taskcheckcascade) ::Warning("AnalysisTrainNew", "AliAnalysisTaskCheckCascade cannot run for this train conditions - EXCLUDED");
       }  
       // v0's
@@ -317,7 +389,13 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
         AliAnalysisTaskCheckPerformanceCascade *taskperfcascade = AddTaskCheckPerformanceCascade();
         if (!taskperfcascade) ::Warning("AnalysisTrainNew", "AliAnalysisTaskCheckPerformanceCascade cannot run for this train conditions - EXCLUDED");
       }  
-   }   
+       // central
+      if (iPWG2central) {
+        gROOT->LoadMacro("$ALICE_ROOT/PWG2/SPECTRA/macros/AddTaskCentral.C");
+        AliAnalysisTaskCentral *taskcentral = AddTaskCentral();
+        if (!taskcentral) ::Warning("AnalysisTrainNew", "AliAnalysisTaskCentral cannot run for this train conditions - EXCLUDED");
+      }  
+  }   
    
    // Femtoscopy analysis modules
    if (iPWG2femto) {
@@ -333,40 +411,50 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
         AliAnalysisKinkESDMC *taskkink1 = AddTaskKink();
         if (!taskkink1) ::Warning("AnalysisTrainNew", "AliAnalysisKinkESDMC cannot run for this train conditions - EXCLUDED");
       }   
-      if (iPWG2kinklikesign) {
-        gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonanceLikeSign.C");
-        AliResonanceKinkLikeSign *taskkink2 = AddTaskKinkResonanceLikeSign();
+      if (iPWG2kinkLSKstar) {
+        gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResLikeSignKstar.C");
+        AliResonanceKinkLikeSign *taskkink2 = AddTaskKinkResLikeSignKstar();
         if (!taskkink2) ::Warning("AnalysisTrainNew", "AliResonanceKinkLikeSign cannot run for this train conditions - EXCLUDED");
       }  
+      if (iPWG2kinkLSL1520) {
+        gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResLikeSignL1520.C");
+        AliResonanceKinkLikeSign *taskkink3 = AddTaskKinkResLikeSignL1520();
+        if (!taskkink3) ::Warning("AnalysisTrainNew", "AliResonanceKinkLikeSign cannot run for this train conditions - EXCLUDED");
+      }  
+      if (iPWG2kinkLSPhi) {
+        gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResLikeSignPhi.C");
+        AliResonanceKinkLikeSign *taskkink4 = AddTaskKinkResLikeSignPhi();
+        if (!taskkink4) ::Warning("AnalysisTrainNew", "AliResonanceKinkLikeSign cannot run for this train conditions - EXCLUDED");
+      }  
       if (iPWG2kinkKstarESD) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonanceKstarESD.C");
-        AliAnalysisTaskKinkResonance *taskkink3 = AddTaskKinkResonanceKstarESD();
-        if (!taskkink3) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceKstarESD cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink5 = AddTaskKinkResonanceKstarESD();
+        if (!taskkink5) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceKstarESD cannot run for this train conditions - EXCLUDED");
       }   
       if (iPWG2kinkKstarMC) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonanceKstarMC.C");
-        AliAnalysisTaskKinkResonance *taskkink4 = AddTaskKinkResonanceKstarMC();
-        if (!taskkink4) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceKstarMC cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink6 = AddTaskKinkResonanceKstarMC();
+        if (!taskkink6) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceKstarMC cannot run for this train conditions - EXCLUDED");
       }   
       if (iPWG2kinkL1520ESD) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonanceL1520ESD.C");
-        AliAnalysisTaskKinkResonance *taskkink5 = AddTaskKinkResonanceL1520ESD();
-        if (!taskkink5) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceL1520ESD cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink7 = AddTaskKinkResonanceL1520ESD();
+        if (!taskkink7) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceL1520ESD cannot run for this train conditions - EXCLUDED");
       }   
       if (iPWG2kinkL1520MC) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonanceL1520MC.C");
-        AliAnalysisTaskKinkResonance *taskkink6 = AddTaskKinkResonanceL1520MC();
-        if (!taskkink6) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceL1520MC cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink8 = AddTaskKinkResonanceL1520MC();
+        if (!taskkink8) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonanceL1520MC cannot run for this train conditions - EXCLUDED");
       }   
       if (iPWG2kinkPhiESD) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonancePhiESD.C");
-        AliAnalysisTaskKinkResonance *taskkink7 = AddTaskKinkResonancePhiESD();
-        if (!taskkink7) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonancePhiESD cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink9 = AddTaskKinkResonancePhiESD();
+        if (!taskkink9) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonancePhiESD cannot run for this train conditions - EXCLUDED");
       }   
       if (iPWG2kinkPhiMC) {
         gROOT->LoadMacro("$ALICE_ROOT/PWG2/KINK/macros/AddTaskKinkResonancePhiMC.C");
-        AliAnalysisTaskKinkResonance *taskkink8 = AddTaskKinkResonancePhiMC();
-        if (!taskkink8) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonancePhiMC cannot run for this train conditions - EXCLUDED");
+        AliAnalysisTaskKinkResonance *taskkink10 = AddTaskKinkResonancePhiMC();
+        if (!taskkink10) ::Warning("AnalysisTrainNew", "AliAnalysisKinkResonancePhiMC cannot run for this train conditions - EXCLUDED");
       }   
    }   
 
@@ -386,11 +474,13 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    }   
 
    // FMD
+   AliAnalysisManager::SetCommonFileName("forward.root");
    if (iPWG2forward) {
       gROOT->LoadMacro("$ALICE_ROOT/PWG2/FORWARD/analysis/AddTaskFMD.C");
       AliFMDAnalysisTaskSE *taskfmd = AddTaskFMD();
       if (!taskfmd) ::Warning("AnalysisTrainNew", "AliFMDAnalysisTaskSE cannot run for this train conditions - EXCLUDED");
    }   
+   AliAnalysisManager::SetCommonFileName("PWG2histograms.root");
 
    // Flow analysis
    if (iPWG2flow) {
@@ -419,15 +509,17 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    }   
 
    // PWG2 resonances
+   AliAnalysisManager::SetCommonFileName("resonances.root");
    if (iPWG2res) {
-      gROOT->LoadMacro("$ALICE_ROOT/PWG2/RESONANCES/macros/train/AddAnalysisTaskRsn.C");
-      gROOT->LoadMacro("$ALICE_ROOT/PWG2/RESONANCES/macros/train/AddAnalysisTaskRsnEff.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG2/RESONANCES/macros/train/AddAnalysisTaskRsnNew.C");
+      gROOT->LoadMacro("$ALICE_ROOT/PWG2/RESONANCES/macros/train/AddAnalysisTaskRsnEffNew.C");
       TString path = gROOT->GetMacroPath();
       path += ":$ALICE_ROOT/PWG2/RESONANCES/macros/train";
       gROOT->SetMacroPath(path);
       AddAnalysisTaskRsn(kTRUE);
-      AddAnalysisTaskRsnEff();
+      if (iPWG2rsneff) AddAnalysisTaskRsnEff();
    }   
+   AliAnalysisManager::SetCommonFileName("PWG2histograms.root");
 
 // ********** PWG3 wagons ******************************************************
    AliAnalysisManager::SetCommonFileName("PWG3histograms.root");
@@ -438,6 +530,7 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
       if (!iPWG3d2h) TFile::Cp(gSystem->ExpandPathName(configPWG3d2h.Data()), Form("%s/ConfigVertexingHF.C", train_name.Data()));
       AliAnalysisTaskSEVertexingHF *taskvertexingHF = AddTaskVertexingHF();
       if (!taskvertexingHF) ::Warning("AnalysisTrainNew", "AliAnalysisTaskSEVertexingHF cannot run for this train conditions - EXCLUDED");
+      else mgr->RegisterExtraFile("AliAOD.VertexingHF.root");
    }   
       
    // PWG3 electrons
@@ -451,7 +544,21 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
    if (iPWG3d2h) {
       gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/AddD2HTrain.C");
       TFile::Cp(gSystem->ExpandPathName(configPWG3d2h.Data()), Form("%s/ConfigVertexingHF.C", train_name.Data()));
-      AddD2HTrain();
+      AddD2HTrain(iPWG3d0mass,iPWG3d0massLS,iPWG3dplus, iPWG3LSd0, iPWG3LSjpsi, iPWG3CFd0, iPWG3promptd0);                                 
+   }   
+
+   // PWG3 muon
+   if (iPWG3MuonTrain) {
+      gROOT->LoadMacro("$ALICE_ROOT/PWG3/muon/AddPWG3MuonTrain.C");
+      // iESDAnalysis, iAODAnalysis -> flags to select if the train is AOD or ESD based
+      // iMuonDistributions, iSingleMuonANAlysis -> flags to switch on/off analysis wagons
+      Int_t isESDAnalysis = (iAODanalysis)?0:1;
+      Int_t isAODAnalysis = (iAODanalysis)?1:0;
+      Int_t addMuonDistributions = 1;
+      Int_t addSingleMuonAnalysis = 1;
+      Int_t addMuonHFAnalysis = 1;
+      Int_t ntaskmuon = AddPWG3MuonTrain(isESDAnalysis,isAODAnalysis,addMuonDistributions,addSingleMuonAnalysis,addMuonHFAnalysis);
+      printf("Added %d muon tasks\n", ntaskmuon);
    }   
       
 // ********** PWG4 wagons ******************************************************
@@ -464,20 +571,27 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
          // Default jet reconstructor running on ESD's
          AliAnalysisTaskJets * taskjets = AddTaskJets();
          if (!taskjets) ::Warning("AnalysisTrainNew", "AliAnalysisTaskJets cannot run for this train conditions - EXCLUDED");
+         if (iJETANdelta) {
+            AddTaskJetsDelta("AliAOD.Jets.root");
+            mgr->RegisterExtraFile("AliAOD.Jets.root");
+         }   
       } else {
          // AOD-based analysis. Add all reconstructors to write into delta AOD's
-//         AddTaskJetsDelta();
-         AliAnalysisTaskJets * taskjets = AddTaskJets();
-         taskjets->SetNonStdBranch("jetsAOD_UA1_04");
+         if (iJETANdelta) {
+            Int_t ntasksjets = AddTaskJetsDelta("AliAOD.Jets.root");
+            if (ntasksjets) printf("Added %d jet reconstructors\n", ntasksjets);
+         }
       }      
    }
    // PWG4 hadron correlations
    if (iPWG4partcorr) {
+      Bool_t isSimulation = (runOnData)?kFALSE:kTRUE;
       gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskPartCorr.C");
-      AliAnalysisTaskParticleCorrelation *taskpartcorrPHOS = AddTaskPartCorr("AOD", "PHOS");
+      AliAnalysisTaskParticleCorrelation *taskpartcorrPHOS = AddTaskPartCorr("AOD", "PHOS", useMC, kFALSE, isSimulation);
       if (!taskpartcorrPHOS) ::Warning("AnalysisTrainNew", "AliAnalysisTaskParticleCorrelation PHOS cannot run for this train conditions - EXCLUDED");
-      AliAnalysisTaskParticleCorrelation *taskpartcorrEMCAL = AddTaskPartCorr("AOD", "EMCAL");
+      AliAnalysisTaskParticleCorrelation *taskpartcorrEMCAL = AddTaskPartCorr("AOD", "EMCAL", useMC, kFALSE, isSimulation);
       if (!taskpartcorrEMCAL) ::Warning("AnalysisTrainNew", "AliAnalysisTaskParticleCorrelation EMCAL cannot run for this train conditions - EXCLUDED");
+      mgr->RegisterExtraFile("deltaAODPartCorr.root");
    }   
 
    // PWG4 gamma conversion analysis
@@ -497,34 +611,6 @@ void AnalysisTrainNew(const char *analysis_mode="grid",
       AliAnalysisTaskOmegaPi0PiPi *taskomega3pi = AddTaskomega3pi();
       if (!taskomega3pi) ::Warning("AnalysisTrainNew", "AliAnalysisTaskomega3pi cannot run for these train conditions - EXCLUDED");
    }   
-
-   //==========================================================================
-   // FOR THE REST OF THE TASKS THE MACRO AddTaskXXX() is not yet implemented/
-   // Run the analysis
-   //    
-   if (usePLUGIN) {
-      AliAnalysisGrid *alienHandler = CreateAlienHandler(plugin_mode);
-      AliAnalysisManager::GetAnalysisManager()->SetGridHandler(alienHandler);
-   }
-      
-   if (mgr->InitAnalysis()) {
-      mgr->PrintStatus();
-      if (saveTrain || strlen(config_file)) gSystem->ChangeDirectory(train_name);
-      StartAnalysis(smode, chain);
-      if (saveTrain && smode=="GRID") {
-         AliAnalysisAlien *gridhandler = (AliAnalysisAlien*)mgr->GetGridHandler();
-         TString alien_workdir = gGrid->GetHomeDirectory();
-         if (iAODanalysis) alien_workdir += "analysisAOD";
-         else              alien_workdir += "analysisESD";
-         alien_outdir = gridhandler->GetGridOutputDir();
-         printf("=== Registering ConfigTrain.C in the work directory <%s> ===\n",
-                alien_workdir.Data());
-         if (AliAnalysisAlien::FileExists(Form("%s/%sConfig.C", alien_workdir.Data(), train_name.Data())))
-            gGrid->Rm(Form("%s/%sConfig.C", alien_workdir.Data(), train_name.Data()));
-         if (strcmp(plugin_mode, "test"))
-            TFile::Cp(Form("file:%sConfig.C",train_name.Data()), Form("alien://%s/%sConfig.C", alien_workdir.Data(), train_name.Data()));
-      }
-   }
 }
 
 //______________________________________________________________________________
@@ -575,6 +661,7 @@ void CheckModuleFlags(const char *mode) {
    if (!strcmp(mode, "LOCAL")) imode = 0;
    if (!strcmp(mode, "PROOF")) imode = 1;
    if (!strcmp(mode, "GRID"))  imode = 2;
+   if (!iJETAN) iJETANdelta = 0;
    if (imode==1) {
       if (!usePAR) {
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PAR files enabled due to PROOF analysis");
@@ -601,11 +688,15 @@ void CheckModuleFlags(const char *mode) {
          if (iJETAN) 
             ::Info("AnalysisTrainNew.C::CheckModuleFlags", "JETAN disabled in analysis on AOD's without AOD handler");
          iJETAN = 0;
+         iJETANdelta = 0;
       }
       // Disable tasks that do not work yet on AOD data
       if (iPWG4gammaconv)
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG4gammaconv disabled on AOD's without AOD handler");
       iPWG4gammaconv = 0;   
+      if (iPWG2central)
+         ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG2central disabled on AOD's");
+         iPWG2central = 0;
       if (iPWG2flow)
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG2flow disabled on AOD's");
          iPWG2flow = 0;
@@ -633,18 +724,11 @@ void CheckModuleFlags(const char *mode) {
       if (iPWG3hfe)
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG3hfe disabled on AOD's");
          iPWG3hfe = 0;
-      if (iPWG3vertexing)
-         ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG3vertexing disabled on AOD's");
-//         iPWG3vertexing = 0;
       if (iPWG4omega3pi)
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG4omega3pi disabled on AOD's");
          iPWG4omega3pi = 0;
-      if (iPWG4partcorr)
-         ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG4partcorr disabled on AOD's");
-         iPWG4partcorr = 0;
    } else {   
    // ESD analysis
-      iMUONcopyAOD = 0;
       if (!useMC) useTR = kFALSE;
       if (!useTR) {
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "iPWG2evchar disabled if not reading track references");
@@ -655,6 +739,9 @@ void CheckModuleFlags(const char *mode) {
       if (iPWG2perfcascade)
          ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG2perfcascade disabled without MC info");
       iPWG2perfcascade = 0;   
+      if (iPWG2central)
+         ::Info("AnalysisTrainNew.C::CheckModuleFlags", "PWG2central disabled without MC info");
+         iPWG2central = 0;
    }   
    if (iJETAN && !iAODanalysis) iESDfilter=1;
    if (iESDfilter) {iAODhandler=1; useCORRFW = kTRUE;}
@@ -751,6 +838,7 @@ Bool_t LoadCommonLibraries(const char *mode)
    gSystem->Load("libGeom.so");
    gSystem->Load("libVMC.so");
    gSystem->Load("libPhysics.so");
+   gSystem->Load("libMinuit.so");
    
    // Load framework classes. Par option ignored here.
    switch (imode) {
@@ -809,14 +897,22 @@ Bool_t LoadAnalysisLibraries(const char *mode)
 {
 // Load common analysis libraries.
    Bool_t success = kTRUE;
-   if (iESDfilter) {
+   if (iESDfilter || iPWG3MuonTrain) {
       if (!LoadLibrary("PWG3base", mode, kTRUE) ||
           !LoadLibrary("PWG3muon", mode, kTRUE)) return kFALSE;
    }   
    // JETAN
    if (iJETAN) {
       if (!LoadLibrary("JETAN", mode, kTRUE)) return kFALSE;
-   }               
+   }
+   if (iJETANdelta) {
+      if (!LoadLibrary("JETAN", mode, kTRUE) ||
+          !LoadLibrary("CGAL", mode, kTRUE) ||
+          !LoadLibrary("fastjet", mode, kTRUE) ||
+          !LoadLibrary("siscone", mode, kTRUE) ||
+          !LoadLibrary("SISConePlugin", mode, kTRUE) ||
+          !LoadLibrary("FASTJETAN", mode, kTRUE)) return kFALSE;
+   }     
    // PWG4 particle correlations
    if (iPWG4partcorr) {   
       if (!LoadLibrary("EMCALUtils", mode, kTRUE) ||
@@ -1079,11 +1175,13 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Set the run mode (can be "full", "test", "offline", "submit" or "terminate")
    plugin->SetRunMode(plugin_mode);
    if (useProductionMode) plugin->SetProductionMode();
+   if (!outputSingleFolder.IsNull()) plugin->SetOutputSingleFolder(outputSingleFolder);
    plugin->SetJobTag(job_tag);
    plugin->SetNtestFiles(1);
 //   plugin->SetPreferedSE("ALICE::NIHAM::File");
 // Set versions of used packages
-   plugin->SetAPIVersion("V2.4");
+//   plugin->SetAPIVersion("V2.4");
+   plugin->SetAPIVersion("V1.1x");
    plugin->SetROOTVersion(root_version);
    plugin->SetAliROOTVersion(aliroot_version);
 // Declare input data to be processed.
@@ -1123,6 +1221,12 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
       while ((objstr=(TObjString*)next())) plugin->EnablePackage(objstr->GetString());
       delete arr;
    } 
+// Add external packages
+   if (iJETANdelta) {
+      plugin->AddExternalPackage("boost::v1_38_0");
+      plugin->AddExternalPackage("cgal::v3.3.1");
+      plugin->AddExternalPackage("fastjet::v2.4.0");
+   }   
    
 // Declare the analysis source files names separated by blancs. To be compiled runtime
 // using ACLiC on the worker nodes.
@@ -1156,7 +1260,10 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
          filename = mgr->GetOutputEventHandler()->GetOutputFileName();
          if (listaods.Length()) listaods += ",";
          listaods += filename;
+         listaods += ",";
+         listaods += "pyxsec_hists.root";
       } else {
+         if (!strcmp(filename, "pyxsec_hists.root")) continue;
          if (listhists.Contains(filename)) continue;
          if (listhists.Length()) listhists += ",";
          listhists += filename;
@@ -1167,12 +1274,12 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
       listaods += mgr->GetExtraFiles();
       listaods.ReplaceAll(" ", ",");
    }
-   if (listhists.Length()) listhists = Form("hist_archive.zip:%s@%s", listhists.Data(), outputStorages.Data());;
-   if (listaods.Length())  listaods  = Form("aod_archive.zip:%s@%s", listaods.Data(), outputStorages.Data());;
+   if (listhists.Length()) listhists = Form("hist_archive.zip:%s@%s", listhists.Data(), outputStorages.Data());
+   if (listaods.Length())  listaods  = Form("aod_archive.zip:%s@%s", listaods.Data(), outputStorages.Data());
    if (!listhists.Length() && !listaods.Length()) {
       ::Fatal("AnalysisTrainNew", "No task output !");
    }
-   TString outputArchive = "log_archive.zip:stdout,stderr@ALICE::CERN::SE";
+   TString outputArchive = Form("log_archive.zip:stderr@%s", outputStorages.Data());
    if (listaods.Length()) {
       outputArchive += " ";
       outputArchive += listaods;
@@ -1194,7 +1301,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Optionally resubmit threshold.
 //   plugin->SetMasterResubmitThreshold(90);
 // Optionally set time to live (default 30000 sec)
-   plugin->SetTTL(200000);
+   plugin->SetTTL(70000);
 // Optionally set input format (default xml-single)
    plugin->SetInputFormat("xml-single");
 // Optionally modify the name of the generated JDL (default analysis.jdl)
@@ -1204,7 +1311,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Optionally modify job price (default 1)
    plugin->SetPrice(1);      
 // Optionally modify split mode (default 'se')    
-   plugin->SetSplitMode("se");
+//   plugin->SetSplitMode("se");
    return plugin;
 }
 
@@ -1276,12 +1383,21 @@ void WriteConfig()
    out << "   iESDfilter      = " << iESDfilter << ";" << endl;
    out << "   iMUONcopyAOD    = " << iMUONcopyAOD << ";" << endl;
    out << "   iJETAN          = " << iJETAN << ";" << endl;
+   out << "   iJETANdelta     = " << iJETANdelta << ";" << endl;
    out << "   iPWG4partcorr   = " << iPWG4partcorr << ";" << endl;
    out << "   iPWG4gammaconv  = " << iPWG4gammaconv << ";" << endl;
    out << "   iPWG4omega3pi   = " << iPWG4omega3pi << ";" << endl;
    out << "   iPWG3vertexing  = " << iPWG3vertexing << ";" << endl;   
    out << "   iPWG3hfe        = " << iPWG3hfe << ";" << endl;   
    out << "   iPWG3d2h        = " << iPWG3d2h << ";" << endl;   
+   out << "     iPWG3d0mass       = " << iPWG3d0mass << ";" << endl;
+   out << "     iPWG3d0massLS     = " << iPWG3d0massLS << ";" << endl;
+   out << "     iPWG3dplus        = " << iPWG3dplus << ";" << endl;
+   out << "     iPWG3LSd0         = " << iPWG3LSd0 << ";" << endl;
+   out << "     iPWG3LSjpsi       = " << iPWG3LSjpsi << ";" << endl;
+   out << "     iPWG3CFd0         = " << iPWG3CFd0 << ";" << endl;
+   out << "     iPWG3promptd0     = " << iPWG3promptd0 << ";" << endl;
+   out << "   iPWG3MuonTrain      = " << iPWG3MuonTrain << ";" << endl;   
    out << "   iPWG2femto      = " << iPWG2femto << ";" << endl;
    out << "   iPWG2spectra    = " << iPWG2spectra << ";" << endl;
    out << "     iPWG2protons      = " << iPWG2protons << ";" << endl;
@@ -1289,12 +1405,15 @@ void WriteConfig()
    out << "     iPWG2perfcascade  = " << iPWG2perfcascade << ";" << endl;
    out << "     iPWG2checkv0      = " << iPWG2checkv0 << ";" << endl;
    out << "     iPWG2strange      = " << iPWG2strange << ";" << endl;
+   out << "     iPWG2central      = " << iPWG2central << ";" << endl;
    out << "   iPWG2flow       = " << iPWG2flow << ";" << endl;
    out << "   iPWG2res        = " << iPWG2res << ";" << endl;
    out << "     iPWG2rsneff   = " << iPWG2rsneff << ";" << endl;
    out << "   iPWG2kink       = " << iPWG2kink << ";" << endl;
    out << "     iPWG2kinkESDMC    = " << iPWG2kinkESDMC << ";" << endl;
-   out << "     iPWG2kinklikesign = " << iPWG2kinklikesign << ";" << endl;
+   out << "     iPWG2kinkLSKstar  = " << iPWG2kinkLSKstar << ";" << endl;
+   out << "     iPWG2kinkLSL1520  = " << iPWG2kinkLSL1520 << ";" << endl;
+   out << "     iPWG2kinkLSPhi    = " << iPWG2kinkLSPhi << ";" << endl;
    out << "     iPWG2kinkKstarESD = " << iPWG2kinkKstarESD << ";" << endl;
    out << "     iPWG2kinkKstarMC  = " << iPWG2kinkKstarMC << ";" << endl;
    out << "     iPWG2kinkL1520ESD = " << iPWG2kinkL1520ESD << ";" << endl;