From cbbf92fbcd50e538ff5ed4dd7bd3e740d642b2ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Adamczewski-Musch?= Date: Mon, 3 Mar 2014 11:19:20 +0100 Subject: [PATCH] eventbuilder: changed effective trigger number mask to 16 bit. Workaround for different counter overflows in trb2 and trb3 data. --- hadaq/evtbuild.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 8bab340..a4617d5 100644 --- 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) { -- 2.43.0