From: hadaq Date: Tue, 19 Nov 2002 02:02:38 +0000 (+0000) Subject: BUGFIX -- mm X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=878269da4b701c33cfdfbe9c9352b000afe843c6;p=daqdata.git BUGFIX -- mm --- diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index f345daf..d08bb18 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.53 2002-11-18 14:05:24 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.54 2002-11-19 02:02:38 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -613,6 +613,9 @@ int main(int argc, char *argv[]) if (!evtIsBroken) { (*theStats->evtsComplete)++; + (*theStats->triggerType[currId & (NTRIGTYPES - 1)])++; + Evt_setId(evt, currId & (NTRIGTYPES_IN_FILE - 1)); + if (dataError) { Evt_setDataError(evt); (*theStats->evtsDataError)++; @@ -621,8 +624,6 @@ int main(int argc, char *argv[]) Evt_setDataError(evt); (*theStats->evtsTagError)++; } - (*theStats->triggerType[currId & (NTRIGTYPES - 1)])++; - Evt_setId(evt, currId & (NTRIGTYPES_IN_FILE - 1)); (*theStats->bytesWritten) += Evt_size(evt); writeFile(evt); diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl index 5d56a0a..91aa824 100644 --- a/hadaq/hades.tcl +++ b/hadaq/hades.tcl @@ -2,11 +2,7 @@ # are: trig rich0 rich1 rich2 mdc0 tof1 tof2 tof3 shw set subSystems { trig shw rich0 rich1 rich2 tof1 tof2 tof3 mdc0 mdc1 } -#set subSystems { trig rich0 rich1 rich2 shw } -#set subSystems { trig shw } -#set subSystems { trig } -#set subSystems { trig rich0 } -#set subSystems { trig rich0 rich1 rich2 tof1 tof2 tof3} +#set subSystems { trig shw rich0 rich1 rich2 mdc0 mdc1 } # the component in the HADES_BASE_DIR set beamTime oct02