proper IDs for start & stop events

diff --git a/hadaq/evt.h b/hadaq/evt.h
index 8202ce15ffd32aab68ede03915c0432e8986bdf4..e5d9f922690ddeff8491270985f1b9632d471439 100644 (file)
--- a/hadaq/evt.h
+++ b/hadaq/evt.h
@@ -12,7 +12,8 @@ static const int evtBlockSize = 8 * 1024;
 
 enum EvtId {
   EvtId_data,
-  EvtId_runStart
+  EvtId_runStart = 0x00010002,
+  EvtId_runStop = 0x00010003
 };
 
 enum EvtDecoding {

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index f0cd4592bac00ef88536d6ab4f305be512b250b1..29b97498e16b69c2e3e590b0a0dd6dd2729eb037 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.3 1999-09-01 12:03:06 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.4 1999-09-06 07:33:14 hades Exp $";
 
 #define _XOPEN_SOURCE
 #include <unistd.h>
@@ -39,7 +39,7 @@ static void *appendFile(void *my, const char *path)
                msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno));
                return my;
        }
-       subEvt = newSubEvt(SubEvtDecoding_text, SubEvtId_slow, 0);
+       subEvt = newSubEvt(SubEvtDecoding_text, SubEvtId_slowTest, 0);
 
        if (NULL == (dataBuf = malloc(strlen(path + 2)))) {
                msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno));
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
        }
        Worker_dump(worker, 0);
 
-       evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStart, runNr);
+       evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStop, runNr);
        for (i = 0; i < slowCtrlFileCnt; i++) {
                evt = appendFile(evt, slowCtrlFiles[i]);
        }

diff --git a/hadaq/subevt.h b/hadaq/subevt.h
index 6b315fedf4648809d54af20feef2e0add399ff4d..67d4a57ac25227c1bdcb932971825fb2a82e86d0 100644 (file)
--- a/hadaq/subevt.h
+++ b/hadaq/subevt.h
@@ -18,7 +18,8 @@ enum SubEvtId {
   SubEvtId_richPed = 12,
        SubEvtId_tofTest = 400,
   SubEvtId_trigCode = 500,
-  SubEvtId_trigInfo = 501
+  SubEvtId_trigInfo = 501,
+  SubEvtId_slowTest = 600
 };
 
 enum SubEvtDecoding {