xxxxx JUNK is removed, evtsDiscarded threshold is set to 0.1

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 41459572285b5d492a5bcd1d8ee3de1add3a7acc..d045c1fa4d1f22ee119352fbe5ef550f7d0de7bf 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,5 +1,5 @@
 static char *rcsId =
-  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.77 2007-04-14 21:49:37 hadaq Exp $";
+  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.78 2007-04-24 15:28:42 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -670,11 +670,15 @@ storeInfoStart (const char *n, time_t t, TheArgs * my)
   /* This storing junk is for having the run start in
    * oracle definately -- BS
    */
-  for (i = 0; i < NJUNK; i++)
-    {
-      Param_storeString (p, n, "junk",
-                        "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-    }
+
+  /*
+   *for (i = 0; i < NJUNK; i++)
+   * {
+   *   Param_storeString (p, n, "junk",
+   *                    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+   *  }
+   */
+
   desParam (p);
 }
 
@@ -701,16 +705,17 @@ int
 is_mismatch_enough_to_stop(TheArgs * theArgs, TheStats * my) {
   /*unsigned long filesize_enough = (theArgs->maxFileSz) * 0.02;*/
   unsigned long filesize_enough = (theArgs->maxFileSz) * 0.1;
-  unsigned long discarded_enough = (*my->evtsComplete) * 0.03;
+  /*unsigned long discarded_enough = (*my->evtsComplete) * 0.03;*/
+  unsigned long discarded_enough = (*my->evtsComplete) * 0.1;
   unsigned long tagerror_enough = (*my->evtsComplete) * 0.03;
   if ((*my->bytesWritten) >= filesize_enough)
   {
     if ((*my->evtsDiscarded) > discarded_enough) 
     {
      printf("Too many events are broken.\n");
-     printf("Debug Inf: filesize_enough: %u,fileWrittem: %u, DISCARDED_enough: %u, discarded: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),discarded_enough, (*my->evtsDiscarded), (*my->evtsComplete));
+     printf("Debug Inf: filesize_enough: %u,fileWritten: %u, DISCARDED_enough: %u, discarded: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),discarded_enough, (*my->evtsDiscarded), (*my->evtsComplete));
      syslog (LOG_ERR, "Too many events are broken.\n");
-     syslog (LOG_ERR, "Debug Inf: filesize_enough: %u,fileWrittem: %u, DISCARDED_enough: %u, discarded: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),discarded_enough, (*my->evtsDiscarded), (*my->evtsComplete));
+     syslog (LOG_ERR, "Debug Inf: filesize_enough: %u,fileWritten: %u, DISCARDED_enough: %u, discarded: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),discarded_enough, (*my->evtsDiscarded), (*my->evtsComplete));
 #if BEAM
      system ("echo tagerror | netcat -w1 hadesdaq 12122");
 #endif
@@ -719,9 +724,9 @@ is_mismatch_enough_to_stop(TheArgs * theArgs, TheStats * my) {
     if ((*my->evtsTagError) > tagerror_enough) 
     {
      printf("Too many TagErrors.\n");
-     printf("Debug Inf: filesize_enough: %u,fileWrittem: %u, TAGERROR_enough: %u, tag_error: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),tagerror_enough, (*my->evtsTagError), (*my->evtsComplete));
+     printf("Debug Inf: filesize_enough: %u,fileWritten: %u, TAGERROR_enough: %u, tag_error: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),tagerror_enough, (*my->evtsTagError), (*my->evtsComplete));
      syslog(LOG_ERR, "Too many TagErrors.\n");
-     syslog(LOG_ERR, "Debug Inf: filesize_enough: %u,fileWrittem: %u, TAGERROR_enough: %u, tag_error: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),tagerror_enough, (*my->evtsTagError), (*my->evtsComplete));
+     syslog(LOG_ERR, "Debug Inf: filesize_enough: %u,fileWritten: %u, TAGERROR_enough: %u, tag_error: %u, all_events: %u\n",filesize_enough , (*my->bytesWritten),tagerror_enough, (*my->evtsTagError), (*my->evtsComplete));
 #if BEAM
      system ("echo tagerror | netcat -w1 hadesdaq 12122");
 #endif