Bug in previous version (trigCode never delivered) W. Koenig

diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index e59dcd5ea66dbe8301f8fd95bd248e0ab75178e7..a7ef3a6c5a7f4b151c2e030ed69ef262498c7112 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.28 2002-05-27 21:25:29 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.29 2002-05-28 15:58:36 hadaq Exp $";
 /* modified MU readout producing a dense pack of 16 Bit words. 15-March-2002, W. Koenig */
 
 #define _POSIX_C_SOURCE 199309L
@@ -216,6 +216,7 @@ int readoutTrig(Hardware *my, void *subEvt)
 #ifndef NDEBUG
        syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt));
 #endif
+       /* return trigger code = first MU data word */
        return  *(uint16_t *)header;
 }
 
@@ -224,7 +225,7 @@ void Hardware_readout(Hardware *my, void *partEvt)
        void *subEvt = SubEvt_data(partEvt);
        static unsigned long trigNr = 0;
        uint8_t trigTag;
-       uint8_t trigCode;
+       int trigCode;
        int i;
 
        SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
@@ -233,8 +234,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
 * read out MU
 */
 
-       trigTag = readoutTrig(my, subEvt);
+       trigCode = readoutTrig(my, subEvt);
 
+       SubEvt_setId(partEvt, trigCode);
        trigTag = SubEvt_trigNr(subEvt) & 0xff;
        subEvt = SubEvt_next(partEvt, subEvt);
 
@@ -260,7 +262,6 @@ void Hardware_readout(Hardware *my, void *partEvt)
 #endif
 
        SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
-       SubEvt_setId(partEvt, trigCode);
        SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag);
        trigNr++;