IMPORTANT: A trigger tag mismatch triggered a error report, but was not

marked in the data stream.  Changed, untested.

diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c
index fd3e9c71a29b50757dd31ad7100e86ee7d83c8ad..d716e418d9db76b62b84c38e43d44217259230e5 100644 (file)
--- a/hadaq/hwmdc.c
+++ b/hadaq/hwmdc.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.15 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.16 2001-11-18 13:10:34 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -9,6 +9,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <stdio.h>
 #include <string.h> 
 #include <sys/time.h>
+#include <syslog.h>
 
 #include <allParam.h>
 #include "subevt.h"
@@ -125,6 +126,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                        trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
                        if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
+                               SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
+                               SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
                                syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x",
                                        my->sam[i]->name,trigTag, SubEvt_trigNr(subEvt));
                        }

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index e33bf3ef5a02e104e8fe74a78e69a4f18f891b8a..8b79e091e47273d2276fa798874ddf0c5b4ff4cd 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.20 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.21 2001-11-18 13:10:35 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -9,6 +9,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <syslog.h>
 
 #include <allParam.h>
 #include "subevt.h"
@@ -115,6 +116,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                        trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
                        if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
+                               SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
+                               SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
                                syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x",
                                        my->race[i]->name,trigTag, SubEvt_trigNr(subEvt));
                        }

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 595efce458a7d0e84eb5ab08370d3e405f8d0553..0d7498c37d07111d20fd6a4cb1b1c32c416df344 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.19 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.20 2001-11-18 13:10:35 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -9,6 +9,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <stdio.h>
 #include <string.h> 
 #include <sys/time.h>
+#include <syslog.h>
 
 #include <allParam.h>
 #include "subevt.h"
@@ -121,6 +122,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
                        trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
                        if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
+                               SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
+                               SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
                                syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x",
                                        my->ship[i]->name,trigTag, SubEvt_trigNr(subEvt));
                        }

diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index ffe068fe8bf3b6d24a3023961f24c2fc7e2366ae..7c7d492f6851c6e269058b7da4725133af4ca46f 100644 (file)
--- a/hadaq/hwtrig.c
+++ b/hadaq/hwtrig.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.21 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.22 2001-11-18 13:10:35 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -6,6 +6,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <assert.h>
 #include <errno.h>
 #include <sys/time.h>
+#include <syslog.h>
 
 #include <allParam.h>
 #include <lvme.h>
@@ -231,7 +232,8 @@ void Hardware_readout(Hardware *my, void *partEvt)
        for (i = 0; i < NCRATES; i++) {
                HwTip_readSubEvt(my->tip, subEvt);
                if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                       SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000);
+                       SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000UL);
+                       SubEvt_setId(partEvt, SubEvt_id(partEvt) | 0x80000000UL);
                        syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x",
                                my->tip->name, trigTag, SubEvt_trigNr(subEvt));
                }