TRDtriggerCheck: reduce verbosity and write to common output file

diff --git a/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.cxx b/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.cxx
index cda03171d9ef7a97f9f1518fc887e360049369a0..b0f78aa5a42daea9d66e0cb3f2bb8151f1855123 100644 (file)
--- a/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.cxx
+++ b/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.cxx
@@ -139,15 +139,15 @@ void AliAnalysisTaskTRDtriggerCheck::UserExec(Option_t * /* option */)
   if ((fDebug > 0) && esdEvent)
     printf("event: %s-%06i\n", CurrentFileName(), esdEvent->GetEventNumberInFile());
 
-  printf("event: %s-%06i\n", CurrentFileName(), esdEvent->GetEventNumberInFile());
   if (!InputEvent()->GetFiredTriggerClasses().Contains("WU")) {
-    printf("no TRD, returning\n");
+    if (fDebug > 0)
+      printf("no TRD, returning\n");
     return;
   }
 
   // reproduce hardware decision
   AliTRDTriggerAnalysis trgAnalysis;
-  trgAnalysis.SetVerbosity(1);
+  // trgAnalysis.SetVerbosity(1);
   trgAnalysis.SetRequireInTime(kTRUE);
   trgAnalysis.SetRequireMatchElectron(kFALSE);
   trgAnalysis.CalcTriggers(InputEvent());
@@ -161,11 +161,12 @@ void AliAnalysisTaskTRDtriggerCheck::UserExec(Option_t * /* option */)
   Int_t nTracks = InputEvent()->GetNumberOfTrdTracks();
   for (Int_t iTrack = 0; iTrack < nTracks; ++iTrack) {
     AliVTrdTrack *trk = InputEvent()->GetTrdTrack(iTrack);
-    printf("trk %2i: %02i_%i - pt = %6.2f, PID = %3i, %10s, %10s\n",
-          iTrack, trk->GetSector(), trk->GetStack(),
-          trk->Pt(), trk->GetPID(),
-          trk->GetTrackInTime() ? "in-time" : "not in-time",
-          trk->GetTrackMatch() ? "matched" : "not matched");
+    if (fDebug > 0)
+      printf("trk %2i: %02i_%i - pt = %6.2f, PID = %3i, %10s, %11s\n",
+            iTrack, trk->GetSector(), trk->GetStack(),
+            trk->Pt(), trk->GetPID(),
+            trk->GetTrackInTime() ? "in-time" : "not in-time",
+            trk->GetTrackMatch() ? "matched" : "not matched");
   }
 
   const Int_t trgBits[] = { 0, 4, 5, 6, 1, 7 };
@@ -178,10 +179,11 @@ void AliAnalysisTaskTRDtriggerCheck::UserExec(Option_t * /* option */)
     Bool_t trgd  = trgAnalysis.HasTriggered((AliTRDTriggerAnalysis::TRDTrigger_t) iTrg);
     Bool_t fired = trgAnalysis.HasFired((AliTRDTriggerAnalysis::TRDTrigger_t) iTrg);
     Bool_t cond  = trgAnalysis.CheckCondition((AliTRDTriggerAnalysis::TRDTrigger_t) iTrg);
-    printf("trigger %i: %10s %10s %10s\n", iTrg,
-          trgd ? "triggered" : "",
-          fired ? "fired" : "",
-          cond ? "condition" : "");
+    if (fDebug > 0)
+      printf("trigger %i: %10s %10s %10s\n", iTrg,
+            trgd ? "triggered" : "",
+            fired ? "fired" : "",
+            cond ? "condition" : "");
 
     if (trgd && fired && cond)
       FillH2(kHistTrgStat, iTrg, kTriggeredFiredCondition);

diff --git a/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.h b/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.h
index fe053fa7d242ec127ba73ea9477475b1068e7e76..3112c031c8fd92fdaa5db7f1911d613133e65b2e 100644 (file)
--- a/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.h
+++ b/PWG/TRD/AliAnalysisTaskTRDtriggerCheck.h
@@ -55,14 +55,16 @@ public:
   };
 
   enum Comb_t {
+    // ok
     kNothing = 1,
+    kFiredCondition,
+    kTriggeredFiredCondition,
+    // not ok
     kTriggered,
     kFired,
     kCondition,
     kTriggeredFired,
     kTriggeredCondition,
-    kFiredCondition,
-    kTriggeredFiredCondition,
     kLastComb
   };
 

diff --git a/PWG/TRD/macros/AddTaskTRDtriggerCheck.C b/PWG/TRD/macros/AddTaskTRDtriggerCheck.C
index 02a212b74e9c84ee26cfc9236792a598f4f645a6..2ac8dd252627dbced5259f198070e4d8afad9747 100644 (file)
--- a/PWG/TRD/macros/AddTaskTRDtriggerCheck.C
+++ b/PWG/TRD/macros/AddTaskTRDtriggerCheck.C
@@ -1,4 +1,4 @@
-AliAnalysisTask* AddTaskTRDtriggerCheck()
+AliAnalysisTask* AddTaskTRDtriggerCheck(const char *name = "trd_trgcheck")
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -7,21 +7,26 @@ AliAnalysisTask* AddTaskTRDtriggerCheck()
   }
 
   AliAnalysisTaskTRDtriggerCheck *task = new AliAnalysisTaskTRDtriggerCheck("TRDtriggerCheck");
+  // task->SetDebugLevel(2);
   mgr->AddTask(task);
 
   AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();
   AliAnalysisDataContainer *coutput = mgr->GetCommonOutputContainer();
 
-  AliAnalysisDataContainer *ctrklqa =
-    mgr->CreateContainer("TRDtriggerCheck", TList::Class(),
-                         AliAnalysisManager::kOutputContainer,
-                        "trg_check.root");
+  AliAnalysisDataContainer *chist =
+    mgr->CreateContainer(Form("hist_%s", name), TList::Class(), AliAnalysisManager::kOutputContainer,
+                         Form("%s:PWGTRD_trgcheck", AliAnalysisManager::GetCommonFileName()));
+
+  if (!chist) {
+    ::Error("AddTaskTRDtriggerCheck", "no output container created");
+    return 0x0;
+  }
 
   mgr->ConnectInput(task, 0, cinput);
 
   if (coutput)
     mgr->ConnectOutput(task, 0, coutput);
-  mgr->ConnectOutput(task, 1, ctrklqa);
+  mgr->ConnectOutput(task, 1, chist);
 
   return task;
 }