Merge pull request #31 from danielballan/master

RLS: Version 0.5 with feature-finding improvements

Author: danielballan

mr/plots.py

@@ -94,14 +94,17 @@ def plot_traj(traj, colorby='probe', mpp=1, label=False, superimpose=None,
     -------
     None
     """
+    if (superimpose is not None) and (mpp != 1):
+        raise NotImplementedError("When superimposing over an image, you " +
+                                  "must plot in units of pixels. Leave " +
+                                  "microns per pixel mpp=1.")
     # Axes labels
-    if (superimpose is not None) or (mpp == 1):
-        logger.warning("Using units of px, not microns")
+    if mpp == 1:
         ax.set_xlabel('x [px]')
         ax.set_ylabel('y [px]')
     else:
-        ax.set_xlabel('x [um]')
-        ax.set_ylabel('y [um]')
+        ax.set_xlabel(r'x [$\mu$m]')
+        ax.set_ylabel(r'y [$\mu$m]')
     # Background image
     if superimpose is not None:
         ax.imshow(superimpose, cmap=plt.cm.gray)

setup.py

@@ -8,9 +8,9 @@
 import warnings
 
 MAJOR = 0
-MINOR = 3
+MINOR = 5
 MICRO = 0
-ISRELEASED = False
+ISRELEASED = True 
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 QUALIFIER = ''