[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/64645376f481
branches:  release-2-4-x
changeset: 5015:64645376f481
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 03 15:21:40 2016 +0000
description:
Add a --nskip flag to the rivet command-line tool, to allow processing to begin in the middle of an event file (useful for batched processing of large files, in combination with --nevts)

details:   https://rivet.hepforge.org/hg/rivet/rev/7d5fe03cfc86
branches:  
changeset: 5016:7d5fe03cfc86
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Mar 03 15:24:22 2016 +0000
description:
Merge event-skipping function from 2.4.1

diffs (truncated from 337 to 50 lines):

--- a/ChangeLog	Thu Mar 03 13:01:13 2016 +0000
+++ b/ChangeLog	Thu Mar 03 15:24:22 2016 +0000
@@ -1,3 +1,12 @@
+2016-03-03  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a --nskip flag to the rivet command-line tool, to allow
+	processing to begin in the middle of an event file (useful for
+	batched processing of large files, in combination with --nevts)
+
+	* Allow specifying an alias name by which an analysis can be
+	loaded, to allow migration from SPIRES to Inspire ID numberings.
+
 2016-03-03  Holger Schulz  <holger.schulz at durham.ac.uk>
 
 	* Add ATLAS 7 TeV event shapes in Z+jets analysis (ATLAS_2016_I1424838)
--- a/bin/rivet	Thu Mar 03 13:01:13 2016 +0000
+++ b/bin/rivet	Thu Mar 03 15:24:22 2016 +0000
@@ -75,12 +75,15 @@
                       help="specify the signal process cross-section in pb")
 extragroup.add_option("-n", "--nevts", dest="MAXEVTNUM", type="int",
                       default=None, metavar="NUM",
-                      help="restrict the max number of events to read.")
+                      help="restrict the max number of events to process")
+extragroup.add_option("--nskip", dest="EVTSKIPNUM", type="int",
+                      default=0, metavar="NUM",
+                      help="skip NUM events read from input before beginning processing")
 extragroup.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")
 extragroup.add_option("--ignore-beams", dest="IGNORE_BEAMS", action="store_true", default=False,
                       help="Ignore input event beams when checking analysis compatibility. "
-                      "Warning: some analyses may not work with incorrect beams")
+                      "Warning: analyses may not work correctly, or at all, with inappropriate beams")
 parser.add_option_group(extragroup)
 
 
@@ -419,7 +422,6 @@
 ah = rivet.AnalysisHandler(RUNNAME)
 ah.setIgnoreBeams(opts.IGNORE_BEAMS)
 for a in opts.ANALYSES:
-    #a_up = a.upper()
     ## Print warning message and exit if not a valid analysis name
     if not a in all_analyses:
         logging.warning("'%s' is not a known Rivet analysis! Do you need to set RIVET_ANALYSIS_PATH or use the --pwd switch?\n" % a)
@@ -493,18 +495,29 @@
     if ":" in hepmcfile:
         hepmcfile, hepmcfileweight = hepmcfile.rsplit(":", 1)
         hepmcfileweight = float(hepmcfileweight)
+
     ## Open next HepMC file (NB. this doesn't apply to the first file: it was already used for the run init)
     if fileidx > 0: