[Rivet-svn] r3078 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed May  4 21:35:49 2011
New Revision: 3078

Log:
* compare-histos: If using --mc-errs style, prefer dotted and
  dashdotted line styles to dashed, since dashes are often too long
  to be distinguishable from solid lines. Even better might be to
  always use a solid line for MC errs style, and to add more colours.

* rivet-mkhtml: use a no-mc-errors drawing style by default,
  to match the behaviour of compare-histos, which it calls. The
  --no-mc-errs option has been replaced with an --mc-errs option.

Modified:
   trunk/ChangeLog
   trunk/bin/compare-histos
   trunk/bin/rivet-mkhtml

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed May  4 18:40:38 2011	(r3077)
+++ trunk/ChangeLog	Wed May  4 21:35:49 2011	(r3078)
@@ -1,3 +1,14 @@
+2011-05-04  Andy Buckley  <andy at insectnation.org>
+
+	* compare-histos: If using --mc-errs style, prefer dotted and
+	dashdotted line styles to dashed, since dashes are often too long
+	to be distinguishable from solid lines. Even better might be to
+	always use a solid line for MC errs style, and to add more colours.
+
+	* rivet-mkhtml: use a no-mc-errors drawing style by default,
+	to match the behaviour of compare-histos, which it calls. The
+	--no-mc-errs option has been replaced with an --mc-errs option.
+
 2011-05-04  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* Ignore duplicate files in compare-histos.

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Wed May  4 18:40:38 2011	(r3077)
+++ trunk/bin/compare-histos	Wed May  4 21:35:49 2011	(r3078)
@@ -168,6 +168,10 @@
     PLOTSTYLES = ''
     COLORS = ('red', 'blue', '{[rgb]{0.12,0.57,0.14}}', 'magenta')
     LINESTYLES = ('solid', 'dashed', 'dashdotted', 'dotted')
+    if opts.MC_ERRS:
+        ## If using MC errors, dashed lines often aren't visible, so we put them
+        ## to the back of the style list
+        LINESTYLES = ('solid', 'dotted', 'dashdotted', 'dashed')
     STYLES = []
     for ls in LINESTYLES:
         for c in COLORS:

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Wed May  4 18:40:38 2011	(r3077)
+++ trunk/bin/rivet-mkhtml	Wed May  4 21:35:49 2011	(r3078)
@@ -41,8 +41,8 @@
                   help="plot config file(s) to be used with make-plots.")
 parser.add_option("-s", "--single", dest="SINGLE", action="store_true",
                   default=False, help="display plots on single webpage.")
-parser.add_option("--no-mc-errs", dest="MC_ERRS", action="store_false",
-                  default=True, help="don't plot error bars.")
+parser.add_option("--mc-errs", dest="MC_ERRS", action="store_true",
+                  default=True, help="plot error bars.")
 parser.add_option("--refid", dest="REF_ID",
                   default=None, help="ID of reference data set (file path for non-REF data)")
 parser.add_option("-n", "--num-threads", metavar="NUMTHREADS", dest="NUMTHREADS", type=int,