added argument for setting of the filtermask for aodtracks

diff --git a/PWG4/macros/AddTaskJets.C b/PWG4/macros/AddTaskJets.C
index be56fce6b4a040ac7e6c947f76437f794f00aec5..f78bee39ea8798e1aace7d4915c2737de82245de 100644 (file)
--- a/PWG4/macros/AddTaskJets.C
+++ b/PWG4/macros/AddTaskJets.C
@@ -1,9 +1,11 @@
-AliJetReader *CreateJetReader(Char_t *jr); // Common config\r
+AliJetReader *CreateJetReader(Char_t *jr,UInt_t filterMask); // Common config\r
 AliJetFinder *CreateJetFinder(Char_t *jf,Float_t radius = -1);\r
 \r
-AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf,Float_t radius = -1); // for the new AF\r
+AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf,Float_t radius = -1,UInt_t filterMask = 0); // for the new AF\r
+Int_t AddTaskJetsDelta(char *nonStdFile = "",UInt_t filterMask = 0);\r
+AliAnalysisTaskJets *AddTaskJets(UInt_t filterMask = 0);\r
 \r
-AliAnalysisTaskJets *AddTaskJets(){\r
+AliAnalysisTaskJets *AddTaskJets(UInt_t filterMask ){\r
   // fills the standard "jets" branch in the AOD\r
   // need the ESDFilter to run before, to access the AODtracks\r
   // Tracks selected by the first Filter (1<<0)\r
@@ -15,13 +17,13 @@ AliAnalysisTaskJets *AddTaskJets(){
   // Acceptance of jets not limited by the Jet Finder but should be done\r
   // by user to abs(eta) < 0.5 \r
 \r
-  return AddTaskJets("AOD","UA1",0.4);\r
+  return AddTaskJets("AOD","UA1",0.4,filterMask);\r
 \r
 }\r
 \r
 \r
 \r
-Int_t AddTaskJetsDelta(char *nonStdFile = ""){\r
+Int_t AddTaskJetsDelta(char *nonStdFile,UInt_t filterMask){\r
 \r
   // Adds a whole set of jet finders  all to be written\r
   // to a delta AOD\r
@@ -65,13 +67,14 @@ Int_t AddTaskJetsDelta(char *nonStdFile = ""){
   const char *cReader[3] = {"AOD","AODMC","AODMC2"};  \r
 \r
   for(int i = 0; i< 7;i++){\r
+    if(i!=4)continue;\r
     for(int ib = 0;ib<3;ib++){\r
+      \r
       if(flag[i]&(1<<ib)){\r
-       jetana = AddTaskJets(cReader[ib],cJF[i],radius[i]);\r
+       jetana = AddTaskJets(cReader[ib],cJF[i],radius[i],filterMask);\r
        if(jetana){\r
          char *cRadius = "";\r
          if(radius[i]>0)cRadius = Form("%02d",(int)((radius[i]+0.01)*10.)); // add an offset beacuse of precision\r
-         Printf(cRadius);\r
          jetana->SetNonStdBranch(Form("jets%s_%s%s",cReader[ib],cJF[i],cRadius));\r
          if(outFile.Length()>0)jetana->SetNonStdOutputFile(outFile.Data());\r
          iCount++;\r
@@ -88,7 +91,7 @@ Int_t AddTaskJetsDelta(char *nonStdFile = ""){
 \r
 \r
 \r
-AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius)\r
+AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius,UInt_t filterMask)\r
 {\r
   // Creates a jet finder task, configures it and adds it to the analysis manager.\r
 \r
@@ -117,7 +120,7 @@ AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius)
    // Create the task and configure it.\r
    //===========================================================================\r
    AliAnalysisTaskJets *jetana;\r
-   AliJetReader *er = CreateJetReader(jr);\r
+   AliJetReader *er = CreateJetReader(jr,filterMask);\r
     // Define jet header and jet finder\r
    AliJetFinder *jetFinder = CreateJetFinder(jf,radius);\r
 \r
@@ -165,6 +168,8 @@ AliJetFinder *CreateJetFinder(Char_t *jf,Float_t radius){
     AliCdfJetHeader *jh = new AliCdfJetHeader();\r
     jh->SetRadius(0.7);\r
     if(radius>0)jh->SetRadius(radius);    \r
+    jh->SetAODwrite(kTRUE);\r
+    //    jh->SetDebugCDF(1);\r
     jetFinder = new AliCdfJetFinder();\r
     if (jh) jetFinder->SetJetHeader(jh);\r
     break;\r
@@ -277,7 +282,7 @@ AliJetFinder *CreateJetFinder(Char_t *jf,Float_t radius){
 \r
 }\r
 \r
-AliJetReader *CreateJetReader(Char_t *jr){\r
+AliJetReader *CreateJetReader(Char_t *jr,UInt_t filterMask){\r
   AliJetReader *er = 0;\r
 \r
   switch (jr) {\r
@@ -321,6 +326,7 @@ AliJetReader *CreateJetReader(Char_t *jr){
     jrh->SetComment("AOD Reader");\r
     jrh->SetPtCut(0.);\r
     jrh->SetTestFilterMask(16); // Change this one for a different set of cuts\r
+    if(filterMask>0)jrh->SetTestFilterMask(filterMask); \r
     // Define reader and set its header\r
     er = new AliJetAODReader();\r
     er->SetReaderHeader(jrh);\r