24: five small bug fixes in #17

1) made combine plots more permissive
2) avoid 0/0 in divideplots
3) make observable useful
4) mpl_axes_aligner whines if plot's not
   originally centred around 1
5) sharey=True links the y axis together

pymule/errortools.py

@@ -88,14 +88,20 @@ def combineplots(a, b, yfunc, efunc):
     maskB = [False]*len(b)
     for ia in range(len(a)):
         for ib in range(len(b)):
-            if abs(1-a[ia, 0] / b[ib, 0]) < 1e-15:
+            if abs(1-a[ia, 0] / b[ib, 0]) < 1e-10:
                 maskA[ia] = True
                 maskB[ib] = True
 
-    x = a[maskA, 0]
-    y = yfunc(a[maskA, 1], b[maskB, 1])
-    e = efunc(a[maskA, 1], a[maskA, 2], b[maskB, 1], b[maskB, 2])
-    return np.column_stack((x, y, e))
+    with np.errstate(divide='ignore', invalid='ignore'):
+        x = a[maskA, 0]
+        y = yfunc(a[maskA, 1], b[maskB, 1])
+        e = efunc(a[maskA, 1], a[maskA, 2], b[maskB, 1], b[maskB, 2])
+
+        out = np.column_stack((x, y, e))
+        # if one bin is empty, the zero causes trouble
+        out[~np.isfinite(out)] = 0
+
+    return out
 
 
 def addplots(a, b, sa=1., sb=1.):

pymule/loader.py

@@ -44,7 +44,8 @@ def importreg(r, folder='.', filenames=None,
 def pattern(piece='.*', flavour='.*', obs='', folderp='.*'):
     if len(obs) > 0:
         return (
-            folderp + piece + '_' + flavour + '_S(\d+)X([\d\.]+)D([\d\.]+).*'
+            folderp + piece + '_' + flavour + '_S(\d+)X([\d\.]+)D([\d\.]+).*O'
+            + obs + ".vegas"
         )
     else:
         return (

pymule/mpl_axes_aligner.py

@@ -22,8 +22,9 @@ def _calc_pos(org1, org2, lim1, lim2):
     pos = (rorg1 + rorg2) / 2
 
     if pos == 0 or pos == 1:
-        raise ValueError("When pos=None, at least one origin should be "
-                         "within the initial plotting range.")
+        print "When pos=None, at least one origin should be " + \
+              "within the initial plotting range."
+        pos = 0.5
 
     return pos
 

pymule/plot.py

@@ -89,7 +89,7 @@ def twopanel(labelx,
         downright = [downright]
 
     fig, axs = plt.subplots(
-        2, sharex=True, sharey=True, gridspec_kw={'hspace': 0}
+        2, sharex=True, gridspec_kw={'hspace': 0}
     )
     axs[1].set_xlabel(labelx)