NOSIG -- mm

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index ab783b19e1ee97b89ef41daa69e3c3a779925501..6db6e8fc331184bba95eb70a24c16e4f3f854ff4 100644 (file)
--- a/hadaq/hwrich.c
+++ b/hadaq/hwrich.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.29 2002-10-16 11:38:49 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.30 2002-10-23 12:35:23 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -117,8 +117,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
        int i;
        int firstRace = -1;
        void *subEvt = SubEvt_data(partEvt);
-       static uint32_t trigNr = 0;
-       uint32_t trigTag;
+       static unsigned long trigNr = 0;
+       unsigned trigTag;
 
        /* init partial event, necessary for  SubEvt_next() */
        SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
@@ -132,8 +132,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                                firstRace = i;
                        } else {
                                if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                                       SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
-                                       SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
+                                       SubEvt_setDataErr(subEvt);
+                                       SubEvt_setDataErr(partEvt);
                                        syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
                                                   my->race[i]->name, trigTag, firstRace, SubEvt_trigNr(subEvt));
                                }

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 3e9a69cab6680cc946a63803c23e055e047007ce..7447288631af1db1614878de620a22f5aa5fc936 100644 (file)
--- a/hadaq/hwshow.c
+++ b/hadaq/hwshow.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.25 2002-10-15 16:27:25 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.26 2002-10-23 12:35:23 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -139,8 +139,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
        int i;
        int firstShip = -1;
        void *subEvt = SubEvt_data(partEvt);
-       static uint32_t trigNr = 0;
-       uint32_t trigTag;
+       static unsigned long trigNr = 0;
+       unsigned trigTag;
 
        /* init partial event, necessary for  SubEvt_next() */
        SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
@@ -154,8 +154,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                                firstShip = i;
                        } else {
                                if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                                       SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
-                                       SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
+                                       SubEvt_setDataErr(subEvt);
+                                       SubEvt_setDataErr(partEvt);
                                        syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
                                                   my->ship[i]->name, trigTag, firstShip, SubEvt_trigNr(subEvt));
                                }