From b180ddbee1466970f867b7eb77fd336a98d2b7bb Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Mon, 2 Apr 2012 10:34:08 +0000
Subject: [PATCH] JAM: Added daq_evtbuild option --resbeginevent for resfile to
 skip first n events. Workaround to avoid QA monitor crashes in case of
 initial frontend rubbish.

---
 hadaq/args.c     |  8 +++++++-
 hadaq/args.h     |  1 +
 hadaq/evtbuild.c | 37 +++++++++++++++++++++++++------------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/hadaq/args.c b/hadaq/args.c
index 7b53fc2..9fe15b9 100644
--- a/hadaq/args.c
+++ b/hadaq/args.c
@@ -80,6 +80,7 @@ void Args_default(TheArgs *my)
 	my->resdownscale = 0;
 	my->resdown_offset = 0;
 	my->resnumevents = -1;
+	my->resfirstevent = 5;		/* JAM: start writing to resfile after this event only */
 	my->secsizelimit = 0.;
 	my->ressizelimit = 0;
 	strcpy(my->respath, "");
@@ -160,9 +161,10 @@ int Args_fromCL(TheArgs *my, int argc, char *argv[])
 			{"multidisks", 1, 0, 'k'},
 			{"maxtrigmismatch", 1, 0, 'g'},
 			{"log", 1, 0, 'Y'},
+			{"resbeginevent", 1, 0, 'b'},
 			{0, 0, 0, 0}
 		};
-		i = getopt_long(argc, argv, "am:f:r:o:d:q:Q:p:v:x:I:tz:e:n:h:w:Hs:l:R:A:bEL:S:B:O:iW:M:F:X:C:D:T:k:g:Y:", long_options,
+		i = getopt_long(argc, argv, "am:f:r:o:d:q:Q:p:v:x:I:tz:e:n:h:w:Hs:l:R:A:bEL:S:B:O:iW:M:F:X:C:D:T:k:g:Y:b:", long_options,
 						&option_index);
 		if (i == -1)
 			break;
@@ -284,6 +286,9 @@ int Args_fromCL(TheArgs *my, int argc, char *argv[])
 		case 'Y':
 			strcpy(my->log, optarg);
 			break;
+		case 'b':
+			my->resfirstevent = strtoul(optarg, NULL, 0);
+			break;
 		case 'H':
 			return -1;
 			break;
@@ -451,6 +456,7 @@ void Args_dump(TheArgs *my)
 	}
 	if (my->resdownscale != 0) {
 		syslog(LOG_DEBUG, "resdownscale: %ld", my->resdownscale);
+		syslog(LOG_DEBUG, "resfirstevent: %ld", my->resfirstevent);
 		syslog(LOG_DEBUG, "resnumevents: %ld", my->resnumevents);
 		syslog(LOG_DEBUG, "respath: %s", my->respath);
 		syslog(LOG_DEBUG, "secsizelimit: %ld", my->secsizelimit);
diff --git a/hadaq/args.h b/hadaq/args.h
index 4017b9d..5b6343c 100644
--- a/hadaq/args.h
+++ b/hadaq/args.h
@@ -42,6 +42,7 @@ typedef struct TheArgsS {
 	unsigned short online;
 	unsigned int resdownscale;
 	unsigned int resnumevents;
+	unsigned int resfirstevent;
 	char respath[PARAM_MAX_VALUE_LEN];
 	unsigned short write_data;
 	char sec_path[PARAM_MAX_VALUE_LEN];
diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index b7189c7..02ae878 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.162 2012-03-29 11:47:27 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.163 2012-04-02 10:34:08 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -169,6 +169,7 @@ static void usage(const char *progName)
 	syslog(LOG_ERR, "");
 	syslog(LOG_ERR, "Options for second data stream with a fraction of the data:");
 	syslog(LOG_ERR, "       [--resnumevents evt_num]     Maximum number of events in a resfile");
+	syslog(LOG_ERR, "       [--resbeginevent skip_num]   Start writing to resfile after skip_num skipped events");
 	syslog(LOG_ERR, "       [--respath path]             Path for the res directory.");
 	syslog(LOG_ERR, "       [--secsizelimit max_size]    Maximum size of second directory with the mirrored data [in MB].");
 	syslog(LOG_ERR, "       [--ressizelimit max_file_num] Maximum  number of files in res dir");
@@ -1488,17 +1489,29 @@ int main(int argc, char *argv[])
 
 			if (theArgs->resdownscale) {
 
-				/*
-				 *   If the setting are as follows: 
-				 *   EVENT_NUM_OFFSET        == 100
-				 *   theArgs->resdown_offset == 5        (100 / 20)
-				 *   (where resdown_offset = EVENT_NUM_OFFSET / resdownscale)
-				 *   then from each 100 events only 
-				 *   first 5 events are written to refFile. 
-				 */
-				if (((*theStats->evtsComplete) % EVENT_NUM_OFFSET) < theArgs->resdown_offset) {
-					(*theStats->evtsRes)++;
-					Res_writeFile(evt, runNr, seqNr);
+				/* my->resstartevent */
+				if (*theStats->evtsComplete < theArgs->resfirstevent) {
+					/*JAM skip first n events workaround to avoid QA crashes */
+				} else {
+					if (*theStats->evtsComplete == theArgs->resfirstevent) {
+						/* give some debug statement that we started writing */
+						sprintf(msglog, "<I> Started writing resfile after %d skipped initial events", *theStats->evtsComplete);
+						storeLogInfo(theArgs, msglog);
+					}
+
+
+					/*
+					 *   If the setting are as follows:
+					 *   EVENT_NUM_OFFSET        == 100
+					 *   theArgs->resdown_offset == 5        (100 / 20)
+					 *   (where resdown_offset = EVENT_NUM_OFFSET / resdownscale)
+					 *   then from each 100 events only
+					 *   first 5 events are written to refFile.
+					 */
+					if (((*theStats->evtsComplete) % EVENT_NUM_OFFSET) < theArgs->resdown_offset) {
+						(*theStats->evtsRes)++;
+						Res_writeFile(evt, runNr, seqNr);
+					}
 				}
 			}
 			if (theArgs->online)
-- 
2.43.0