]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Added fixes for centrality selection, use AddTaskCentrality from ANALYSIS.
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Dec 2010 13:27:32 +0000 (13:27 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Dec 2010 13:27:32 +0000 (13:27 +0000)
PWG4/JetTasks/AliAnalysisTaskJetServices.cxx
PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.cxx
PWG4/JetTasks/AliAnalysisTaskJetSpectrum2.h
PWG4/macros/AddTaskCentralitySelection.C [deleted file]
PWG4/macros/AddTaskJetSpectrum2.C
PWG4/macros/AnalysisTrainPWG4Jets.C

index 02d3b37e47baec9c391542fce0681a0de1aed3b9..31aee63fe466e5f7e494a843f86a11adf97b479a 100644 (file)
@@ -368,13 +368,6 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
 
   Bool_t physicsSelection = ((fInputHandler->IsEventSelected())&fPhysicsSelectionFlag);
 
-  if(aodH&&physicsSelection&&fFilterAODCollisions&&aod){
-    Float_t cent = aod->GetHeader()->GetCentrality();
-    if(cent<=80){
-      aodH->SetFillAOD(kTRUE);
-    }
-  }
-
 
   fEventCutInfoESD |= kPhysicsSelectionCut; // other alreay set via IsEventSelected
   fh1EventCutInfoESD->Fill(fEventCutInfoESD);
@@ -409,13 +402,22 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
     const AliESDVertex *vtxESD = esd->GetPrimaryVertex();
     esdVtxValid = IsVertexValid(vtxESD);
     esdVtxIn = IsVertexIn(vtxESD);
+    if(aodH&&physicsSelection&&fFilterAODCollisions&&aod){
+      Float_t cent = aod->GetHeader()->GetCentrality();
+      if(cent<=80&&esdVtxIn){
+       aodH->SetFillAOD(kTRUE);
+      }
+    }
+
+
     Float_t zvtx = vtxESD->GetZ();
     Int_t  iCl = GetEventClass(esd);
     AliAnalysisHelperJetTasks::EventClass(kTRUE,iCl);
     Bool_t cand = physicsSelection;
 
     if(fDebug)Printf("%s:%d %d %d %d Icl %d",(char*)__FILE__,__LINE__,esdVtxValid,esdVtxIn,cand,iCl);
-
+    fh2ESDTriggerCount->Fill(0.,kAllTriggered); 
+    fh2ESDTriggerCount->Fill(iCl,kAllTriggered); 
     if(cand){
       fh2ESDTriggerCount->Fill(0.,kSelectedALICE); 
       fh2ESDTriggerCount->Fill(iCl,kSelectedALICE); 
@@ -459,6 +461,8 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
     AliAnalysisHelperJetTasks::EventClass(kTRUE,iCl);
     Bool_t cand = aod->GetHeader()->GetOfflineTrigger()&fPhysicsSelectionFlag;
     if(fDebug)Printf("%s:%d AOD selection %d %d",(char*)__FILE__,__LINE__,cand,aod->GetHeader()->GetOfflineTrigger());
+    fh2TriggerCount->Fill(0.,kAllTriggered); 
+    fh2TriggerCount->Fill(iCl,kAllTriggered); 
     if(cand){
       fh2TriggerCount->Fill(0.,kSelectedALICE); 
       fh2TriggerCount->Fill(iCl,kSelectedALICE); 
@@ -545,8 +549,7 @@ void AliAnalysisTaskJetServices::UserExec(Option_t */*option*/)
       vtx->SetTitle(vtxAOD->GetTitle());
 
       TString vtitle = vtxAOD->GetTitle();
-      if (!vtitle.Contains("VertexerTracks"))
-       vtx->SetNContributors(vtxAOD->GetNContributors());
+      vtx->SetNContributors(vtxAOD->GetNContributors());
 
       // Add SPD "main" vertex                                                                    
       const AliAODVertex *vtxS = aod->GetPrimaryVertexSPD();
@@ -609,7 +612,6 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliESDVertex* vtx) {
   // SPD       SPDVertex             vertexer: Z
   
   Int_t nCont = vtx->GetNContributors();
-
   if(nCont>=1){
     fEventCutInfoESD |= kContributorsCut1;    
     if(nCont>=2){
@@ -650,8 +652,13 @@ Bool_t  AliAnalysisTaskJetServices::IsVertexValid ( const AliAODVertex* vtx) con
   // TPC       TPCVertex             VertexerTracksNoConstraint
   // SPD       SPDVertex             vertexer: 3D
   // SPD       SPDVertex             vertexer: Z
+
+  if(fDebug){
+    Printf(" n contrib %d",vtx->GetNContributors());
+    vtx->Print();
+  }
   
-  if(vtx->GetNContributors()<3)return kFALSE;
+  //  if(vtx->GetNContributors()<3)return kFALSE;
   // do not want tpc only primary vertex
   TString vtxName(vtx->GetName());
   if(vtxName.Contains("TPCVertex"))return kFALSE;
@@ -775,6 +782,7 @@ Int_t AliAnalysisTaskJetServices::GetEventClass(AliESDEvent *esd){
   if(esd->GetCentrality()){
     cent = esd->GetCentrality()->GetCentralityPercentile("V0M");
   }
+  if(cent>80)return 5;
   if(cent>50)return 4;
   if(cent>30)return 3;
   if(cent>10)return 2;
@@ -786,7 +794,7 @@ Int_t AliAnalysisTaskJetServices::GetEventClass(AliESDEvent *esd){
 Int_t AliAnalysisTaskJetServices::GetEventClass(AliAODEvent *aod){
 
   Float_t cent = aod->GetHeader()->GetCentrality();
-
+  if(cent>80)return 5;
   if(cent>50)return 4;
   if(cent>30)return 3;
   if(cent>10)return 2;
index 46b73b163614c7eef7abd8ec1ba9c6296a89087f..d4933c301cd4f2b7fca93c76cbec21f775d46e5b 100644 (file)
@@ -105,6 +105,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(): AliAnalysisTaskSE(),
   fh1SumPtTrackAreaRec(0x0),  
   fh1TmpRho(0x0),
   fh1PtJetsRecIn(0x0),
+  fh1PtJetsGenIn(0x0),
   fh1PtJetsLeadingRecIn(0x0),
   fh1PtTracksRecIn(0x0),
   fh1PtTracksLeadingRecIn(0x0),
@@ -215,6 +216,7 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fh1SumPtTrackAreaRec(0x0),  
   fh1TmpRho(0x0),
   fh1PtJetsRecIn(0x0),
+  fh1PtJetsGenIn(0x0),
   fh1PtJetsLeadingRecIn(0x0),
   fh1PtTracksRecIn(0x0),
   fh1PtTracksLeadingRecIn(0x0),
@@ -411,6 +413,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
   fh1SumPtTrackAreaRec = new TH1F("fh1SumPtTrackAreaRec","Sum Rec track P_T #eta <0.9 / 1.8 * 2 * 0.4*0.4;p_{T,sum} (GeV/c)",nBinPt,binLimitsPt);
   
   fh1PtJetsRecIn  = new TH1F("fh1PtJetsRecIn","Rec jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
+  fh1PtJetsGenIn  = new TH1F("fh1PtJetsGenIn","Gen jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
   fh1PtJetsLeadingRecIn = new TH1F("fh1PtJetsLeadingRecIn","Rec jets P_T;p_{T} (GeV/c)",nBinPt,binLimitsPt);
   fh1PtTracksRecIn  = new TH1F("fh1PtTracksRecIn","Rec tracks P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
   fh1PtTracksLeadingRecIn  = new TH1F("fh1PtTracksLeadingRecIn","Rec tracks P_T #eta < 0.9;p_{T} (GeV/c)",nBinPt,binLimitsPt);
@@ -520,6 +523,7 @@ void AliAnalysisTaskJetSpectrum2::UserCreateOutputObjects()
       fHistList->Add(fh1PtTracksGenIn);
     }
     fHistList->Add(fh1PtJetsRecIn);
+    fHistList->Add(fh1PtJetsGenIn);
     fHistList->Add(fh1PtJetsLeadingRecIn);
     fHistList->Add(fh1PtTracksRecIn);
     fHistList->Add(fh1PtTracksLeadingRecIn);
@@ -1082,7 +1086,8 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/)
     Double_t phiGen = genJets[ig].Phi();
     if(phiGen<0)phiGen+=TMath::Pi()*2.;    
     Double_t etaGen = genJets[ig].Eta();
-    
+    fh1PtJetsGenIn->Fill(ptGen);
+
     container[3] = ptGen;
     container[4] = etaGen;
     container[5] = phiGen;
index fc11ffe31e2389645dd1b7af60c7ac4a7233a1ca..da49e374e0a0ec2270995c5323d927c6d9b8ca61 100644 (file)
@@ -149,6 +149,7 @@ class AliAnalysisTaskJetSpectrum2 : public AliAnalysisTaskSE
     TH1F*         fh1PtGenIn[kMaxJets];  //! Jet pt with corellated generated jet    
 
     TH1F*         fh1PtJetsRecIn;  //! Jet pt for all jets
+    TH1F*         fh1PtJetsGenIn;  //! Jet pt for all jets
     TH1F*         fh1PtJetsLeadingRecIn;  //! Jet pt for all jets
     TH1F*         fh1PtTracksRecIn;  //! track pt for all tracks
     TH1F*         fh1PtTracksLeadingRecIn;  //! track pt for all tracks
diff --git a/PWG4/macros/AddTaskCentralitySelection.C b/PWG4/macros/AddTaskCentralitySelection.C
deleted file mode 100644 (file)
index 83f7f6c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-AliCentralitySelectionTask *AddTaskCentralitySelection(const char* percentilefile1, const char* percentilefile2){
-
-
-    AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-    if(!mgr){
-       ::Error("AddTaskCentralitySelection", "No analysis manager to connect ot.");
-       return NULL;
-    }
-    if(!mgr->GetInputEventHandler()){
-        ::Error("AddTaskCentralitySelection", "This task requires an input event handler.");
-       return NULL;
-    }
-
-
-    AliCentralitySelectionTask *task = new AliCentralitySelectionTask("CentralitySelection");
-
-    if(percentilefile1) task->SetPercentileFile(percentilefile1);
-    if(percentilefile2) task->SetPercentileFile2(percentilefile2);
-
-    mgr->AddTask(task);
-
-    mgr->ConnectInput (task, 0, mgr->GetCommonInputContainer());
-
-    return task;
-}
index 9ca35007c9d24cead6b7d65c60331bade91ffece..3b47d403154245e3eb91d40b0f36132575c4bdc0 100644 (file)
@@ -161,3 +161,9 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
    \r
    return pwg4spec;\r
 }\r
+\r
+void SetAODInput(AliAnalysisTaskJetSpectrum2 *taskJetSpectrum){\r
+  taskJetSpectrum->SetAODJetInput(kTRUE);\r
+  taskJetSpectrum->SetAODTrackInput(kTRUE);\r
+  // taskJetSpectrum->SetUseGlobalSelection(kFALSE);\r
+}\r
index 19e32e3a9cee8066c59695734a71d8abe32598ab..6455e8f40b676308e51762e753a7e41230c5af93 100644 (file)
@@ -40,7 +40,7 @@ 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
+UInt_t      iPhysicsSelectionFlag = 1; // set by pyshics selection and passed to the task, kMB, kUserDefined etc
 Bool_t      useTender           = kFALSE; // use tender wagon 
 Bool_t      kUseKinefilter     = kFALSE; // use Kinematics filter
 Bool_t      kUseMuonfilter     = kFALSE; // use Kinematics filter
@@ -66,7 +66,7 @@ Int_t         kErrorIgnoreLevel = -1; // takes the errror print level from .root
 // const Int_t kSysError =   5000;
 // const Int_t kFatal    =   6000; 
 Int_t         kUseSysInfo         = 0; // activate debugging
-Long64_t kNumberOfEvents     = 1234567890; // number of events to process from the chain
+Long64_t    kNumberOfEvents     = 1234567890; // number of events to process from the chain
 Bool_t      kUseMC              = kTRUE;  // use MC info
 Bool_t      kIsMC               = kTRUE;  // is MC info, if false it overwrites Use(AOD)MC
 Bool_t      kUseAODMC           = kTRUE;  // use MC infA
@@ -80,6 +80,12 @@ Bool_t      kIsPbPb             = kFALSE;  // Pb+Pb
 // ### Analysis modules to be included. Some may not be yet fully implemented.
 //==============================================================================
 Int_t       iJETAN             = 1;      // Jet analysis (PWG4) // 1 write standard 2 write non-standard jets, 3 wrtie both
+TString     kDefaultJetBranch     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
+TString     kDefaultJetBackgroundBranch     = "";      // is currently set when filled (jet clsuters  
+TString     kDefaultJetBranchMC     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
+TString     kDefaultJetBackgroundBranchMC     = "";      // is currently set when filled (jet clsuters  
+TString     kDefaultJetBranchMC2     = "";      // is currently set when filled (iJETAN or clusters) or from config macro 
+TString     kDefaultJetBackgroundBranchMC2     = "";      // is currently set when filled (jet clsuters  
 Int_t       iDIJETAN           = 1;
 Int_t       iJETANLib          = 1;
 Int_t       iPWG1QASym         = 0;      // Eva's QA task compiled on the fly...
@@ -382,15 +388,16 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      }
      AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kIsMC,rejectBkg);  
      iPhysicsSelectionFlag = AliVEvent::kMB;
+     //     mgr->RegisterExtraFile("EventStat_tmp.root");
    }
 
    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);
+     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+     //     const char* file1="$ALICE_ROOT/ANALYSIS/macros/AliCentralityBy1D_137161.root";
+     //     const char* file2="$ALICE_ROOT/ANALYSIS/macros/AliCentralityByFunction_137161.root";
+     AliCentralitySelectionTask *taskC = AddTaskCentrality();
       if (!taskC) ::Warning("AnalysisTrainPWG4Jets", "AliCentralitySelectionTask cannot run for this train conditions - EXCLUDED");
    }
 
@@ -398,7 +405,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       //  ESD filter task configuration.
       gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskESDFilterPWG4Train.C");
       AliAnalysisTaskESDfilter *taskesdfilter = AddTaskESDFilter(kUseKinefilter,kUseMuonfilter);
-      taskesdfilter->SetEnableFillAOD(kTRUE);
+      taskesdfilter->SetEnableFillAOD(kFALSE);
 
       if(kIsMC){
        mgr->RegisterExtraFile("pyxsec_hists.root");
@@ -439,41 +446,33 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
       if(iJETAN&2){
        // 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,1.,0); // no background subtraction
        if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,0.15,1); // low p_T background subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1,0);     // high p_T no abackground subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1,1);     // high p_T abackground subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.2,kHighPtFilterMask,0.15,0); // low p_T no background subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.2,kHighPtFilterMask,0.15,1); // low p_T background subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.2,kHighPtFilterMask,1,0);     // high p_T no abackground subtraction
-       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
-       taskjets = AddTaskJets("AOD","UA1",0.2,kHighPtFilterMask,1,1);     // high p_T abackground subtraction
+
+       // STANDARD UA jet finders pT cut 1 GeV background mode 2 R = 0.4
+       taskjets = AddTaskJets("AOD","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
        if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       // EXTRA UA1 Jet finder same as above with R = 0.2
 
-       /*
-         UInt_t selection = 0;
-         if(!kFillAOD){
-         selection = 0xffffff&~(1<<13)&~(1<<5)&~(1<<6); // switch OFF DA and all R = 0.7 to save processing time
-         selection &= ~(1<<1)&~(1<<2)&~(1<<4)&~(1<<6)&~(1<<8)&~(1<<10)&~(1<<12);
-       }
-       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);
+
+
+       // SICONE 
+       taskjets = AddTaskJets("AOD","SISCONE",0.4,kHighPtFilterMask,0.15,0); //no background subtraction to be done later....
+       if(kDeltaAODJetName.Length()>0)taskjets->SetNonStdOutputFile(kDeltaAODJetName.Data());
+       
+       if(kUseAODMC){
+         // STANDARD UA jet finders pT cut 1 GeV background mode 2 R = 0.4
+         taskjets = AddTaskJets("AODMC","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
+         taskjets = AddTaskJets("AODMC2","UA1",0.4,kHighPtFilterMask,1.,2); // background subtraction
        }
-       AddTaskJetsDelta(kDeltaAODJetName.Data(),kHighPtFilterMask,kUseAODMC,selection); 
-       AddTaskJets("AOD","FASTKT",0.2,kHighPtFilterMask); 
-       */
+
+
+       if(kDeltaAODJetName.Length()>0)mgr->RegisterExtraFile(kDeltaAODJetName.Data()); 
       }
       if (!taskjets) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJets cannot run for this train conditions - EXCLUDED");
-       if(kDeltaAODJetName.Length()>0)mgr->RegisterExtraFile(kDeltaAODJetName.Data()); 
    }
 
+
    if (iPWG4FastEmbedding && iJETAN) {
      AliAnalysisTaskJets *taskEmbJets = AddTaskJets("AODextra", "FASTKT", 0.4, kHighPtFilterMask);
      taskEmbJets->ReadAODFromOutput();
@@ -491,143 +490,62 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
        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
+        kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+        
+        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.2,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
         taskCl->SetBackgroundCalc(kTRUE);
         taskCl->SetCentralityCut(fCenLo,fCenUp);
         taskCl->SetGhostEtamax(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");
-       */
-
-
+        kDefaultJetBackgroundBranch = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
+       } 
        taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),0.15);
        taskCl->SetCentralityCut(fCenLo,fCenUp);
-       if(kDeltaAODJetName.Length()==0)taskCl->SetJetTriggerPtCut(40.);//
-       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00144_Cut0150_Skip00");
-
-       //       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data(),0.15);
-       //       taskCl->SetCentralityCut(fCenLo,fCenUp);
-       //       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->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00256_Cut0150_Skip00");
-
-
-
-       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1,kDeltaAODJetName.Data(),1.0);
+       if(kDeltaAODJetName.Length()==0)taskCl->SetJetTriggerPtCut(40.);
+       taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
+       kDefaultJetBranch = taskCl->GetJetOutputBranch();
+       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data(),0.15);
        taskCl->SetCentralityCut(fCenLo,fCenUp);
-       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00144_Cut01000_Skip00");
-
-       //       taskCl = AddTaskJetCluster("AOD","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.2,0,1,kDeltaAODJetName.Data(),1.0);
-       //       taskCl->SetCentralityCut(fCenLo,fCenUp);
-       //       taskCl->SetBackgroundBranch("jeteventbackground_clustersAOD_KT04_B1_Filter00144_Cut01000_Skip00");
-
-
-
+       taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranch.Data());
+       
        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,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+          taskCl->SetBackgroundCalc(kTRUE);
+          taskCl->SetGhostEtamax(0.9);
+          kDefaultJetBackgroundBranchMC = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch());
           
-          
-          //      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");
+          taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"KT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+          taskCl->SetBackgroundCalc(kTRUE);
+          taskCl->SetGhostEtamax(0.9);
+          kDefaultJetBackgroundBranchMC2 = Form("%s_%s",AliAODJetEventBackground::StdBranchName(),taskCl->GetJetOutputBranch()); 
         }
         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");
-
+          // pp background calcs...
+        }
+        
+        taskCl = AddTaskJetCluster("AODMC","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetGhostEtamax(0.9);
+        taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC.Data());      
+        kDefaultJetBranchMC = taskCl->GetJetOutputBranch();
 
+        taskCl = AddTaskJetCluster("AODMC2","",kHighPtFilterMask,iPhysicsSelectionFlag,"ANTIKT",0.4,0,1, kDeltaAODJetName.Data(),0.15); // this one is for the background and random jets
+        taskCl->SetBackgroundBranch(kDefaultJetBackgroundBranchMC2.Data());     
+        kDefaultJetBranchMC2 = taskCl->GetJetOutputBranch();
 
-        }
        }
-
+       
+       
        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) {
@@ -659,37 +577,6 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if (!taskEta) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskEta cannot run for this train conditions - EXCLUDED");
    }
 
-   if(iPWG4Fragmentation){
-     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
-       AliAnalysisTaskFragmentationFunction *taskFrag = 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(kHighPtFilterMask);
-     if (!taskChem) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetChem cannot run for this train conditions - EXCLUDED");
-   }
-
 
    if(iPWG4JetServices){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJetServices.C");
@@ -701,13 +588,13 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      taskjetServ->SetMCData(kIsMC);
      taskjetServ->SetUsePhysicsSelection((Bool_t)iPhysicsSelection);
      taskjetServ->SetPhysicsSelectionFlag(iPhysicsSelectionFlag); // 
-     taskjetServ->SetDebugLevel(0);
      taskjetServ->SetNonStdFile(kDeltaAODJetName.Data());
      if(kIsPbPb){
-       taskjetServ->SetFilterAODCollisions(kTRUE);
-       taskjetServ->SetZVertexCut(30.);
+       if(kDeltaAODJetName.Length()>0)taskjetServ->SetFilterAODCollisions(kTRUE);
+       taskjetServ->SetZVertexCut(8.);
      }
      if(iAODanalysis){
+       //       taskjetServ->SetDebugLevel(3);
        taskjetServ->SetAODInput(kTRUE);
      }
    }
@@ -716,69 +603,47 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      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){
-       // 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(iPWG4JetSpectrum&2){
-       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...
+       taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),"",kDefaultJetBackgroundBranch.Data(),kHighPtFilterMask,AliVEvent::kMB,0,kTRUE,1,0);
+       if(iAODanalysis)SetAODInput(taskjetSpectrum);
+       taskjetSpectrum->SetDebugLevel(3);
        if(kIsPbPb){
-        taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTJET04","",cBack.Data(),kHighPtFilterMask,iPhysicsSelectionFlag,0,kTRUE,1,1); 
-        taskjetSpectrum->SetDebugLevel(10);
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),"",kDefaultJetBackgroundBranch.Data(),kHighPtFilterMask,AliVEvent::kMB,0,kTRUE,1,1);
+        if(iAODanalysis)SetAODInput(taskjetSpectrum);
+
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),"",kDefaultJetBackgroundBranch.Data(),kHighPtFilterMask,AliVEvent::kMB,0,kTRUE,1,2);
+        if(iAODanalysis)SetAODInput(taskjetSpectrum);
+
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),"",kDefaultJetBackgroundBranch.Data(),kHighPtFilterMask,AliVEvent::kMB,0,kTRUE,1,3);
+        if(iAODanalysis)SetAODInput(taskjetSpectrum);
+
+        taskjetSpectrum = AddTaskJetSpectrum2(kDefaultJetBranch.Data(),"",kDefaultJetBackgroundBranch.Data(),kHighPtFilterMask,AliVEvent::kMB,0,kTRUE,1,4);
+        if(iAODanalysis)SetAODInput(taskjetSpectrum);
        }
+       if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
      }
-     if(iPWG4JetSpectrum&8){
-       taskjetSpectrum = AddTaskJetSpectrum2("jetsAOD_FASTKT04",         "","jeteventbackground_clustersAOD_KT04",kHighPtFilterMask,iPhysicsSelectionFlag,0,kFALSE,0,0);
-       taskjetSpectrum = AddTaskJetSpectrum2("jetsAODextra_FASTKT04",    "","jeteventbackground_clustersAOD_KT04",kHighPtFilterMask,iPhysicsSelectionFlag,0,kFALSE,0,0);
-       taskjetSpectrum = AddTaskJetSpectrum2("jetsAODextraonly_FASTKT04","","jeteventbackground_clustersAOD_KT04",kHighPtFilterMask,iPhysicsSelectionFlag,0,kFALSE,0,0); 
+   }
+
+   if(iPWG4Fragmentation){
+     gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskFragmentationFunction.C");
+       AliAnalysisTaskFragmentationFunction *taskFrag = 0;
+     if(kUseAODMC){
+
      }
-     if (!taskjetSpectrum) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetSpectrum2 cannot run for this train conditions - EXCLUDED");
-     
+     else{
+       taskFrag = AddTaskFragmentationFunction(kDefaultJetBranch.Data(),"","","",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(kHighPtFilterMask);
+     if (!taskChem) ::Warning("AnalysisTrainPWG4Jets", "AliAnalysisTaskJetChem cannot run for this train conditions - EXCLUDED");
    }
 
 
+   
    if(iPWG4JCORRAN){
      gROOT->LoadMacro("$ALICE_ROOT/PWG4/macros/AddTaskJCORRANTask.C");
      AliJCORRANTask* corran = AddTaskJCORRAN(kDeltaAODJCORRANName.Data(),0);
@@ -1017,7 +882,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if (!strcmp(plugin_mode, "offline")&&smode=="GRID"){
        // Offline mode path files
        //      PatchJDL();
-       PatchAnalysisMacro();
+       //       PatchAnalysisMacro();
      }
 
      if (kSaveTrain && smode=="GRID") {
@@ -1321,6 +1186,7 @@ Bool_t LoadCommonLibraries(const char *mode)
             success &= LoadLibrary("AOD", mode, kTRUE);
             success &= LoadLibrary("ANALYSIS", mode, kTRUE);
             success &= LoadLibrary("ANALYSISalice", mode, kTRUE);
+            success &= LoadLibrary("ROOTFILES", mode, kTRUE);
             success &= LoadLibrary("EventMixing", mode,kTRUE);
             success &= LoadLibrary("CORRFW", mode, kTRUE);
          } else {   
@@ -1721,7 +1587,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    plugin->SetRunMode(plugin_mode);
    if (kPluginUseProductionMode) plugin->SetProductionMode();
    plugin->SetJobTag(kJobTag);
-   plugin->SetNtestFiles(2);
+   plugin->SetNtestFiles(1);
 //   plugin->SetPreferedSE("ALICE::NIHAM::File");
 // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
@@ -1734,7 +1600,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // Define production directory LFN
    plugin->SetGridDataDir(kGridDatadir.Data());
 // Set data search pattern
-   if (iAODanalysis) plugin->SetDataPattern(" *AliAOD.root");
+   if (iAODanalysis) plugin->SetDataPattern(" *AliAOD.Jets.root");
    //   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
@@ -1756,7 +1622,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
        c = in1.get();
        if ( (c >= '0') && (c <= '9') )
         {
-          in1.putback (c);
+          in1.putback (c)s;
           in1>>iRun;
           Printf("AnalysisTrainPWG4Jets Adding run number from File %s", Form(kGridRunPattern.Data(),iRun));
           plugin->AddRunNumber(Form(kGridRunPattern.Data(),iRun));