]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/macros/AnalysisTrainPWG4Jets.C
new track cut, for loser ITS requirement (128+16)
[u/mrichter/AliRoot.git] / PWG4 / macros / AnalysisTrainPWG4Jets.C
index 43fb13956a1447f15697373301d01442b97ca311..0d1c27ac7fe2090e2711542f82323b16e53b6c4a 100644 (file)
@@ -37,8 +37,10 @@ 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
@@ -72,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.
@@ -112,7 +115,7 @@ 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";     
 
 
 //==============================================================================
@@ -138,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-27-06a-1";  // *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
@@ -216,6 +219,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
    if (iAODanalysis) printf("=  AOD analysis                                                  =\n");
    else                     printf("=  ESD analysis                                                  =\n");
    if (iPhysicsSelection)   printf("=  Physics selection                                                =\n");
+   if(iCentralitySelection)printf("=  Centrality selection                                                =\n");
    if (useTender)   printf("=  Using tender                                                =\n");
    if (iESDfilter)   printf("=  ESD filter                                                    =\n");
    if (iJETAN)       printf("=  Jet analysis                                                  =\n");
@@ -297,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();
@@ -321,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();
    }
@@ -375,7 +373,24 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    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_v4.root";
+     const char* file2="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137161_v4.root";
+     AliCentralitySelectionTask *taskC = AddTaskCentralitySelection(file1,file2);
+      if (!taskC) ::Warning("AnalysisTrainPWG4Jets", "AliCentralitySelectionTask cannot run for this train conditions - EXCLUDED");
    }
 
    if (iESDfilter && !iAODanalysis) {
@@ -383,6 +398,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       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 += " ";
@@ -420,16 +436,81 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        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){
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.4,0,1); // this one is for the background jets
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.5,0,1); // this one is for the background jets
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.6,0,1); // this one is for the background jets
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelection,"KT",0.7,0,1); // this one is for the background jets
+
+       if(kIsPbPb){
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.2,0,1, kDeltaAODJetName.Data()); // this one is for the background 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()); // this one is for the background 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());
+       taskCl->SetCentralityCut(fCenLo,fCenUp);
+       taskCl->SetJetTriggerPtCut(40.);//
+       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04");
+
+
+
+       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");
      }
@@ -437,8 +518,14 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        UInt_t selection = 0;
        if(!iAODanalysis) selection = 0xffffff;
        else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9;
-       selection&=~(1<<4); // exluded R = .04 already the dafault
-       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"KT",selection);
+       if(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;
@@ -447,7 +534,9 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
         selection &= ~(1<<1)&~(1<<3)&~(1<<5)&~(1<<7)&~(1<<9);
        }
        else selection = 1<<0|1<<1|1<<2|1<<3|1<<4|1<<5|1<<7|1<<8|1<<9;
-       AddTaskJetClusterDelta(kHighPtFilterMask,kUseAODMC,iPhysicsSelection,"ANTIKT",selection);
+       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);
 
      }
@@ -509,7 +598,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
 
    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");
    }
 
@@ -523,61 +612,79 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      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;
-     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","64",64,iPhysicsSelection);      
-
-        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","clustersAOD_ANTIKT04","",kHighPtFilterMask,iPhysicsSelection); 
-
-        if(kIsMC){
-
-          UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |=  AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);  
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
-
-          eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
 
-          eventSelection =  AliAnalysisHelperJetTasks::kNone;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC2_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","jetsAODMC_FASTJET04","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
-
-        }
-        else{
-          UInt_t eventSelection =  AliAnalysisHelperJetTasks::kIsPileUp|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelection,eventSelection);
+     TString cBack;
+     if(kIsPbPb){
+       cBack = "jeteventbackground_clustersAOD_KT04";
+     }
+     else{
+       cBack = "jeteventbackground_clustersAOD_KT06";
+     }
 
-          eventSelection =  AliAnalysisHelperJetTasks::kIsCosmic|AliAnalysisHelperJetTasks::kVertexIn;
-          if(iPhysicsSelection)eventSelection |= AliAnalysisHelperJetTasks::kPhysicsSelection;
-          taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","","",kHighPtFilterMask,iPhysicsSelection,eventSelection); 
-        }
+     if(iPWG4JetSpectrum&1){
+       // 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;
-        // switch off 07 radii
-        selection &= ~(1<<6)&~(1<<11)&~(1<<12)&~(1<<13)&~(1<<14);
+       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);
        }
-       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,0,kTRUE);
      }
+     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);
@@ -907,6 +1014,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)
@@ -957,8 +1072,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;
        
@@ -1500,7 +1621,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    plugin->SetRunMode(plugin_mode);
    if (kPluginUseProductionMode) plugin->SetProductionMode();
    plugin->SetJobTag(kJobTag);
-   plugin->SetNtestFiles(1);
+   plugin->SetNtestFiles(2);
 //   plugin->SetPreferedSE("ALICE::NIHAM::File");
 // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
@@ -1553,10 +1674,16 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 
      // just use run numbers, negatives will be excluded
      while(in1>>iRun){
-       if(iRun>= kGridOffsetRunFromList&&(nRun<kGridMaxRunsFromList)){
+       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));
-          nRun++;
+
+        }
+        else{
+          Printf("AnalysisTrainPWG4Jets Skipping run number from File %d", iRun);
+        }
+        nRun++; 
        }
        else{
         Printf("AnalysisTrainPWG4Jets Skipping run number from File %d", iRun);
@@ -1662,7 +1789,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 += " ";
@@ -1690,6 +1817,7 @@ 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());
    }
@@ -1736,7 +1864,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    // Optionally resubmit threshold.
    // plugin->SetMasterResubmitThreshold(90);
    // Optionally set time to live (default 30000 sec)
-   plugin->SetTTL(50400); // 14h...
+   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)
@@ -1877,6 +2005,9 @@ Bool_t PatchAnalysisMacro(){
   add += "\n\n // added by CKB \n";
   if(kErrorIgnoreLevel>0)add += Form("gErrorIgnoreLevel = %d;\n",kErrorIgnoreLevel);
   add += "\n gSystem->AddIncludePath(\"./\"); \n";
+  add += "\n gSystem->SetFPEMask(); \n";
+
+
   if(gGrid&&kPluginAliRootVersion.Length()==0){
     add += "\n // Dirty hack for TRD reference data \n";
     add += "\n gSystem->Setenv(\"ALICE_ROOT\",\"";