add filter bit to output name if it is not the default one

diff --git a/PWG4/macros/AddTaskJets.C b/PWG4/macros/AddTaskJets.C
index 42b4dbe7efc9fbae05672288a3a025067c6f2124..b2436e6d2e04b824c081de5cf79e18a15d8d8fbb 100644 (file)
--- a/PWG4/macros/AddTaskJets.C
+++ b/PWG4/macros/AddTaskJets.C
@@ -134,7 +134,15 @@ AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius,UInt_t f
 \r
    jetana = new AliAnalysisTaskJets(Form("JetAnalysis%s_%s%s",jr,jf,cRadius));\r
 \r
 \r
    jetana = new AliAnalysisTaskJets(Form("JetAnalysis%s_%s%s",jr,jf,cRadius));\r
 \r

-\r
+   TString cAdd = "";\r
+   if(filterMask==16){\r
+     // this is the standard mask do not add anything\r
+     // should be changed after current train over all data is finished \r
+     // now needed for merging\r
+   }\r
+   else{\r
+     cAdd += Form("_Filter%05d",filterMask);\r
+   }\r

 \r
    TString c_jr(jr);\r
    c_jr.ToLower();\r
 \r
    TString c_jr(jr);\r
    c_jr.ToLower();\r


@@ -145,17 +153,24 @@ AliAnalysisTaskJets *AddTaskJets(Char_t *jr, Char_t *jf, Float_t radius,UInt_t f
      // do nothing, this is the standard jet finder R = 0.4, UA1 on AOD\r
    }\r
    else{\r
      // do nothing, this is the standard jet finder R = 0.4, UA1 on AOD\r
    }\r
    else{\r

-     jetana->SetNonStdBranch(Form("jets%s_%s%s",jr,jf,cRadius));\r
+     jetana->SetNonStdBranch(Form("jets%s_%s%s%s",jr,jf,cRadius,cAdd.Data()));\r

    }\r
 \r
 \r
    }\r
 \r
 \r

-   AliAnalysisDataContainer *cout_jet = mgr->CreateContainer(Form("jethist_%s_%s%s",c_jr.Data(),c_jf.Data(),cRadius), TList::Class(),\r
-                                                            AliAnalysisManager::kOutputContainer, Form("%s:PWG4_jethist_%s_%s%s",AliAnalysisManager::GetCommonFileName(),\r
-                                                            c_jr.Data(),c_jf.Data(),cRadius));\r
-   /*\r
-   AliAnalysisDataContainer *cout_jet = mgr->CreateContainer(Form("jethist_%s_%s%s",c_jr.Data(),c_jf.Data(),cRadius), TList::Class(),\r
-                                                            AliAnalysisManager::kOutputContainer,"ckb_test.root");\r
-   */\r
+   AliAnalysisDataContainer *cout_jet = mgr->CreateContainer(\r
+                                                            Form("jethist_%s_%s%s%s",\r
+                                                                 c_jr.Data(),\r
+                                                                 c_jf.Data(),\r
+                                                                 cRadius,\r
+                                                                 cAdd.Data()), \r
+                                                            TList::Class(),\r
+                                                            AliAnalysisManager::kOutputContainer, \r
+                                                            Form("%s:PWG4_jethist_%s_%s%s",AliAnalysisManager::GetCommonFileName(),\r
+                                                                 c_jr.Data(),\r
+                                                                 c_jf.Data(),\r
+                                                                 cRadius,\r
+                                                                 cAdd.Data()));\r
+\r

    // Connect jet finder to task.\r
    jetana->SetJetFinder(jetFinder);\r
    jetana->SetConfigFile("");\r
    // Connect jet finder to task.\r
    jetana->SetJetFinder(jetFinder);\r
    jetana->SetConfigFile("");\r