eventbuilder: changed effective trigger number mask to 16 bit.

Workaround for different counter overflows in trb2 and trb3 data.

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 8bab3405bf93cf0599d79fb41733a16ff1c8856f..a4617d5fd2fb3ba696a120835563e7ce7d34be6f 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1279,7 +1279,8 @@ int main(int argc, char *argv[])
                        }
 
                        if (i == 0) {
-                               currTrigNr = SubEvt_trigNr(subEvt) >> 8;
+                               currTrigNr = (SubEvt_trigNr(subEvt) >> 8) & 0xffff;
+                                       /* JAM: use only 16 bit as workaround for TRB2/3 differences*/
                                currTrigTag = SubEvt_trigNr(subEvt) & 0xff;
 
                                if (theArgs->evtId != 0)
@@ -1312,7 +1313,9 @@ int main(int argc, char *argv[])
 
                        }
 
-                       trigNr = SubEvt_trigNr(subEvt) >> 8;
+                       trigNr = (SubEvt_trigNr(subEvt) >> 8) & 0xffff;
+                                                               /* JAM: use only 16 bit as workaround for TRB2/3 differences*/
+
                        trigTag = SubEvt_trigNr(subEvt) & 0xff;
 #ifdef TRIGNO_DEBUG
                        if (trigdbgCnt[i]++ < 10) {