From: Jörn Adamczewski-Musch <j.adamczewski@gsi.de>
Date: Mon, 3 Mar 2014 10:19:20 +0000 (+0100)
Subject: eventbuilder: changed effective trigger number mask to 16 bit.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=cbbf92fbcd50e538ff5ed4dd7bd3e740d642b2ca;p=daqdata.git

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 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) {