From: hades Date: Wed, 11 Apr 2001 10:56:05 +0000 (+0000) Subject: Transport trigger code via sub event id of crate event X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0259417d07bbe9837dd9d31be1140efbf4dd5a9f;p=daqdata.git Transport trigger code via sub event id of crate event --- diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c index b3ff674..a21c228 100644 --- a/hadaq/hwtrig.c +++ b/hadaq/hwtrig.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.11 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.12 2001-04-11 10:56:05 hades Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -153,15 +153,17 @@ void Hardware_readout(Hardware *my, void *partEvt) void *subEvt = SubEvt_data(partEvt); static unsigned long trigNr = 0; UInt1 trigTag; + UInt1 trigCode; SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); readoutTrig(my, subEvt); trigTag = SubEvt_trigNr(subEvt); + trigCode = SubEvt_dataValue(subEvt, 0); subEvt = SubEvt_next(partEvt, subEvt); SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt); - SubEvt_setId(partEvt, 0); + SubEvt_setId(partEvt, trigCode); SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag); trigNr++; #ifndef NDEBUG