Only upper 24 bit of trigger number used for EB.

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 95ea1ea372d973924bcad453ea6f55f81e481cba..051b12161ed7c29ba726758114108b569695466c 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.40 2002-03-20 14:54:01 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.41 2002-06-07 13:54:15 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199506L
@@ -514,6 +514,8 @@ int main(int argc, char *argv[])
                        if (theArgs->skipMsgs[currId] & (1 << i)) {
                                step = 1;
                        } else {
+                               uint32_t trigNr;
+                               
                                if (hadTuQueue[i] == NULL) {
                                        void *storage;
 
@@ -531,7 +533,7 @@ int main(int argc, char *argv[])
                                (*theStats->trigNr[i]) = SubEvt_trigNr(subEvt);
 
                                if (i == 0) {
-                                       currTrigNr = SubEvt_trigNr(subEvt);
+                                       currTrigNr = SubEvt_trigNr(subEvt) >> 8;
                                        currId = SubEvt_id(subEvt);
                                        Evt_setId(evt, currId);
 #ifndef NDEBUG
@@ -539,11 +541,13 @@ int main(int argc, char *argv[])
                                        "currTrigNr: 0x%08x, currId 0x%08x", currTrigNr, currId);
 #endif
                                }
-                               if (SubEvt_trigNr(subEvt) == currTrigNr) {
+
+                               trigNr = SubEvt_trigNr(subEvt) >> 8;
+                               if (trigNr == currTrigNr) {
                                        evt = Evt_appendSubEvt(evt, subEvt);
                                        HadTuQueue_pop(hadTuQueue[i]);
                                        step = 1;
-                               } else if (SubEvt_trigNr(subEvt) < currTrigNr) {
+                               } else if (trigNr < currTrigNr) {
                                        /* BUGBUG subevt discarded, not in statistic */
                                        HadTuQueue_pop(hadTuQueue[i]);
                                        step = 0;