fixing of warnings and adding a custom NSD trigger

[u/mrichter/AliRoot.git] / RAW / AliRawReaderDateOnline.cxx

diff --git a/RAW/AliRawReaderDateOnline.cxx b/RAW/AliRawReaderDateOnline.cxx
index 49bcee5a72da3c32e663b7656d81546597d26d2f..40b8319307c17fee050066b87bb399dab1530dc5 100644 (file)
--- a/RAW/AliRawReaderDateOnline.cxx
+++ b/RAW/AliRawReaderDateOnline.cxx
@@ -27,6 +27,7 @@
 ///
 /// Cvetan Cheshkov 1/04/2008
 ///////////////////////////////////////////////////////////////////////////////
+#include <TSystem.h>
 
 #include "AliRawReaderDateOnline.h"
 #include "AliLog.h"
@@ -44,7 +45,8 @@ AliRawReaderDateOnline::AliRawReaderDateOnline(
                                   const char* /* filename */
 #endif
                                   ) :
-  AliRawReaderDate((void*)NULL)
+  AliRawReaderDate((void*)NULL),
+  fStop(kFALSE)
 {
 
 // Constructor
@@ -74,7 +76,15 @@ AliRawReaderDateOnline::AliRawReaderDateOnline(
   /* define wait event timeout - 1s max */
   monitorSetNowait();
   monitorSetNoWaitNetworkTimeout(1000);
-  
+
+  const Char_t* table[]  = {"ALL", "few", "*", "*",
+                            "EOR", "yes","*", "*",
+                            NULL, NULL, NULL, NULL};
+  monitorDeclareTableExtended(const_cast<char**>(table));
+
+  // install SIGUSR1 handler to allow clean end-of-events loop
+  gSystem->AddSignalHandler(new AliRawReaderDateIntHandler(this));
+
 #else
   Fatal("AliRawReaderDateOnline", "this class was compiled without DATE");
 #endif
@@ -87,6 +97,14 @@ Bool_t AliRawReaderDateOnline::NextEvent()
 
 #ifdef ALI_DATE
 
+  // Stop on SIGUSR1
+  if (fStop) {
+    AliInfo("Raw-data reading stopped by SIGUSR1");
+    if (fEvent) free(fEvent);
+    fEvent = NULL;
+    return kFALSE;
+  }
+
   // Event already loaded no need take a new one
   if (AliRawReaderDate::NextEvent()) return kTRUE;
 
@@ -128,6 +146,7 @@ Bool_t AliRawReaderDateOnline::NextEvent()
     
     if (!IsEventSelected()) {
       free(fEvent);
+      fEvent = NULL;
       continue;
     }
 
@@ -162,3 +181,38 @@ AliRawReaderDateOnline::~AliRawReaderDateOnline()
   if (fEvent) free(fEvent);
 #endif
 }
+
+void AliRawReaderDateOnline::SelectEvents(Int_t type,
+  ULong64_t triggerMask,
+  const char *triggerExpr)
+{
+  // Select event by using DATE monitoring
+  // library
+#ifdef ALI_DATE
+  const Char_t* table[]  = {"ALL", "no", "*", "*",
+                           "PHY", "yes","*", "*",
+                            "EOR", "yes","*", "*",
+                           NULL, NULL, NULL, NULL};
+  TString trSelection;
+  for (Int_t i = 0; i < 50; i++) {
+    if (triggerMask & (1ull << i)) {
+       if (!trSelection.IsNull()) trSelection += "&";
+       trSelection += Form("%d",i+1);
+    }
+  }
+  table[7] = trSelection.Data();
+
+  monitorLogout();
+  monitorDeclareTableExtended(const_cast<char**>(table));
+  
+#endif
+  AliRawReader::SelectEvents(type,triggerMask,triggerExpr);
+}
+
+//______________________________________________________________________________
+void AliRawReaderDateOnline::Stop()
+{
+  // Stop the event loop (called on SIGUSR1)
+
+  fStop = kTRUE; 
+}