BUGFIX trig tag is only 8bit in HADES

diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c
index 9cea4012d92a083b17ab788755a9b688da705ee2..c371003cfa67fab9b6f0e21ef4a5f463eb91e77f 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.11 2001-04-12 09:56:23 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.12 2001-04-12 12:33:19 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -121,9 +121,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
                HwSam_readSubEvt(my->sam[i], subEvt);
                if (i == 0) {
-                       trigTag = SubEvt_trigNr(subEvt);
+                       trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
-                       if (trigTag != SubEvt_trigNr(subEvt)) {
+                       if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
                                msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
                                        my->sam[i]->name,trigTag, SubEvt_trigNr(subEvt));
                        }

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 712caa54f772b17e9967645e4e590a841da92fe3..e5fe7828fa4f7967cd295d1c073153d9f950aab3 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.17 2001-04-12 09:56:24 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.18 2001-04-12 12:33:19 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -115,9 +115,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
        for (i = 0; i < NRACES; i++) {
                HwRace_readSubEvt(my->race[i], subEvt);
                if (i == 0) {
-                       trigTag = SubEvt_trigNr(subEvt);
+                       trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
-                       if (trigTag != SubEvt_trigNr(subEvt)) {
+                       if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
                                msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
                                        my->race[i]->name,trigTag, SubEvt_trigNr(subEvt));
                        }

diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index c8439a8665b71bcf17930879443ae2a158df0a3a..b8b4bfb23a27d0b1143fdbb8984cbf585776dfda 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.14 2001-04-12 08:39:28 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.15 2001-04-12 12:33:19 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -211,9 +211,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
        for (i = 0; i < NCRATES; i++) {
                HwTip_readSubEvt(my->tip, subEvt);
                if (i == 0) {
-                       trigTag = SubEvt_trigNr(subEvt);
+                       trigTag = SubEvt_trigNr(subEvt) & 0xff;
                } else {
-                       if (trigTag != SubEvt_trigNr(subEvt)) {
+                       if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
                                msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
                                        my->tip->name, trigTag, SubEvt_trigNr(subEvt));
                        }
@@ -227,7 +227,7 @@ void Hardware_readout(Hardware *my, void *partEvt)
 */
 
        readoutTrig(my, subEvt);
-       if (trigTag != SubEvt_trigNr(subEvt)) {
+       if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
                msglog(LOG_ERR, "(MU)Trigger tag mismatch: 0x%08x != 0x%08x\n",
                        trigTag, SubEvt_trigNr(subEvt));
        }