[Rivet-svn] r2784 - in trunk: bin data

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sat Nov 27 01:12:52 2010
New Revision: 2784

Log:
Options tweaks.

Modified:
   trunk/bin/aida2flat
   trunk/bin/compare-histos
   trunk/bin/flat2aida
   trunk/bin/rivet-mkhtml
   trunk/data/rivet-completion

Modified: trunk/bin/aida2flat
==============================================================================
--- trunk/bin/aida2flat	Sat Nov 27 00:57:37 2010	(r2783)
+++ trunk/bin/aida2flat	Sat Nov 27 01:12:52 2010	(r2784)
@@ -45,7 +45,7 @@
     parser.add_option("-g", "--gnuplot", action="store_true", default=False,
                       help="Provide output suitable for Gnuplot's 'plot \"foo.dat\" with xye'. Implies --split",
                       dest="GNUPLOT")
-    parser.add_option("--plot-info-dir", dest="PLOTINFODIR", action="append",
+    parser.add_option("--plotinfodir", dest="PLOTINFODIR", action="append",
                       default=["./", rivet_data_dir], help="directory which may contain plot header information")
     parser.add_option("-S", "--smart-output", action="store_true", default=False,
                       help="Write to output files with names based on the corresponding input filename",

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Sat Nov 27 00:57:37 2010	(r2783)
+++ trunk/bin/compare-histos	Sat Nov 27 01:12:52 2010	(r2784)
@@ -91,7 +91,7 @@
                       default=".", help="write data files into this directory")
     parser.add_option("--hier-out", action="store_true", dest="HIER_OUTPUT", default=False,
                       help="write output dat files into a directory hierarchy which matches the analysis paths")
-    parser.add_option("--plot-info-dir", dest="PLOTINFODIR", action="append",
+    parser.add_option("--plotinfodir", dest="PLOTINFODIR", action="append",
                       default=[rivet_data_dirs[0], "./"], help="directory which may contain plot header information")
 
     stygroup = OptionGroup(parser, "Plot style")

Modified: trunk/bin/flat2aida
==============================================================================
--- trunk/bin/flat2aida	Sat Nov 27 00:57:37 2010	(r2783)
+++ trunk/bin/flat2aida	Sat Nov 27 01:12:52 2010	(r2784)
@@ -128,8 +128,8 @@
 if __name__ == "__main__":
     from optparse import OptionParser
     parser = OptionParser(usage=__doc__)
-    parser.add_option("-s", "--split-histos", action="store_true", default=False,
-                      help="Split histograms into individual bins", dest="SPLITHISTOS")
+    parser.add_option("-s", "--split", action="store_true", default=False,
+                      help="Split histograms into individual files", dest="SPLITHISTOS")
     opts, args = parser.parse_args()
 
     if len(args) < 1:

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Sat Nov 27 00:57:37 2010	(r2783)
+++ trunk/bin/rivet-mkhtml	Sat Nov 27 01:12:52 2010	(r2784)
@@ -132,7 +132,7 @@
     ch_cmd.append("--refid=%s" % os.path.abspath(opts.REF_ID))
 ch_cmd.append("--hier-out")
 ch_cmd.append("--rivet-refs")
-ch_cmd.append("--plot-info-dir=../")
+ch_cmd.append("--plotinfodir=../")
 # if len(aidafiles) + len(reffiles) < 2:
 #     ch_cmd.append("--show-ref-only")
 #     ch_cmd.append("--no-ratio")

Modified: trunk/data/rivet-completion
==============================================================================
--- trunk/data/rivet-completion	Sat Nov 27 00:57:37 2010	(r2783)
+++ trunk/data/rivet-completion	Sat Nov 27 01:12:52 2010	(r2784)
@@ -93,7 +93,7 @@
     opts="$opts --hier-out --linear --logarithmic --mc-errs"
     opts="$opts --no-ratio --rel-ratio --abs-ratio"
     opts="$opts --all --show-mc-only --show-single --refid"
-    opts="$opts --plot-info-dir"
+    opts="$opts --plotinfodir"
     opts="$opts --quiet -q --verbose -v"
     if [[ ${cur} == -* ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -102,7 +102,7 @@
         fi
     fi
 
-    if [[ ${prev} == "--show-single" ]]; then
+    if [[ ${prev} == --show-single* ]]; then
         COMPREPLY=( $(compgen -W "no mc ref all" -- ${cur}) )
         return 0
     fi
@@ -165,7 +165,7 @@
     opts="$opts --match -m"
     opts="$opts --quiet -q --verbose -v"
 
-    if [[ ${cur} == "--plotinfodir" ]] ; then
+    if [[ ${cur} == --plotinfodir* ]] ; then
         _filedir -d
         return 0
     fi