BUGFIX -- mm

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 6db6e8fc331184bba95eb70a24c16e4f3f854ff4..5a595a05103533944b3a918fda9bf81755d2193c 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.30 2002-10-23 12:35:23 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.31 2002-10-24 08:27:06 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -132,8 +132,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                                firstRace = i;
                        } else {
                                if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                                       SubEvt_setDataErr(subEvt);
-                                       SubEvt_setDataErr(partEvt);
+                                       SubEvt_setDataError(subEvt);
+                                       SubEvt_setDataError(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/hwship.c b/hadaq/hwship.c
index e16786851fcfbcc73d29909e36c2b7761ed6aa3d..ebb5ab01526e7537903c205d3a6e26f5fc039508 100644 (file)
--- a/hadaq/hwship.c
+++ b/hadaq/hwship.c
@@ -1,4 +1,6 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.27 2002-10-17 09:09:35 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.28 2002-10-24 08:25:34 hadaq Exp $";
+
+#undef SHIP_DEBUG
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -143,7 +145,7 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt)
        size = LVme_getL(my->lvme, my->currAddr);
        lastAddr = my->currAddr + size;
 
-#if 0
+#ifdef SHIP_DEBUG
        assert(size < sizeof(uint32_t) * 0x1600);       /* whereever the 0x1600 comes from */
 #else
        if (my->isDoomed) {

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 7447288631af1db1614878de620a22f5aa5fc936..c6bcace7c1ac1432524901d3442ef8750399cbad 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.26 2002-10-23 12:35:23 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.27 2002-10-24 08:25:35 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -154,8 +154,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                                firstShip = i;
                        } else {
                                if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                                       SubEvt_setDataErr(subEvt);
-                                       SubEvt_setDataErr(partEvt);
+                                       SubEvt_setDataError(subEvt);
+                                               SubEvt_setDataError(partEvt);
                                        syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
                                                   my->ship[i]->name, trigTag, firstShip, SubEvt_trigNr(subEvt));
                                }