Merge pull request #193 from spice-herald/ofbase_simplify

OFbase simplification

Author: serfass

demos/fitting/Of_1x2x2_polarity_constrain_demo.ipynb

@@ -12,5 +12,5 @@
 from ._of_nxmx2 import *
 from ._of_1x1 import *
 from ._of_nonlin import *
-from ._of_1x2 import *
-from ._of_1x3 import *
+from ._of_1x2x2 import *
+from ._of_1x3x3 import *

demos/fitting/Of_1x3x3_demo.ipynb

@@ -526,7 +526,11 @@ def analyze(self, yoff=None, yoff_err=None, xoff=None, xoff_err=None):
             ibias_off = np.zeros_like(int_n)
             ibias_off_err = np.zeros_like(int_n)
             rp = self.rp_guess
+            if rp.ndim == 2:
+                rp = rp[np.newaxis,:,:]
             rp_err = self.rp_err_guess
+            if rp_err.ndim == 2:
+                rp_err = rp_err[np.newaxis,:,:]
             int_point_y = int_n
             int_point_x = np.zeros_like(int_n)