[Rivet-svn] r2848 - in trunk: . bin data

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sat Dec 11 21:19:09 2010
New Revision: 2848

Log:
Adding a --event-timeout option to control the event timeout, adding it to the
completion script, and making sure that the init time check is turned OFF once
successful!

Modified:
   trunk/ChangeLog
   trunk/bin/rivet
   trunk/data/rivet-completion

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sat Dec 11 21:03:58 2010	(r2847)
+++ trunk/ChangeLog	Sat Dec 11 21:19:09 2010	(r2848)
@@ -1,5 +1,9 @@
 2010-12-11  Andy Buckley  <andy at insectnation.org>
 
+	* Adding a --event-timeout option to control the event timeout,
+	adding it to the completion script, and making sure that the init
+	time check is turned OFF once successful!
+
 	* Adding an 3600 second timeout for initialising an event file. If
 	it takes longer than (or anywhere close to) this long, chances are
 	that the event source is inactive for some reason (perhaps

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Sat Dec 11 21:03:58 2010	(r2847)
+++ trunk/bin/rivet	Sat Dec 11 21:19:09 2010	(r2848)
@@ -91,9 +91,14 @@
 parser.add_option("--runname", dest="RUN_NAME", default=None, metavar="NAME",
                   help="give an optional run name, to be prepended as a 'top level directory' in histo paths")
 parser.add_option("-H", "--histo-file", dest="HISTOFILE",
-                  default="Rivet.aida", help="specify the output histo file path")
+                  default="Rivet.aida", help="specify the output histo file path (default = %default)")
+parser.add_option("--event-timeout", dest="EVENT_TIMEOUT", type="int",
+                  default=3600, metavar="NSECS",
+                  help="max time in whole seconds to wait for an event to be generated from the specified source (default = %default)")
 parser.add_option("--histo-interval", dest="HISTO_WRITE_INTERVAL", type=int,
-                  default=None, help="specify how often histograms are written in #events [experimental]")
+                  default=None, help="[experimental!] specify the number of events between histogram file updates. "
+                  "Default is to only write out at the end of the run. Note that intermediate histograms will be those "
+                  "from the analyze step only: analysis finalizing is currently not executed until the end of the run.")
 parser.add_option("-x", "--cross-section", dest="CROSS_SECTION",
                   default=None, metavar="XS",
                   help="specify the signal process cross-section in pb")
@@ -389,22 +394,14 @@
 logging.info("Rivet running on machine %s (%s)" % (platform.node(), platform.machine()))
 
 
-## Timeout handlers for the event initialisation and loop
-EVENT_TIMEOUT = 600
-def evtinithandler(signum, frame):
-    logging.warn("It has taken more than %d secs to get the first event! Is the input event stream working?" % EVENT_TIMEOUT)
-    raise Exception("Event initialisation timeout")
-# def evtloophandler(signum, frame):
-#     global evtnum, HEPMCFILES
-#     logging.warn("Event #%i timeout: it has taken more than %d secs to process this event! Is the input event stream working?" % (evtnum, EVENT_TIMEOUT))
-#     logging.warn("Abandoning processing of events from %s; is this input event stream actually working?" % hepmcfile)
-#     raise Exception("Event generation timeout")
-
-
 ## Init run based on one event
 hepmcfile = HEPMCFILES[0]
-signal.signal(signal.SIGALRM, evtinithandler)
-signal.alarm(EVENT_TIMEOUT)
+if opts.EVENT_TIMEOUT:
+    def evtinithandler(signum, frame):
+        logging.warn("It has taken more than %d secs to get the first event! Is the input event stream working?" % opts.EVENT_TIMEOUT)
+        raise Exception("Event initialisation timeout")
+    signal.signal(signal.SIGALRM, evtinithandler)
+    signal.alarm(opts.EVENT_TIMEOUT)
 try:
     init_ok = run.init(hepmcfile)
     if not init_ok:
@@ -413,6 +410,8 @@
 except:
     logging.error("Timeout in initialisation from event file %s... exiting" % hepmcfile)
     sys.exit(3)
+## Cancel timeout
+signal.alarm(0)
 
 
 ## Event loop

Modified: trunk/data/rivet-completion
==============================================================================
--- trunk/data/rivet-completion	Sat Dec 11 21:03:58 2010	(r2847)
+++ trunk/data/rivet-completion	Sat Dec 11 21:19:09 2010	(r2848)
@@ -19,7 +19,7 @@
     opts="--help --verbose --quiet --version --nevts --cross-section"
     opts="$opts --analysis --runname --list-analyses --show-analysis"
     opts="$opts --analysis-path --analysis-path-append"
-    opts="$opts --histo-file --histo-interval"
+    opts="$opts --histo-file --histo-interval --event-timeout"
     opts="$opts -a -A -n -h -x -H -l -v -q"
     if [[ ${cur} == -* ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -36,7 +36,7 @@
         fi
     fi
 
-    if $(echo ${prev} | egrep -- "-n|--nevts|--runname|--histo-interval|--cross-section|-x" &> /dev/null); then
+    if $(echo ${prev} | egrep -- "-n|--nevts|--runname|--histo-interval|--cross-section|-x|--event-timeout" &> /dev/null); then
         COMPREPLY=()
         return 0
     fi