Merge pull request #123 from alurban/update-plots

Tweak use plot legend and significance-drop plot title

bin/hveto

@@ -469,8 +469,9 @@ while True:
     #   drop
     if round.n > 1:
         png = (pngname % 'SIG_DROP').replace('.png', '.svg')
-        plot.significance_drop(png, oldsignificances, newsignificances,
-                               title=title, subtitle=subtitle)
+        plot.significance_drop(
+            png, oldsignificances, newsignificances,
+            title=' | '.join([title, subtitle]), bbox_inches='tight')
         logger.debug("Figure written to %s" % png)
         png = FancyPlot(png, caption=ROUND_CAPTION['SIG_DROP'])
         rounds[-1].plots.append(png)
@@ -594,14 +595,14 @@ cum. deadtime :   %s\n\n""" % (
         wname = round.winner.name
     beforel = 'Before\n[%d]' % len(before)
     afterl = 'After\n[%d]' % len(primary)
-    vetoedl = 'Vetoed\n[%d]' % len(vetoed)
+    vetoedl = 'Vetoed\n(primary)\n[%d]' % len(vetoed)
     beforeauxl = 'All\n[%d]' % len(beforeaux)
-    usedl = 'Used\n[%d]' % len(winner.events)
+    usedl = 'Used\n(aux)\n[%d]' % len(winner.events)
     coincl = 'Coinc.\n[%d]' % len(coincs)
     title = '%s Hveto round %d' % (ifo, round.n)
     ptitle = '%s: primary impact' % title
     atitle = '%s: auxiliary use' % title
-    subtitle = '[%d-%d] | winner: %s' % (start, end, wname)
+    subtitle = 'winner: %s [%d-%d]' % (wname, start, end)
 
     # before/after histogram
     png = pngname % 'HISTOGRAM'

hveto/plot.py

@@ -343,6 +343,7 @@ def _finalize_plot(plot, ax, outfile, bbox_inches=None, close=True, **axargs):
     # format axes
     for key in axargs:
         getattr(ax, 'set_%s' % key)(axargs[key])
+    # format subtitle first
     if subtitle:
         pos = list(ax.title.get_position())
         pos[1] += 0.05
@@ -372,7 +373,7 @@ def significance_drop(outfile, old, new, show_channel_names=None, **kwargs):
     if show_channel_names is None:
         show_channel_names = len(channels) <= 50
 
-    plot = Plot(figsize=(18, 6))
+    plot = Plot(figsize=(20, 5))
     plot.subplots_adjust(left=.07, right=.93)
     ax = plot.gca()
     if show_channel_names: