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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Mar  1 22:23:15 2011
New Revision: 2998

Log:
Adding --no-plottitle to compare-histos (+ completion).

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

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Mar  1 22:14:56 2011	(r2997)
+++ trunk/ChangeLog	Tue Mar  1 22:23:15 2011	(r2998)
@@ -1,5 +1,7 @@
 2011-03-01  Andy Buckley  <andy at insectnation.org>
 
+	* Adding --no-plottitle to compare-histos (+ completion).
+
 	* Fixing segfaults in UA1_1990_S2044935 and UA5_1982_S875503.
 
 	* Bump ABI version numbers for 1.5.0 release.

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Tue Mar  1 22:14:56 2011	(r2997)
+++ trunk/bin/compare-histos	Tue Mar  1 22:23:15 2011	(r2998)
@@ -10,6 +10,7 @@
 section.
 
 TODO:
+ * two ref datas shouldn't be possible... but it does happen!
  * regex selector
  * ask/force overwrite modes
 """
@@ -96,18 +97,22 @@
     stygroup.add_option("--refid", dest="REF_ID",
                         default="REF", help="ID of reference data set (file path for non-REF data)")
     stygroup.add_option("--linear", action="store_true", dest="LINEAR",
-                      default=False, help="plot with linear scale")
+                        default=False, help="plot with linear scale")
     stygroup.add_option("--logarithmic", action="store_false", dest="LINEAR",
-                      default=False, help="plot with logarithmic scale (default behaviour)")
+                        default=False, help="plot with logarithmic scale (default behaviour)")
     stygroup.add_option("--mc-errs", action="store_true", dest="MC_ERRS",
-                      default=False, help="show vertical error bars on the MC lines")
+                        default=False, help="show vertical error bars on the MC lines")
     stygroup.add_option("--no-ratio", action="store_true", dest="NORATIO",
-                      default=False, help="disable the ratio plot")
+                        default=False, help="disable the ratio plot")
     stygroup.add_option("--rel-ratio", action="store_true", dest="RATIO_DEVIATION",
-                      default=False, help="show the ratio plots scaled to the ref error")
+                        default=False, help="show the ratio plots scaled to the ref error")
     stygroup.add_option("--abs-ratio", action="store_false", dest="RATIO_DEVIATION",
-                      default=False, help="show the ratio plots with an absolute scale")
-    stygroup.add_option("--style", dest="STYLE", default="default", help="change plotting style: default|bw|talk")
+                        default=False, help="show the ratio plots with an absolute scale")
+    stygroup.add_option("--no-plottitle", action="store_true", dest="NOPLOTTITLE",
+                        default=False, help="don't show the plot title on the plot "
+                        "(useful when the plot description should only be given in a caption)")
+    stygroup.add_option("--style", dest="STYLE", default="default",
+                        help="change plotting style: default|bw|talk")
     parser.add_option_group(stygroup)
 
     selgroup = OptionGroup(parser, "Selective plotting")
@@ -408,8 +413,9 @@
             if param not in headers:
                 headers[param] = default
         for key, val in headers.iteritems():
-            directive = "%s=%s\n" % (key, val)
-            headstr += directive
+            if key != "Title" or not opts.NOPLOTTITLE:
+                directive = "%s=%s\n" % (key, val)
+                headstr += directive
         headstr += "# END PLOT\n"
 
         ## Special

Modified: trunk/data/rivet-completion
==============================================================================
--- trunk/data/rivet-completion	Tue Mar  1 22:14:56 2011	(r2997)
+++ trunk/data/rivet-completion	Tue Mar  1 22:23:15 2011	(r2998)
@@ -109,6 +109,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 --no-plottitle"
     opts="$opts --plotinfodir"
     opts="$opts --quiet -q --verbose -v"
     if [[ ${cur} == -* ]] ; then