Moved core/utils.py to utils/misc.py as it was screwing up some names…

…pace stuff. Moved cubic interpolation module to utils.

core/algebra.py

@@ -59,14 +59,14 @@
 import sys
 import warnings
 from functools import wraps
+import operator
 
 import scipy as sp
 import numpy as np
 import numpy.lib.format as npfor
 from numpy.lib.utils import safe_eval
-import operator
 
-import cubic_conv_interpolation as cci
+import utils.cubic_conv_interpolation as cci
 
 # TODO:
 # when submitted as batch on Sunnyvale, the PYTHONPATH seems to get clobbered
@@ -850,7 +850,7 @@ def slice_interpolate(self, axes, coord, kind='linear') :
             # Get the nodes needed and their weights.
             out = cci.interpolate(axes, self, pnt, x0, step_sizes)
         else:
-            # Get the contributing points and their wiehgts.
+            # Get the contributing points and their weights.
             points, weights = self.slice_interpolate_weights(axes, coord, kind)
             # Sum up the points
             q = points.shape[0]

core/base_data.py

@@ -4,7 +4,7 @@
 import numpy.ma as ma
 
 import kiyopy.custom_exceptions as ce
-import utils
+import utils.misc as utils
 from hist import History, merge_histories
 
 class BaseData(object) :