Restore LHC10h track cuts for train running (should not affect LHC11h runs (M. Verweij)

diff --git a/PWGJE/macros/AddTaskESDFilterPWGJETrain.C b/PWGJE/macros/AddTaskESDFilterPWGJETrain.C
index e4c59c4c3965b7cc7bc4ff304270560be6deaf14..71fb98ea7f43729b888a6ea0b03040af0e05dfda 100644 (file)
--- a/PWGJE/macros/AddTaskESDFilterPWGJETrain.C
+++ b/PWGJE/macros/AddTaskESDFilterPWGJETrain.C
@@ -160,7 +160,7 @@ Bool_t AddTrackCutsLHC10h(AliAnalysisTaskESDfilter* esdfilter){
   
   // ITS cuts for new jet analysis 
   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/macros/CreateTrackCutsPWGJE.C");
-  AliESDtrackCuts* esdTrackCutsHG0 = CreateTrackCutsPWGJE(10001008);
+  AliESDtrackCuts* esdTrackCutsHG0 = CreateTrackCutsPWGJE(10001006);
   
   // throw out tracks with too low number of clusters in
   // the first pass (be consistent with TPC only tracks)
@@ -172,16 +172,16 @@ Bool_t AddTrackCutsLHC10h(AliAnalysisTaskESDfilter* esdfilter){
   
   
   // the complement to the one with SPD requirement
-  AliESDtrackCuts* esdTrackCutsHG1 = CreateTrackCutsPWGJE(10011008);
+  AliESDtrackCuts* esdTrackCutsHG1 = CreateTrackCutsPWGJE(10011006);
   
   // the tracks that must not be taken pass this cut and
   // non HGC1 and HG
-  AliESDtrackCuts* esdTrackCutsHG2 = CreateTrackCutsPWGJE(10021008);
+  AliESDtrackCuts* esdTrackCutsHG2 = CreateTrackCutsPWGJE(10021006);
   
   // standard cuts also used in R_AA analysis
   AliESDtrackCuts* esdTrackCutsH2 = CreateTrackCutsPWGJE(1000);
 
-  AliESDtrackCuts* esdTrackCutsGCOnly = CreateTrackCutsPWGJE(10041008);
+  AliESDtrackCuts* esdTrackCutsGCOnly = CreateTrackCutsPWGJE(10041006);
   
   // TPC only tracks
   AliESDtrackCuts* esdTrackCutsTPCCOnly = AliESDtrackCuts::GetStandardTPCOnlyTrackCuts();

diff --git a/PWGJE/macros/AddTaskJetCluster.C b/PWGJE/macros/AddTaskJetCluster.C
index 32da0246c64891f079ff4494fdbc3ce2f9592974..f25a82a2c2928a4ec0dd70ee0f2b0b323cd34f5b 100644 (file)
--- a/PWGJE/macros/AddTaskJetCluster.C
+++ b/PWGJE/macros/AddTaskJetCluster.C
@@ -57,7 +57,7 @@ AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filte
     TString type = mgr->GetInputEventHandler()->GetDataType();
     TString typeRec(bRec);
     TString typeGen(bGen);
-    if(!typeRec.Contains("AODextra")) {
+    if(!typeRec.Contains("AODextra") || !typeRec.Contains("AODMCextra")) {
       typeGen.ToUpper();
       typeRec.ToUpper();
     }

diff --git a/PWGJE/macros/AddTaskJetResponseV2.C b/PWGJE/macros/AddTaskJetResponseV2.C
index 84b5fad43e6f20fd1733cfb4f8e3d1f7092e68e5..997dd24cc1a97b1790c942b813055fbe305499e6 100644 (file)
--- a/PWGJE/macros/AddTaskJetResponseV2.C
+++ b/PWGJE/macros/AddTaskJetResponseV2.C
@@ -7,7 +7,7 @@ AliAnalysisTaskJetResponseV2* AddTaskJetResponseV2(Char_t* type = "clusters", Ch
 }
 
 
-AliAnalysisTaskJetResponseV2* AddTaskJetResponseV2(Bool_t emb = kTRUE, Char_t* type = "clusters", Char_t* jf = "FASTKT", Float_t radius = 0.4, UInt_t filterMask = 256 , Float_t ptTrackMin = 0.15, Int_t iBack = 1, Int_t eventClassMin = 0, Int_t eventClassMax = 4){
+AliAnalysisTaskJetResponseV2* AddTaskJetResponseV2(Bool_t emb = kTRUE, Char_t* type = "clusters", Char_t* jf = "FASTKT", Float_t radius = 0.4, UInt_t filterMask = 256 , Float_t ptTrackMin = 0.15, Int_t iBack = 1, Int_t eventClassMin = 0, Int_t eventClassMax = 4, Char_t *recType = "AOD"){
 
    Printf("adding task jet response\n");
 
@@ -44,8 +44,8 @@ AliAnalysisTaskJetResponseV2* AddTaskJetResponseV2(Bool_t emb = kTRUE, Char_t* t
       suffix2 += Form("_Cut%05d", (int)((1000.*ptTrackMin)));
       if(type=="clusters") suffix2 += Form("_Skip00");
       
-      branch1 = Form("%sAODextraonly%s",type, suffix.Data());
-      branch2 = Form("%sAODextra%s",type, suffix2.Data());
+      branch1 = Form("%s%sextraonly%s",type, recType, suffix.Data());
+      branch2 = Form("%s%sextra%s",type, recType, suffix2.Data());
       
    } else {
       
@@ -134,7 +134,7 @@ AliAnalysisTaskJetResponseV2* AddTaskJetResponseV2(TString branch1 = "", TString
    
    Printf("Branch1: %s",branch1.Data());
    Printf("Branch2: %s",branch2.Data());
-   Printf("Branch2: %s",branch3.Data());
+   Printf("Branch3: %s",branch3.Data());
 
    task->SetBranchNames(branch1,branch2,branch3);
    task->SetOfflineTrgMask(AliVEvent::kMB);