BUGFIXES -- mm

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 2bab2f86b567c3d2bc65d98b1934e733014ccc6c..66ef9a95b11f1fdf94f354dc8462fe9a533b3d7c 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.47 2002-10-23 15:10:03 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.48 2002-10-23 15:24:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
 
                        if (i == 0) {
                                currTrigNr = SubEvt_trigNr(subEvt) >> 8;
-                               currId = SubEvt_id(subEvt);
+                               currId = SubEvt_pureId(subEvt);
                                Evt_setId(evt, currId);
 #ifndef NDEBUG
                        syslog(LOG_DEBUG,

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index 0d7e4f54b2fb0fa3cbb7e4a08a88371ad5ffee35..dd6007421b092ce751ceb7e2b49b94fc5f0f30b3 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.24 2002-10-23 14:56:47 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.25 2002-10-23 15:24:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -142,13 +142,13 @@ void Hardware_readout(Hardware *my, void *partEvt)
        static uint32_t trigNr;
        static uint8_t trigTag;
        uint8_t trigCode;
+       int err = 0;
 
        SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
-       SubEvt_setId(partEvt, trigCode);
 
        readoutTrig(subEvt);
        if (SubEvt_dataError(subEvt)) {
-               SubEvt_setDataError(partEvt);
+               err = 1;
        }
        if (trigTag > SubEvt_trigNr(subEvt)) {
                trigNr++;
@@ -159,10 +159,14 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
        readoutSoft(subEvt);
        if (SubEvt_dataError(subEvt)) {
-               SubEvt_setDataError(partEvt);
+               err = 1;
        }
        subEvt = SubEvt_next(partEvt, subEvt);
 
+       SubEvt_setId(partEvt, trigCode);
+       if (err) {
+               SubEvt_setDataError(partEvt);
+       }
        SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
        SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag);
        syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt));