Fix some bugs in plotting

Author: brettviren

wirecell/plot/__main__.py

@@ -162,12 +162,10 @@ def comp1d(ctx, name, tier, frames, chmin, chmax, unit, xrange,
     else:
         frames = [f.strip() for f in frames.split(",")]
 
-    # too high and the pixel marker disappears.
-    opts=dict(dpi=150)
     if single:
-        out = plottools.NameSingleton(output, **opts)
+        out = plottools.NameSingleton(output, dpi=150)
     else:
-        out = plottools.pages(output, **opts)
+        out = plottools.pages(output)
 
     markers=[m.strip() for m in markers.split(' ')]
     plotter(datafiles, out,

wirecell/plot/frames.py

@@ -293,6 +293,8 @@ def extract(fname, dat):
         if interactive :
             plt.show()
         out.savefig(fig)
+    if not interactive and hasattr(out, "close"):
+        out.close()
 
 def channel_correlation(datafile, out, tier='orig', chmin=0, chmax=1, unit='ADC', interactive=False):
     '''

wirecell/util/plottools.py

@@ -119,7 +119,7 @@ def __exit__(self, typ, value, traceback):
 
 
 
-def pages(name, format=None, single=False):
+def pages(name, format=None, single=False, **kwds):
     '''
     Return an instance of something like a PdfPages for the given format.
 
@@ -142,10 +142,10 @@ def pages(name, format=None, single=False):
     '''
 
     if name.endswith(".pdf") or format=="pdf":
-        return PdfPages(name)
+        return PdfPages(name, **kwds)
     if single:
         return NameSingleton(name, format)
-    return NameSequence(name)
+    return NameSequence(name, **kwds)
 
 
 def lg10(arr, eps = None, scale=None):