From 090eb7eadcd13988fb92f6ddbdaaea3995c1195a Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 19 Jul 2010 14:29:31 +0000 Subject: [PATCH] DAQ version 2 has been put into event header. Sergey. --- hadaq/evtbuild.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 5299947..bbffaa9 100644 --- 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.120 2010-07-07 08:50:19 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.121 2010-07-19 14:29:31 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L #define SYSLOG_NAMES @@ -44,6 +44,7 @@ static RFILE *fRemote = NULL; #define MAXINPATH 100 +#define DAQVERSION 2 /* needed by Hydra unpackers */ #define NEVTIDS 64UL /* must be 2^n */ #define NEVTIDS_IN_FILE 0UL /* must be 2^n */ #define EVENT_NUM_OFFSET 100 @@ -2220,6 +2221,7 @@ int main(int argc, char *argv[]) } } + evt = newEvt(EvtDecoding_64bitAligned, EvtId_data); for (i = 0; i < theArgs->nrOfMsgs && !evtIsBroken; i += step) { @@ -2256,6 +2258,8 @@ int main(int argc, char *argv[]) } else currId = SubEvt_pureId(subEvt); + currId = currId | (DAQVERSION << 12); + syslog(LOG_DEBUG, "currTrigNr: 0x%06x, currTrigTag 0x%02x, currId 0x%08x", currTrigNr, currTrigTag, currId); } -- 2.43.0