From: hades Date: Mon, 6 Sep 1999 07:33:14 +0000 (+0000) Subject: proper IDs for start & stop events X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ee46c8fc21d398dbc9e224adb40ce08485436d92;p=daqdata.git proper IDs for start & stop events --- diff --git a/hadaq/evt.h b/hadaq/evt.h index 8202ce1..e5d9f92 100644 --- a/hadaq/evt.h +++ b/hadaq/evt.h @@ -12,7 +12,8 @@ static const int evtBlockSize = 8 * 1024; enum EvtId { EvtId_data, - EvtId_runStart + EvtId_runStart = 0x00010002, + EvtId_runStop = 0x00010003 }; enum EvtDecoding { diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index f0cd459..29b9749 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.3 1999-09-01 12:03:06 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.4 1999-09-06 07:33:14 hades Exp $"; #define _XOPEN_SOURCE #include @@ -39,7 +39,7 @@ static void *appendFile(void *my, const char *path) msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); return my; } - subEvt = newSubEvt(SubEvtDecoding_text, SubEvtId_slow, 0); + subEvt = newSubEvt(SubEvtDecoding_text, SubEvtId_slowTest, 0); if (NULL == (dataBuf = malloc(strlen(path + 2)))) { msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) } Worker_dump(worker, 0); - evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStart, runNr); + evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStop, runNr); for (i = 0; i < slowCtrlFileCnt; i++) { evt = appendFile(evt, slowCtrlFiles[i]); } diff --git a/hadaq/subevt.h b/hadaq/subevt.h index 6b315fe..67d4a57 100644 --- a/hadaq/subevt.h +++ b/hadaq/subevt.h @@ -18,7 +18,8 @@ enum SubEvtId { SubEvtId_richPed = 12, SubEvtId_tofTest = 400, SubEvtId_trigCode = 500, - SubEvtId_trigInfo = 501 + SubEvtId_trigInfo = 501, + SubEvtId_slowTest = 600 }; enum SubEvtDecoding {