]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
macro updates for 2011
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 6 Feb 2012 06:16:41 +0000 (06:16 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 6 Feb 2012 06:16:41 +0000 (06:16 +0000)
PWGJE/macros/AddTaskJetServices.C
PWGJE/macros/AddTaskJetSpectrum2.C
PWGJE/macros/ConfigLegoTrainPWGJE.C
PWGJE/macros/ConfigTrainGrid.C

index 4faa8c5c3313ae11de75d133486e7638531cbad3..c002e21018c8e9a60fe31c0948f6e856653b8ab2 100644 (file)
@@ -1,4 +1,6 @@
-AliAnalysisTaskJetServices *AddTaskJetServices(TString v0CalibFile = "")\r
+AliAnalysisTaskJetServices* serv = 0;\r
+Bool_t ConfigWithFlags();\r
+AliAnalysisTaskJetServices *AddTaskJetServices()\r
 {\r
    // Get the pointer to the existing analysis manager via the static access method.\r
    //==============================================================================\r
@@ -20,25 +22,21 @@ AliAnalysisTaskJetServices *AddTaskJetServices(TString v0CalibFile = "")
    // Create the task and configure it.\r
    //===========================================================================\r
    \r
-   AliAnalysisTaskJetServices* serv = new  AliAnalysisTaskJetServices("JetServices");\r
+   serv = new AliAnalysisTaskJetServices("JetServices");\r
       \r
-   if(v0CalibFile.Length()){\r
-     TFile *fV0 = TFile::Open(v0CalibFile.Data());\r
-     if(fV0){\r
-       TDirectory *dir = (TDirectory*)fV0->Get("PWG4_services");\r
-       TList *list = (TList*)dir->Get("serv");\r
-       TProfile *xa = (TProfile*)list->FindObject("fp1RPXA");\r
-       TProfile *ya = (TProfile*)list->FindObject("fp1RPYA");\r
-       TProfile *xc = (TProfile*)list->FindObject("fp1RPXC");\r
-       TProfile *yc = (TProfile*)list->FindObject("fp1RPYC");\r
-       serv->SetV0Centroids(xa,ya,xc,yc);\r
-     }\r
-   }\r
 \r
    if(type == "AOD"){\r
      serv->SetAODInput(kTRUE);\r
    }\r
    mgr->AddTask(serv);\r
+\r
+   // evaluate global variables \r
+   Bool_t bGood1 = false;\r
+   Bool_t bGood2 = false;\r
+\r
+\r
+   if(!ConfigWithFlags())return 0;\r
+   serv->SetUsePhysicsSelection(kTRUE);\r
      \r
    // Create ONLY the output containers for the data produced by the task.\r
    // Get and connect other common input/output containers via the manager as below\r
@@ -51,3 +49,54 @@ AliAnalysisTaskJetServices *AddTaskJetServices(TString v0CalibFile = "")
    \r
    return serv;\r
 }\r
+\r
+Bool_t ConfigWithFlags(){\r
+    \r
+  Bool_t bGood1 = kFALSE;\r
+  Bool_t bGood2 = kFALSE;\r
+\r
+\r
+  serv->SetRunRange(AliAnalysisManager::GetGlobalInt("kGridRunRangeLo",bGood1),\r
+                     AliAnalysisManager::GetGlobalInt("kGridRunRangeLo",bGood2));\r
+  \r
+  if(!bGood1||!bGood2){\r
+    Printf("%s:%d Run range not set",(char*)__FILE__,__LINE__);\r
+    serv->SetRunRange(110000,160000);\r
+  }\r
+   \r
+\r
+  Int_t nTrigger = AliAnalysisManager::GetGlobalInt("kNTrigger",bGood1);\r
+  \r
+  if(bGood1){\r
+    serv->SetNTrigger(nTrigger);\r
+    for(int it = 0;it < nTrigger;it++){\r
+      serv->SetTrigger(it,\r
+                      AliAnalysisManager::GetGlobalInt(Form("kTriggerBit%d",it),bGood1),\r
+                      AliAnalysisManager::GetGlobalStr(Form("kTriggerName%d",it),bGood2));\r
+     }\r
+   }\r
+     \r
+   AliAnalysisManager::GetGlobalInt("kPhysicsSelectionFlag",bGood1);if(bGood1)serv->SetPhysicsSelectionFlag(AliAnalysisManager::GetGlobalInt("kPhysicsSelectionFlag",bGood1));\r
+   else {Printf("%s%d: kPhysicsSelectionFlag not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+   AliAnalysisManager::GetGlobalStr("kDeltaAODJetName",bGood1);if(bGood1)serv->SetNonStdFile(AliAnalysisManager::GetGlobalStr("kDeltaAODJetName",bGood1));\r
+   else {Printf("%s%d: kDeltaAODJetName not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+\r
+   AliAnalysisManager::GetGlobalDbl("kTrackEtaWindow",bGood1);if(bGood1)serv->SetTrackEtaWindow(AliAnalysisManager::GetGlobalDbl("kTrackEtaWindow",bGood1));\r
+   else {Printf("%s%d: kTrackEtaWindow not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+   AliAnalysisManager::GetGlobalDbl("kVertexWindow",bGood1);if(bGood1)serv->SetZVertexCut(AliAnalysisManager::GetGlobalDbl("kVertexWindow",bGood1));\r
+   else {Printf("%s%d: kVertexWindow not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+   \r
+   AliAnalysisManager::GetGlobalInt("kHighPtFilterMask",bGood1);if(bGood1)serv->SetFilterMask(AliAnalysisManager::GetGlobalInt("kHighPtFilterMask",bGood1));\r
+   else {Printf("%s%d: kHighPtFilterMask not defined",(char*)__FILE__,__LINE__); return kFALSE; }   \r
+\r
+   TString cRun(AliAnalysisManager::GetGlobalStr("kJetRunPeriod",bGood1));\r
+   if(cRun.Contains("10h")||cRun.Contains("11h")){\r
+     serv->SetCollisionType(AliAnalysisTaskJetServices::kPbPb);\r
+   }\r
+   else{\r
+     serv->SetCollisionType(AliAnalysisTaskJetServices::kPP);\r
+   }\r
+   \r
+   return kTRUE;\r
+\r
+}\r
index 1a77053547c859a858a0559002a94077abd28086..a39c9264888a3e173a6f7c4e2d040d0f5505f0a1 100644 (file)
@@ -1,3 +1,6 @@
+Bool_t ConfigWithFlagsJetSpectrum2();\r
+AliAnalysisTaskJetSpectrum2 *jetspec = 0;\r
+\r
 AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec = "jets",const char* bGen = "jetsAODMC_UA104",const char* nonStdFile="",UInt_t filterMask = 32, Int_t iPhysicsSelectionFlag = AliVEvent::kMB,UInt_t iEventSelectionMask = 0,Int_t iCl = 0);\r
 \r
 \r
@@ -73,7 +76,7 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
    // Create the task and configure it.\r
    //===========================================================================\r
 \r
-   AliAnalysisTaskJetSpectrum2* jetspec = new  AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl));\r
+   jetspec = new  AliAnalysisTaskJetSpectrum2(Form("JetSpectrum2%s-%s_%010d_Class%02d",bRec,bGen,iEventSelectionMask,iCl));\r
    if(iCl)jetspec->SetEventClass(iCl);\r
 \r
    // add the filter mask for non default jets branches\r
@@ -89,12 +92,6 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
    // if(typeRec.Contains("JETSAOD")&&!typeRec.Contains("MC"))     jetspec->SetBranchRec(Form("%s%s",bRec,cAdd.Data())); \r
 \r
 \r
-   jetspec->SetFilterMask(filterMask); \r
-   jetspec->SetUseGlobalSelection(kTRUE); \r
-   jetspec->SetMinJetPt(5.);\r
-   jetspec->SetJetEtaWindow(0.4);\r
-\r
-\r
 \r
    if(type == "AOD"){\r
      // Assume all jets are not yet produced \r
@@ -134,11 +131,13 @@ AliAnalysisTaskJetSpectrum2 *AddTaskJetSpectrum2(const char* bRec,const char* bG
      jetspec->SetTrackTypeGen(AliAnalysisTaskJetSpectrum2::kTrackAOD);\r
    }\r
 \r
-   if(iPhysicsSelectionFlag)jetspec->SelectCollisionCandidates(iPhysicsSelectionFlag);\r
    if(iEventSelectionMask)jetspec->SetEventSelectionMask(iEventSelectionMask);\r
 \r
    //   jetspec->SetDebugLevel(10);\r
+   if(!ConfigWithFlagsJetSpectrum2())return 0;\r
 \r
+   jetspec->SetUseGlobalSelection(kTRUE); \r
+   jetspec->SetMinJetPt(-1.);//keep all jets \r
 \r
    // to fetch the AOD from the AOD extension ouput \r
    if(strlen(nonStdFile))jetspec->SetNonStdFile(nonStdFile);\r
@@ -161,3 +160,48 @@ void SetAODInput(AliAnalysisTaskJetSpectrum2 *taskJetSpectrum){
   taskJetSpectrum->SetAODTrackInput(kTRUE);\r
   // taskJetSpectrum->SetUseGlobalSelection(kFALSE);\r
 }\r
+\r
+Bool_t ConfigWithFlagsJetSpectrum2(){\r
+    \r
+  Bool_t bGood1 = kFALSE;\r
+  Bool_t bGood2 = kFALSE;\r
+\r
+  \r
+  Int_t nTrigger = AliAnalysisManager::GetGlobalInt("kNTrigger",bGood1);\r
+  \r
+  if(bGood1){\r
+    jetspec->SetNTrigger(nTrigger);\r
+    for(int it = 0;it < nTrigger;it++){\r
+      jetspec->SetTrigger(it,\r
+                         AliAnalysisManager::GetGlobalInt(Form("kTriggerBit%d",it),bGood1),\r
+                         AliAnalysisManager::GetGlobalStr(Form("kTriggerName%d",it),bGood2));\r
+    }\r
+   }\r
+   else {\r
+     Printf("%s%d: kNTrigger not defined",(char*)__FILE__,__LINE__); return kFALSE; \r
+   }\r
+\r
+     \r
+   AliAnalysisManager::GetGlobalInt("kPhysicsSelectionFlag",bGood1);if(bGood1){\r
+     jetspec->SelectCollisionCandidates(AliAnalysisManager::GetGlobalInt("kPhysicsSelectionFlag",bGood1));\r
+   }\r
+   else {Printf("%s%d: kPhysicsSelectionFlag not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+\r
+\r
+   AliAnalysisManager::GetGlobalStr("kDeltaAODJetName",bGood1);if(bGood1)jetspec->SetNonStdFile(AliAnalysisManager::GetGlobalStr("kDeltaAODJetName",bGood1));\r
+   else {Printf("%s%d: kDeltaAODJetName not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+\r
+   AliAnalysisManager::GetGlobalDbl("kTrackEtaWindow",bGood1);if(bGood1)jetspec->SetTrackEtaWindow(AliAnalysisManager::GetGlobalDbl("kTrackEtaWindow",bGood1));\r
+   else {Printf("%s%d: kTrackEtaWindow not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+\r
+   AliAnalysisManager::GetGlobalDbl("kJetEtaWindow",bGood1);if(bGood1)jetspec->SetJetEtaWindow(AliAnalysisManager::GetGlobalDbl("kJetEtaWindow",bGood1));\r
+   else {Printf("%s%d: kJetEtaWindow not defined",(char*)__FILE__,__LINE__); return kFALSE; }\r
+\r
+   \r
+   AliAnalysisManager::GetGlobalInt("kHighPtFilterMask",bGood1);if(bGood1)jetspec->SetFilterMask(AliAnalysisManager::GetGlobalInt("kHighPtFilterMask",bGood1));\r
+   else {Printf("%s%d: kHighPtFilterMask not defined",(char*)__FILE__,__LINE__); return kFALSE; }   \r
+   \r
+   return kTRUE;\r
+\r
+\r
+}\r
index e0d53bdd0c8ffc0d3cbc5168a0226b2a9f362b5e..38ced041c4d711709aaeade7a9112124064c629c 100644 (file)
@@ -5,9 +5,83 @@ void ConfigLegoTrainPWGJE(int iFlag = 0){
 
   if(iFlag==1008){ // 10h
     AliAnalysisManager::SetGlobalStr("kJetRunPeriod","LHC10h");
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeLo",110000);
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeUp",160000);
+
+    AliAnalysisManager::SetGlobalStr("kDeltaAODJetName","");
+
+    AliAnalysisManager::SetGlobalInt("kPhysicsSelectionFlag",AliVEvent::kMB);
+    AliAnalysisManager::SetGlobalInt("kNTrigger",1);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit0",AliVEvent::kMB);    
+    AliAnalysisManager::SetGlobalStr("kTriggerName0","kMB");    
+
+    // jet selection
+    AliAnalysisManager::SetGlobalDbl("kJetEtaWindow",0.5);
+
+    // track selection 
+    AliAnalysisManager::SetGlobalDbl("kTrackEtaWindow",0.9);
+    AliAnalysisManager::SetGlobalDbl("kVertexWindow",10);
+    AliAnalysisManager::SetGlobalInt("kHighPtFilterMask",272);
+
+
   }
   else if(iFlag==1108){ // 11h
+
+
     AliAnalysisManager::SetGlobalStr("kJetRunPeriod","LHC11h");
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeLo",166000);
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeUp",171000);
+
+
+    AliAnalysisManager::SetGlobalStr("kDeltaAODJetName","");
+
+
+    AliAnalysisManager::SetGlobalInt("kPhysicsSelectionFlag",AliVEvent::kMB|AliVEvent::kCentral|AliVEvent::kSemiCentral);    
+    AliAnalysisManager::SetGlobalInt("kNTrigger",4);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit0",AliVEvent::kMB|AliVEvent::kCentral|AliVEvent::kSemiCentral);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit1",AliVEvent::kMB);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit2",AliVEvent::kCentral);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit3",AliVEvent::kSemiCentral);
+    AliAnalysisManager::SetGlobalStr("kTriggerName0","kMB|kCentral|kSemiCentral");    
+    AliAnalysisManager::SetGlobalStr("kTriggerName1","kMB");    
+    AliAnalysisManager::SetGlobalStr("kTriggerName2","kCentral");    
+    AliAnalysisManager::SetGlobalStr("kTriggerName3","kSemiCentral");    
+
+
+    // jet selection
+    AliAnalysisManager::SetGlobalDbl("kJetEtaWindow",0.5);
+
+    // track selection 
+    AliAnalysisManager::SetGlobalDbl("kTrackEtaWindow",0.9);
+    AliAnalysisManager::SetGlobalDbl("kVertexWindow",10);
+    AliAnalysisManager::SetGlobalInt("kHighPtFilterMask",272);
+
   }
+  else{
+    // catch all
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeLo",110000);
+    AliAnalysisManager::SetGlobalInt("kGridRunRangeUp",160000);
+
+
+    AliAnalysisManager::SetGlobalStr("kDeltaAODJetName","");
+
+    AliAnalysisManager::SetGlobalInt("kPhysicsSelectionFlag",AliVEvent::kMB);
+    AliAnalysisManager::SetGlobalInt("kNTrigger",1);    
+    AliAnalysisManager::SetGlobalInt("kTriggerBit0",AliVEvent::kMB);    
+    AliAnalysisManager::SetGlobalStr("kTriggerName0","kMB");    
+
+
+    // jet selection
+    AliAnalysisManager::SetGlobalDbl("kJetEtaWindow",0.5);
+
+    // track selection 
+    AliAnalysisManager::SetGlobalDbl("kTrackEtaWindow",0.9);
+    AliAnalysisManager::SetGlobalDbl("kVertexWindow",10);
+    AliAnalysisManager::SetGlobalInt("kHighPtFilterMask",272);
+
+
+
+  }
+
 
 }
index 371aeb8aaf49f20d692c5f0b328e7a94aad3ece1..5073027f293385cb6e5957e57eee82b846ef9365 100644 (file)
@@ -18,6 +18,7 @@
     502 = LHC10d 7000 GeV Real pass2
     801 = LHC10h Pb+Pb real
     802 = LHC10h Pb+Pb real pass2
+    812 = LHC11h pass 2
    1012 = LHC10a12 0.9 GeV MC Pythiy D6T  
    1014 = LHC10a14 0.9 GeV MC ojet D6T  
    2001 = LHC10b1 7 TeV Phojet with real OCDB
   */
   Bool_t debugConfig =false;
   Bool_t ckbConfig = false;
-  Bool_t productionConfig = false; // make this true for productions mode
+  Bool_t productionConfig = true; // make this true for productions mode, no par files ets 
   Int_t  iVersion = 1; // this is the train version for one datapass
 
   // bextra == 0 4 plus
   // bextra == 1 large pass1 split..
   // bextra == 2 3 plus
   //  Int_t bRun = 802; Int_t bExtra = 0;  char* cDate = "111018b";
-  Int_t bRun = 5014; Int_t bExtra = 0;  char* cDate = "120104a";
+  Int_t bRun = 812; Int_t bExtra = 0;  char* cDate = "120202a";
   //  Int_t bRun = 8102; Int_t bExtra = 1;  char* cDate = "110725a";
   iAODanalysis = 0; 
   // 1 == Read Jets and tracks form the input AOD
   iJETAN = 3;
   iDIJETAN = 1; // only run on one JetFinder for the moment
   iPWGPPQASym = 0; // excluded since also on QA train         
-  iPWG4TmpSourceSara = 0; 
   iPWG4JetServices = 1; 
   iPWG4Fragmentation = 0; 
   iPWG4JetSpectrum = 7; 
   iPWG4PtQATPC      = 3;
   iPWG4PtTrackQA    = 1;
   iPWG4Cosmics      = 0; 
-  iPWG4JetChem      = 1;
-  iPWG4QGSep  = 1;
-  iPWG4Minijet  = 1;
+  iPWG4JetChem      = 0;
+  iPWG4QGSep  = 0;
+  iPWG4Minijet  = 0;
   iPWG4ThreeJets    = 0; // tmp off mem leak
   iPWG4KMeans       = 1; // Off no feedback 
   iPWG4Cluster      = 5;
-  iPWG4Tagged       = 1; 
-  iPWG4PartCorr     = 1;
-  iPWG4CaloQA       = 1;
-  iPWG4JetCorr      = 0; 
-  iPWG4JCORRAN      = 0;  // TMP OFF: Writes a Tree
-  iPWG4GammaConv    = 1; // TMP OFF for merging
-  iPWG4CaloConv    = 0;  // 25.08. off: Output size 450MB in memory 03.09 crashes
-  iPWG4omega3pi     = 1; //
   kDeltaAODJetName   = ""; // for OTF we do not need to write a delta/saves some extension gymnastics in the tasks       
-  kDeltaAODPartCorrName = "";
   kPluginExecutableCommand = "cat wn.xml; root -b -q "; // dump the file list to stdout for debugging
   kPluginAliRootVersion    = ""; 
   kGridRunsPerMaster = 1; // To have the separate configs for eacj run in separate dirs
 
   if(bRun<100){ // private MC
     iPWGPPQASym = 0;
-    iPWG4TmpSourceSara = 0;
     iPWG4JetChem = 0;
     iPWG4UE = 0;
     iPWG4Cluster      = 0;
     iPWG4Cosmics      = 0; // tmp on
     iPWG4ThreeJets    = 0; 
     iPWG4KMeans       = 0;
-    iPWG4PartCorr     = 0;
-    iPWG4CaloQA       = 0; 
-    iPWG4CaloConv     = 0; 
-    iPWG4Tagged    = 0; 
-    iPWG4JetCorr      = 0;     
-    iPWG4GammaConv    = 0; 
-    iPWG4omega3pi      = 0;     
     kUseKinefilter         = kTRUE;
     kIsMC                  = kTRUE;  
     kUseTR                 = kTRUE; 
     iPWG4JetChem      = 0;
     iPWG4QGSep  = 0;
     iPWG4Minijet  = 0;
-    iPWG4PartCorr     = 0;
-    iPWG4GammaConv    = 0; 
 
     // running as light a possible 
 
     // swtich off most tasks for Pb+Pb
     iDIJETAN = 0; // only run on one JetFinder for the moment
     iPWG4Fragmentation = 0; 
-    iPWG4LeadingUE = 0; 
-    iPWG4JetChem      = 0;
-    iPWG4QGSep  = 0;
-    iPWG4Minijet  = 0;
-    iPWG4PartCorr     = 0;
-    iPWG4GammaConv    = 0; 
 
     // running as light a possible 
 
       iPWG4JetChem      = 0;
       iPWG4QGSep  = 0;
       iPWG4Minijet  = 0;
-      iPWG4PartCorr     = 0;
-      iPWG4GammaConv    = 0; 
       
       // running as light a possible 
       
     //    gROOT->LoadMacro("cleanXML.C");
     // cleanXML();
   }
+  else if (bRun == 812){
+    iRunFlag = 1108;
+    kGridRunRange[0]       =  0;  // 0 is a bad number :(, needs a manual commit in alien...
+    kGridRunRange[1]       =  -1; // 
+    kGridDatadir           = "/alice/data/2011/LHC11h_2/"; 
+    kGridDataSet           = "LHC11h_2"; 
+    kGridExtraAliendirLevel  = Form("/%s",cDate);kGridOutdir = "output";
+    kGridRunPattern        = "%09d"; 
+    kUseKinefilter         = kFALSE;
+    kIsMC                  = kFALSE;  // is real! 
+    kUseMC                 = kFALSE; 
+    kUseAODMC              = kFALSE; 
+
+    if(iVersion==1){
+    // switch off tasks with no feedback...
+      iPWG4ThreeJets    = 0; // tmp off mem leak
+      iPWG4KMeans       = 0;  // OFF no FEEDBACK
+      iPWG4Tagged       = 0; // OFF crashes on MC 
+      iPWG4CaloQA       = 0; // OFF not needed on MC   
+      iPWG4JetCorr      = 0; 
+      iPWG4JCORRAN      = 0;  // TMP OFF: Writes a Tree
+      iPWG4omega3pi     = 0; // OFF no feedback
+      
+      // swtich off most tasks for Pb+Pb
+      iDIJETAN = 0; // only run on one JetFinder for the moment
+      iPWG4LeadingUE = 0; 
+      iPWG4JetChem      = 0;
+      iPWG4QGSep  = 0;
+      iPWG4Minijet  = 0;
+      
+      // running as light a possible 
+      
+      iPWG4PtQAMC     = 0;  // 
+      iPWG4PtQATPC   = 0;  // 
+      iPWG4PtSpectra   = 0;  //  
+      iPWG4PtTrackQA    = 0; // currently not needed 08.09.2011
+      iPWG4JetSpectrum = 1; 
+      iPWG4JetServices  = 1; // !!!!!!!!!!! 
+      iPWG4Cluster      = 1;// not 5....
+      kHighPtFilterMask = 1<<4|1<<8; // Global tracks with SPD requirment global constraitn for the rest
+      iPWG4Fragmentation = 1;
+    //
+    }// version1
+
+
+       
+       // anti kT 150 MeV
+       kJetMapSpectrum.Add(25,12);
+       kJetBackMapSpectrum.Add(25,5);
+       kJetBackMapSpectrum.Add(12,5);
+
+       // anti kT R  = 0.2
+       kJetMapSpectrum.Add(28,16);
+       kJetBackMapSpectrum.Add(28,5);      
+       kJetBackMapSpectrum.Add(16,5);
+
+       // anti kT 2 GeV
+       kJetMapSpectrum.Add(31,15);
+       kJetBackMapSpectrum.Add(31,8);      
+       kJetBackMapSpectrum.Add(15,8);
+
+       
+       // random cones
+       kJetMapSpectrum.Add(9,10);
+       kJetBackMapSpectrum.Add(10,5);
+       kJetBackMapSpectrum.Add(9,5);
+       
+       kJetMapSpectrum.Add(13,14);
+       kJetBackMapSpectrum.Add(14,5);
+       kJetBackMapSpectrum.Add(13,5);
+
+
+    // CLEAN XML FILES LOCALLY AND ON ALIEN WHEN STARTING A NEW PASS!
+    kGridPassPattern       = "pass2";    // reset for AODs below
+
+    kGridLocalRunList      = "fp_lhc11h_pass2.txt";    
+    kTrainName  = Form("p4t_11h_pass2_%s",cDate);
+    if (kPluginMode.Contains("merge")){
+      //      kGridLocalRunList      = "fp_lhc10h_pass2b.txt";    
+      kGridLocalRunList      = "out_merge_100_1.txt";    
+    }
+    if (kPluginMode.Contains("merge")){
+      kSaveAOD = 0; // 
+    }
+    kGridRunsPerMaster = 1; // Physcicsselection does not support more than on run per job
+    // stich of tasks not from PWG4JetTasks
+    //    gROOT->LoadMacro("cleanXML.C");
+    // cleanXML();
+  }
+
   else if (bRun == 1012){
     kGridRunRange[0]       =  0;  // 0 is a bad number :(, needs a manual commit in alien...
     kGridRunRange[1]       =  -1; // 
     kGridRunsPerMaster     = 1; // Physcicsselection does not support more than on run per job
     kGridFilesPerJob       = 100; // only few events in a sim file
     // stich of tasks not from PWG4JetTasks
-    iPWG4TmpSourceSara = 0; 
     iPWG4UE = 0; //
     iPWG4ThreeJets    = 0; // tmp off mem leak
     iPWG4KMeans       = 0;  // OFF no FEEDBACK
     kGridLocalRunList      = "fp_lhc10e14.txt";   kTrainName  = Form("pwg4train_LHC10e14_%s",cDate);
     kGridPassPattern       = "";
 
-    iPWG4TmpSourceSara = 0; 
     iPWG4UE = 0; // off not needed on Jet+Jet
     iPWG4LeadingUE = 0; // off not needed on Jet +Jet
     iPWG4CorrectionsUE = 0; // off not needed on Jet +Jet
       
       // swtich off most tasks for Pb+Pb
       iDIJETAN = 0; // only run on one JetFinder for the moment
-      iPWG4LeadingUE = 0; 
-      iPWG4JetChem      = 0;
-      iPWG4QGSep  = 0;
-      iPWG4Minijet  = 0;
-      iPWG4PartCorr     = 0;
-      iPWG4GammaConv    = 0; 
+
       
       // running as light a possible 
       
     iPWG4JetCorr      = 0; 
     iPWG4JCORRAN      = 0;  // TMP OFF: Writes a Tree
     iPWG4omega3pi     = 0; // OFF no feedback
-    iPWG4TmpSourceSara = 0; 
-    iPWG4UE = 0; //
-    iPWG4ThreeJets    = 0; // tmp off mem leak
-    iPWG4KMeans       = 0;  // OFF no FEEDBACK
-    iPWG4Tagged       = 0; // OFF crashes on MC 
-    iPWG4CaloQA       = 0; // OFF not needed on MC   
-    iPWG4JetCorr      = 0; 
-    iPWG4JCORRAN      = 0;  // TMP OFF: Writes a Tree
-    iPWG4CaloConv    = 0;  // 25.08. off: Output size 03.09 crashes 
-    iPWG4PartCorr    = 0;  // OFF cjecked back with Gustavo
-    iPWG4omega3pi     = 0; // OFF no feedback
+
     // CLEAN XML FILES LOCALLY AND ON ALIEN WHEN STARTING A NEW PASS!
     kGridPassPattern       = "";    kGridLocalRunList      = "fp_lhc10f6.txt";    kTrainName  = Form("pwg4train_LHC10f6_%s",cDate);
     kGridRunsPerMaster = 1; // Physcicsselection does not support more than on run per job
     iPWG4JetChem      = 0;
     iPWG4QGSep  = 0;
     iPWG4Minijet  = 0;
-    iPWG4PartCorr     = 0;
-    iPWG4GammaConv    = 0; 
 
     // running as light a possible 
 
     iPWG4JetChem      = 0;
     iPWG4QGSep  = 0;
     iPWG4Minijet  = 0;
-    iPWG4PartCorr     = 0;
-    iPWG4GammaConv    = 0; 
 
     // running as light a possible 
     iJETSUBTRACT = 0; // no subtraction
     // switch off all but my analyses
     iPWG4KMeans     = 0;
     iPWGPPQASym = 0;
-    iPWG4TmpSourceSara = 0;
     iPWG4UE = 0;
     iPWG4PtQAMC        = 0;
     iPWG4PtSpectra     = 0;
     iPWG4ThreeJets        = 0;
     iPWG4KMeans     = 0;
     iPWG4Tagged    = 0; 
-    iPWG4PartCorr     = 0;
-    iPWG4CaloQA     = 0;
-    iPWG4CaloConv     = 0; 
-    iPWG4JetCorr      = 0;     
-    iPWG4GammaConv    = 0; 
-    iPWG4JetChem = 0; // tmp on
-    iPWG4omega3pi      = 0;     
     kDeltaAODJetName   = ""; // for OTF we do not need to write a delta/saves some extension gymnastics in the tasks       
-    kDeltaAODPartCorrName = "";
     kUseDebug = kFALSE;
     kPluginAliRootVersion    = ""; 
     kGridFilesPerJob       = 60;
       //      kPluginExecutableCommand = "source ~/setup_root.txt; alienroot -b -q";      
       kPluginExecutableCommand = "root -b -q";      
       //      kPluginExecutableCommand = "valgrind --tool=memcheck --error-limit=no --max-stackframe=3060888 --suppressions=$ROOTSYS/etc/valgrind-root.supp --leak-check=full --num-callers=15 --log-file=valgrind_memcheck.log root.exe -b -q";
-      kPluginExecutableCommand = "export ALICE_ROOT=./ROOTFILES/;" + kPluginExecutableCommand; 
+      //      kPluginExecutableCommand = "export ALICE_ROOT=./ROOTFILES/;" + kPluginExecutableCommand; 
+      kPluginExecutableCommand = kPluginExecutableCommand; 
       kUseSysInfo = 1;
       kUseDebug = kTRUE;
       if(bRun==802){
     }
   }
   if(kPluginAliRootVersion.Length()==0){
-    kPluginExecutableCommand = "export ALICE_ROOT=./ROOTFILES/;" + kPluginExecutableCommand; 
+    //    kPluginExecutableCommand = "export ALICE_ROOT=./ROOTFILES/;" + kPluginExecutableCommand; 
+    kPluginExecutableCommand = kPluginExecutableCommand; 
   } 
 
   if (kPluginMode.Contains("merge")){