From 52df7a3bd727998faad9fee3b88c56e06b331987 Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Sun, 18 Nov 2001 13:10:34 +0000
Subject: [PATCH] IMPORTANT:  A trigger tag mismatch triggered a error report,
 but was not marked in the data stream.  Changed, untested.

---
 hadaq/hwmdc.c  | 5 ++++-
 hadaq/hwrich.c | 5 ++++-
 hadaq/hwshow.c | 5 ++++-
 hadaq/hwtrig.c | 6 ++++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c
index fd3e9c7..d716e41 100644
--- 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 e33bf3e..8b79e09 100644
--- 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 595efce..0d7498c 100644
--- 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 ffe068f..7c7d492 100644
--- 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));
 		}
-- 
2.43.0