mergeCustom.C mergeStage0.sh - adding macros for separate merging

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

diff --git a/RAW/AliRawReaderDateOnline.cxx b/RAW/AliRawReaderDateOnline.cxx
index 242b230020cbbdba2e283dff48047971b3be54a9..72662e39297bf152de5ea4762f5be625df941379 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
@@ -75,11 +77,14 @@ AliRawReaderDateOnline::AliRawReaderDateOnline(
   monitorSetNowait();
   monitorSetNoWaitNetworkTimeout(1000);
 
-  const Char_t* table[]  = {"ALL", "yes", "*", "*",
-                            "EOR", "all","*", "*",
+  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
@@ -92,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;
 
@@ -133,6 +146,7 @@ Bool_t AliRawReaderDateOnline::NextEvent()
     
     if (!IsEventSelected()) {
       free(fEvent);
+      fEvent = NULL;
       continue;
     }
 
@@ -177,19 +191,28 @@ void AliRawReaderDateOnline::SelectEvents(Int_t type,
 #ifdef ALI_DATE
   const Char_t* table[]  = {"ALL", "no", "*", "*",
                            "PHY", "yes","*", "*",
-                            "EOR", "all","*", "*",
+                            "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);
+       trSelection += Form("%d",i);
     }
   }
   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; 
+}