BUGFIX -- mm

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index f345daf7b526e633f2916a575094e09e750531f0..d08bb18613487c064476ffa7312004aeaf5161cd 100644 (file)
--- 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 5d56a0a42ea5169a2e278da7a36c578d1941864a..91aa8247ea15770e128be200775d0ce64dd5eae1 100644 (file)
--- 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