Check trigger tag only if there is no error -- mm

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index 9d861964d5be1168b13f32ed290f449ecc4c287a..ba8b0ac19ee092fde6d86b5ab562db794d6a5ee5 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.34 2002-10-29 17:43:48 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.35 2002-11-18 18:39:40 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -131,15 +131,16 @@ void Hardware_readout(Hardware *my, void *partEvt)
                if (HwRace_readSubEvt(my->race[i], subEvt) == 0) {
                        if (SubEvt_dataError(subEvt)) {
                                dataError = 1;
-                       }
-                       if (firstRace < 0) {
-                               trigTag = SubEvt_trigNr(subEvt) & 0xff;
-                               firstRace = i;
                        } else {
-                               if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-                                       dataError = 1;
-                                       syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
-                                                  my->race[i]->name, trigTag, firstRace, SubEvt_trigNr(subEvt));
+                               if (firstRace < 0) {
+                                       trigTag = SubEvt_trigNr(subEvt) & 0xff;
+                                       firstRace = i;
+                               } else {
+                                       if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
+                                               dataError = 1;
+                                               syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x",
+                                                          my->race[i]->name, trigTag, firstRace, SubEvt_trigNr(subEvt));
+                                       }
                                }
                        }
                        subEvt = SubEvt_next(partEvt, subEvt);
@@ -151,6 +152,7 @@ void Hardware_readout(Hardware *my, void *partEvt)
        }
        SubEvt_setTrigNr(partEvt, trigNr << 8 | trigTag);
        SubEvt_setSize(partEvt, (char *) subEvt - (char *) partEvt);
+
        trigNr++;
 
        assert(SubEvt_size(partEvt) <= my->maxSubEvtSize);