diff --git a/pyart/__init__.py b/pyart/__init__.py
index 189847487..c500550e0 100644
--- a/pyart/__init__.py
+++ b/pyart/__init__.py
@@ -21,6 +21,7 @@
     map,  # noqa
     retrieve,  # noqa
     testing,  # noqa
+    xradar, # noqa
     util,  # noqa
 )
 from ._debug_info import _debug_info  # noqa
diff --git a/pyart/correct/_fast_edge_finder.c b/pyart/correct/_fast_edge_finder.c
index d628738f3..6c572c697 100644
--- a/pyart/correct/_fast_edge_finder.c
+++ b/pyart/correct/_fast_edge_finder.c
@@ -10,14 +10,14 @@
             ]
         ],
         "depends": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
         ],
         "include_dirs": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include"
         ],
         "name": "pyart.correct._fast_edge_finder",
         "sources": [
@@ -1678,7 +1678,7 @@ typedef struct {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1687,7 +1687,7 @@ typedef struct {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1696,7 +1696,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1705,7 +1705,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1714,7 +1714,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1723,7 +1723,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1732,7 +1732,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1741,7 +1741,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1750,7 +1750,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1759,7 +1759,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1768,7 +1768,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
  * ctypedef double complex complex128_t
  * 
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1777,7 +1777,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
  * 
  * ctypedef npy_longlong   longlong_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1786,7 +1786,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1795,7 +1795,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1804,7 +1804,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1813,7 +1813,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1822,7 +1822,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1876,7 +1876,7 @@ struct __pyx_MemviewEnum_obj;
 struct __pyx_memoryview_obj;
 struct __pyx_memoryviewslice_obj;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
  * 
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil             # <<<<<<<<<<<<<<
@@ -1885,7 +1885,7 @@ struct __pyx_memoryviewslice_obj;
  */
 typedef int (*__pyx_t_5numpy_NpyIter_IterNextFunc)(NpyIter *);
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil
  * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil             # <<<<<<<<<<<<<<
@@ -18152,7 +18152,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18163,7 +18163,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:
  *             return PyDataType_ELSIZE(self)             # <<<<<<<<<<<<<<
@@ -18173,7 +18173,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   __pyx_r = PyDataType_ELSIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18186,7 +18186,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18197,7 +18197,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:
  *             return PyDataType_ALIGNMENT(self)             # <<<<<<<<<<<<<<
@@ -18207,7 +18207,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18220,7 +18220,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -18234,7 +18234,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("fields", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
  *         @property
  *         cdef inline object fields(self):
  *             return <object>PyDataType_FIELDS(self)             # <<<<<<<<<<<<<<
@@ -18247,7 +18247,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   __pyx_r = ((PyObject *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -18262,7 +18262,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -18276,7 +18276,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("names", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
  *         @property
  *         cdef inline tuple names(self):
  *             return <tuple>PyDataType_NAMES(self)             # <<<<<<<<<<<<<<
@@ -18289,7 +18289,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   __pyx_r = ((PyObject*)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -18304,7 +18304,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18315,7 +18315,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
 static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) {
   PyArray_ArrayDescr *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:
  *             return PyDataType_SUBARRAY(self)             # <<<<<<<<<<<<<<
@@ -18325,7 +18325,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   __pyx_r = PyDataType_SUBARRAY(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18338,7 +18338,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18349,7 +18349,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
 static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) {
   npy_uint64 __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
  *         cdef inline npy_uint64 flags(self) noexcept nogil:
  *             """The data types flags."""
  *             return PyDataType_FLAGS(self)             # <<<<<<<<<<<<<<
@@ -18359,7 +18359,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   __pyx_r = PyDataType_FLAGS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18372,7 +18372,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18383,7 +18383,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
  *         cdef inline int numiter(self) noexcept nogil:
  *             """The number of arrays that need to be broadcast to the same shape."""
  *             return PyArray_MultiIter_NUMITER(self)             # <<<<<<<<<<<<<<
@@ -18393,7 +18393,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18406,7 +18406,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18417,7 +18417,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
  *         cdef inline npy_intp size(self) noexcept nogil:
  *             """The total broadcasted size."""
  *             return PyArray_MultiIter_SIZE(self)             # <<<<<<<<<<<<<<
@@ -18427,7 +18427,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18440,7 +18440,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18451,7 +18451,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
  *         cdef inline npy_intp index(self) noexcept nogil:
  *             """The current (1-d) index into the broadcasted result."""
  *             return PyArray_MultiIter_INDEX(self)             # <<<<<<<<<<<<<<
@@ -18461,7 +18461,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18474,7 +18474,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18485,7 +18485,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
  *         cdef inline int nd(self) noexcept nogil:
  *             """The number of dimensions in the broadcasted result."""
  *             return PyArray_MultiIter_NDIM(self)             # <<<<<<<<<<<<<<
@@ -18495,7 +18495,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18508,7 +18508,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18519,7 +18519,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:
  *             """The shape of the broadcasted result."""
  *             return PyArray_MultiIter_DIMS(self)             # <<<<<<<<<<<<<<
@@ -18529,7 +18529,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18542,7 +18542,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18553,7 +18553,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
 static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) {
   void **__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
  *             """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
  *             On return, the iterators are adjusted for broadcasting."""
  *             return PyArray_MultiIter_ITERS(self)             # <<<<<<<<<<<<<<
@@ -18563,7 +18563,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18576,7 +18576,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18587,7 +18587,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -18597,7 +18597,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18610,7 +18610,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -18624,7 +18624,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -18637,7 +18637,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -18652,7 +18652,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18663,7 +18663,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -18673,7 +18673,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18686,7 +18686,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18697,7 +18697,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -18707,7 +18707,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18720,7 +18720,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18731,7 +18731,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -18741,7 +18741,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18754,7 +18754,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18765,7 +18765,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -18775,7 +18775,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18788,7 +18788,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18799,7 +18799,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -18809,7 +18809,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -18822,7 +18822,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -18839,7 +18839,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -18853,7 +18853,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -18872,7 +18872,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -18889,7 +18889,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -18903,7 +18903,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -18922,7 +18922,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -18939,7 +18939,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -18953,7 +18953,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -18972,7 +18972,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -18989,7 +18989,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -19003,7 +19003,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -19022,7 +19022,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -19039,7 +19039,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -19053,7 +19053,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -19072,7 +19072,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -19087,7 +19087,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   PyObject *__pyx_t_2;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -19097,7 +19097,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -19110,7 +19110,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_t_2);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -19119,7 +19119,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -19133,7 +19133,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -19148,7 +19148,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -19162,7 +19162,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -19171,7 +19171,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -19180,7 +19180,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 1012, __pyx_L1_error)
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -19195,7 +19195,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -19210,7 +19210,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -19219,7 +19219,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -19229,7 +19229,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -19240,7 +19240,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -19249,7 +19249,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -19261,7 +19261,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -19276,7 +19276,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -19300,7 +19300,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19316,7 +19316,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -19325,7 +19325,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1024, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19339,7 +19339,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -19354,7 +19354,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -19369,7 +19369,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19385,7 +19385,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -19408,7 +19408,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -19432,7 +19432,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19448,7 +19448,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -19457,7 +19457,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1030, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19471,7 +19471,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -19486,7 +19486,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -19501,7 +19501,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19517,7 +19517,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -19540,7 +19540,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -19564,7 +19564,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19580,7 +19580,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -19589,7 +19589,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1036, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19603,7 +19603,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -19618,7 +19618,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -19633,7 +19633,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -19649,7 +19649,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -19672,7 +19672,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -19683,7 +19683,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -19693,7 +19693,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -19706,7 +19706,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -19717,7 +19717,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -19727,7 +19727,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -19740,7 +19740,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -19751,7 +19751,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -19761,7 +19761,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -19774,7 +19774,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -19785,7 +19785,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -19795,7 +19795,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -19808,7 +19808,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -19819,7 +19819,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -19829,7 +19829,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -23352,7 +23352,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__8);
   __Pyx_GIVEREF(__pyx_tuple__8);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -23363,7 +23363,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
diff --git a/pyart/correct/_unwrap_1d.c b/pyart/correct/_unwrap_1d.c
index b5cff0d55..f2df15c40 100644
--- a/pyart/correct/_unwrap_1d.c
+++ b/pyart/correct/_unwrap_1d.c
@@ -11,7 +11,7 @@
         ],
         "depends": [],
         "include_dirs": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include"
         ],
         "name": "pyart.correct._unwrap_1d",
         "sources": [
diff --git a/pyart/io/_sigmetfile.c b/pyart/io/_sigmetfile.c
index bbfee1602..5114ddd60 100644
--- a/pyart/io/_sigmetfile.c
+++ b/pyart/io/_sigmetfile.c
@@ -10,14 +10,14 @@
             ]
         ],
         "depends": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
         ],
         "include_dirs": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include"
         ],
         "name": "pyart.io._sigmetfile",
         "sources": [
@@ -1575,7 +1575,7 @@ typedef struct {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1584,7 +1584,7 @@ typedef struct {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1593,7 +1593,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1602,7 +1602,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1611,7 +1611,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1620,7 +1620,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1629,7 +1629,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1638,7 +1638,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1647,7 +1647,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1656,7 +1656,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1665,7 +1665,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
  * ctypedef double complex complex128_t
  * 
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1674,7 +1674,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
  * 
  * ctypedef npy_longlong   longlong_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1683,7 +1683,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1692,7 +1692,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1701,7 +1701,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1710,7 +1710,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1719,7 +1719,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1769,7 +1769,7 @@ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_fro
 /*--- Type declarations ---*/
 struct __pyx_obj_5pyart_2io_11_sigmetfile_SigmetFile;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
  * 
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil             # <<<<<<<<<<<<<<
@@ -1778,7 +1778,7 @@ struct __pyx_obj_5pyart_2io_11_sigmetfile_SigmetFile;
  */
 typedef int (*__pyx_t_5numpy_NpyIter_IterNextFunc)(NpyIter *);
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil
  * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil             # <<<<<<<<<<<<<<
@@ -7773,7 +7773,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_codeobj__59 __pyx_mstate_global->__pyx_codeobj__59
 /* #### Code section: module_code ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7784,7 +7784,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:
  *             return PyDataType_ELSIZE(self)             # <<<<<<<<<<<<<<
@@ -7794,7 +7794,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   __pyx_r = PyDataType_ELSIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7807,7 +7807,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7818,7 +7818,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:
  *             return PyDataType_ALIGNMENT(self)             # <<<<<<<<<<<<<<
@@ -7828,7 +7828,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7841,7 +7841,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -7855,7 +7855,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("fields", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
  *         @property
  *         cdef inline object fields(self):
  *             return <object>PyDataType_FIELDS(self)             # <<<<<<<<<<<<<<
@@ -7868,7 +7868,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   __pyx_r = ((PyObject *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -7883,7 +7883,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -7897,7 +7897,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("names", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
  *         @property
  *         cdef inline tuple names(self):
  *             return <tuple>PyDataType_NAMES(self)             # <<<<<<<<<<<<<<
@@ -7910,7 +7910,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   __pyx_r = ((PyObject*)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -7925,7 +7925,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7936,7 +7936,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
 static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) {
   PyArray_ArrayDescr *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:
  *             return PyDataType_SUBARRAY(self)             # <<<<<<<<<<<<<<
@@ -7946,7 +7946,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   __pyx_r = PyDataType_SUBARRAY(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7959,7 +7959,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7970,7 +7970,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
 static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) {
   npy_uint64 __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
  *         cdef inline npy_uint64 flags(self) noexcept nogil:
  *             """The data types flags."""
  *             return PyDataType_FLAGS(self)             # <<<<<<<<<<<<<<
@@ -7980,7 +7980,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   __pyx_r = PyDataType_FLAGS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -7993,7 +7993,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8004,7 +8004,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
  *         cdef inline int numiter(self) noexcept nogil:
  *             """The number of arrays that need to be broadcast to the same shape."""
  *             return PyArray_MultiIter_NUMITER(self)             # <<<<<<<<<<<<<<
@@ -8014,7 +8014,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8027,7 +8027,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8038,7 +8038,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
  *         cdef inline npy_intp size(self) noexcept nogil:
  *             """The total broadcasted size."""
  *             return PyArray_MultiIter_SIZE(self)             # <<<<<<<<<<<<<<
@@ -8048,7 +8048,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8061,7 +8061,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8072,7 +8072,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
  *         cdef inline npy_intp index(self) noexcept nogil:
  *             """The current (1-d) index into the broadcasted result."""
  *             return PyArray_MultiIter_INDEX(self)             # <<<<<<<<<<<<<<
@@ -8082,7 +8082,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8095,7 +8095,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8106,7 +8106,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
  *         cdef inline int nd(self) noexcept nogil:
  *             """The number of dimensions in the broadcasted result."""
  *             return PyArray_MultiIter_NDIM(self)             # <<<<<<<<<<<<<<
@@ -8116,7 +8116,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8129,7 +8129,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8140,7 +8140,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:
  *             """The shape of the broadcasted result."""
  *             return PyArray_MultiIter_DIMS(self)             # <<<<<<<<<<<<<<
@@ -8150,7 +8150,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8163,7 +8163,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8174,7 +8174,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
 static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) {
   void **__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
  *             """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
  *             On return, the iterators are adjusted for broadcasting."""
  *             return PyArray_MultiIter_ITERS(self)             # <<<<<<<<<<<<<<
@@ -8184,7 +8184,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8197,7 +8197,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8208,7 +8208,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -8218,7 +8218,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8231,7 +8231,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -8245,7 +8245,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -8258,7 +8258,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -8273,7 +8273,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8284,7 +8284,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -8294,7 +8294,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8307,7 +8307,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8318,7 +8318,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -8328,7 +8328,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8341,7 +8341,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8352,7 +8352,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -8362,7 +8362,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8375,7 +8375,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8386,7 +8386,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -8396,7 +8396,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8409,7 +8409,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8420,7 +8420,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -8430,7 +8430,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -8443,7 +8443,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -8460,7 +8460,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -8474,7 +8474,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -8493,7 +8493,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -8510,7 +8510,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -8524,7 +8524,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -8543,7 +8543,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -8560,7 +8560,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -8574,7 +8574,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -8593,7 +8593,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -8610,7 +8610,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -8624,7 +8624,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -8643,7 +8643,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -8660,7 +8660,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -8674,7 +8674,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -8693,7 +8693,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -8708,7 +8708,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   PyObject *__pyx_t_2;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -8718,7 +8718,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -8731,7 +8731,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_t_2);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -8740,7 +8740,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -8754,7 +8754,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -8769,7 +8769,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -8783,7 +8783,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -8792,7 +8792,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -8801,7 +8801,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 1012, __pyx_L1_error)
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -8816,7 +8816,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -8831,7 +8831,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -8840,7 +8840,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -8850,7 +8850,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -8861,7 +8861,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -8870,7 +8870,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -8882,7 +8882,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -8897,7 +8897,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -8921,7 +8921,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -8937,7 +8937,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -8946,7 +8946,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1024, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -8960,7 +8960,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -8975,7 +8975,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -8990,7 +8990,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9006,7 +9006,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -9029,7 +9029,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -9053,7 +9053,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9069,7 +9069,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -9078,7 +9078,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1030, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9092,7 +9092,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -9107,7 +9107,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -9122,7 +9122,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9138,7 +9138,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -9161,7 +9161,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -9185,7 +9185,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9201,7 +9201,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -9210,7 +9210,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1036, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9224,7 +9224,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -9239,7 +9239,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -9254,7 +9254,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -9270,7 +9270,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -9293,7 +9293,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -9304,7 +9304,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -9314,7 +9314,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -9327,7 +9327,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -9338,7 +9338,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -9348,7 +9348,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -9361,7 +9361,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -9372,7 +9372,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -9382,7 +9382,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -9395,7 +9395,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -9406,7 +9406,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -9416,7 +9416,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -9429,7 +9429,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -9440,7 +9440,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -9450,7 +9450,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -23369,7 +23369,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -23380,7 +23380,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
diff --git a/pyart/map/__init__.py b/pyart/map/__init__.py
index 7ee9c56f9..7a9b8bc76 100644
--- a/pyart/map/__init__.py
+++ b/pyart/map/__init__.py
@@ -1,33 +1,7 @@
 """
-==========================
-Mapping (:mod:`pyart.map`)
-==========================
-
-.. current modules:: pyart.map
-
 Py-ART has a robust function for mapping radar data from the collected radar
 coordinates to Cartesian coordinates.
 
-Mapping to grid
-============
-
-.. autosummary::
-    :toctree: generated/
-
-    grid_from_radars
-    map_to_grid
-    map_gates_to_grid
-
-Examples of ROI (region of interest)
-============
-
-.. autosummary::
-    :toctree: generated/
-
-    example_roi_func_constant
-    example_roi_func_dist
-    example_roi_func_dist_beam
-
 """
 
 from .gate_mapper import GateMapper  # noqa
@@ -39,4 +13,4 @@
 from .polar_to_cartesian import get_earth_radius #noqa
 from .gates_to_grid import map_gates_to_grid #noqa
 
-__all__ = [s for s in dir() if not s.startswith('_')]
+__all__ = [s for s in dir() if not s.startswith("_")]
diff --git a/pyart/map/_gate_to_grid_map.c b/pyart/map/_gate_to_grid_map.c
index 238504012..59fe3b276 100644
--- a/pyart/map/_gate_to_grid_map.c
+++ b/pyart/map/_gate_to_grid_map.c
@@ -1653,7 +1653,7 @@ struct __pyx_MemviewEnum_obj;
 struct __pyx_memoryview_obj;
 struct __pyx_memoryviewslice_obj;
 
-/* "pyart/map/_gate_to_grid_map.pyx":35
+/* "pyart/map/_gate_to_grid_map.pyx":24
  * # This definition can be added to a .pxd file so others can defined fast
  * # RoI functions
  * cdef class RoIFunction:             # <<<<<<<<<<<<<<
@@ -1666,7 +1666,7 @@ struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction {
 };
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":43
+/* "pyart/map/_gate_to_grid_map.pyx":32
  * 
  * 
  * cdef class ConstantRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1679,7 +1679,7 @@ struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_ConstantRoI {
 };
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":57
+/* "pyart/map/_gate_to_grid_map.pyx":46
  * 
  * 
  * cdef class DistRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1696,7 +1696,7 @@ struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI {
 };
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":105
+/* "pyart/map/_gate_to_grid_map.pyx":94
  * 
  * 
  * cdef class DistBeamRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1705,15 +1705,15 @@ struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI {
  */
 struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI {
   struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction __pyx_base;
-  float h_factor;
   float min_radius;
   float beam_factor;
   int num_offsets;
   __Pyx_memviewslice offsets;
+  __Pyx_memviewslice h_factor;
 };
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":157
+/* "pyart/map/_gate_to_grid_map.pyx":149
  * 
  * 
  * cdef class GateToGridMapper:             # <<<<<<<<<<<<<<
@@ -1735,6 +1735,7 @@ struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper {
   int nfields;
   __Pyx_memviewslice grid_sum;
   __Pyx_memviewslice grid_wsum;
+  __Pyx_memviewslice min_dist2;
 };
 
 
@@ -1829,7 +1830,7 @@ struct __pyx_vtabstruct_array {
 static struct __pyx_vtabstruct_array *__pyx_vtabptr_array;
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":35
+/* "pyart/map/_gate_to_grid_map.pyx":24
  * # This definition can be added to a .pxd file so others can defined fast
  * # RoI functions
  * cdef class RoIFunction:             # <<<<<<<<<<<<<<
@@ -1843,7 +1844,7 @@ struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction {
 static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction;
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":43
+/* "pyart/map/_gate_to_grid_map.pyx":32
  * 
  * 
  * cdef class ConstantRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1857,7 +1858,7 @@ struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_ConstantRoI {
 static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_ConstantRoI *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_ConstantRoI;
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":57
+/* "pyart/map/_gate_to_grid_map.pyx":46
  * 
  * 
  * cdef class DistRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1871,7 +1872,7 @@ struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_DistRoI {
 static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_DistRoI *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistRoI;
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":105
+/* "pyart/map/_gate_to_grid_map.pyx":94
  * 
  * 
  * cdef class DistBeamRoI(RoIFunction):             # <<<<<<<<<<<<<<
@@ -1885,7 +1886,7 @@ struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_DistBeamRoI {
 static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistBeamRoI;
 
 
-/* "pyart/map/_gate_to_grid_map.pyx":157
+/* "pyart/map/_gate_to_grid_map.pyx":149
  * 
  * 
  * cdef class GateToGridMapper:             # <<<<<<<<<<<<<<
@@ -1894,7 +1895,7 @@ static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__py
  */
 
 struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_GateToGridMapper {
-  int (*map_gate)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *, float, float, float, float, __Pyx_memviewslice, __Pyx_memviewslice, int);
+  int (*map_gate)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *, float, float, float, float, __Pyx_memviewslice, __Pyx_memviewslice, int, __Pyx_memviewslice);
 };
 static struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_GateToGridMapper;
 
@@ -2531,14 +2532,6 @@ static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected);
 /* BufferIndexError.proto */
 static void __Pyx_RaiseBufferIndexError(int axis);
 
-/* PyFloatBinop.proto */
-#if !CYTHON_COMPILING_IN_PYPY
-static PyObject* __Pyx_PyFloat_TrueDivideObjC(PyObject *op1, PyObject *op2, double floatval, int inplace, int zerodivision_check);
-#else
-#define __Pyx_PyFloat_TrueDivideObjC(op1, op2, floatval, inplace, zerodivision_check)\
-    (inplace ? PyNumber_InPlaceTrueDivide(op1, op2) : PyNumber_TrueDivide(op1, op2))
-#endif
-
 /* PyObject_GenericGetAttrNoDict.proto */
 #if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
 static CYTHON_INLINE PyObject* __Pyx_PyObject_GenericGetAttrNoDict(PyObject* obj, PyObject* attr_name);
@@ -2823,9 +2816,19 @@ static int __Pyx_ValidateAndInit_memviewslice(
 /* ObjectToMemviewSlice.proto */
 static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_dsds_float(PyObject *, int writable_flag);
 
+/* ObjectToMemviewSlice.proto */
+static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_dc_float(PyObject *, int writable_flag);
+
 /* ObjectToMemviewSlice.proto */
 static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(PyObject *, int writable_flag);
 
+/* MemviewDtypeToObject.proto */
+static CYTHON_INLINE PyObject *__pyx_memview_get_double(const char *itemp);
+static CYTHON_INLINE int __pyx_memview_set_double(const char *itemp, PyObject *obj);
+
+/* ObjectToMemviewSlice.proto */
+static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_dsdsdsds_double(PyObject *, int writable_flag);
+
 /* ObjectToMemviewSlice.proto */
 static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(PyObject *, int writable_flag);
 
@@ -2922,9 +2925,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(CYTHO
 static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_ConstantRoI *__pyx_v_self, CYTHON_UNUSED float __pyx_v_z, CYTHON_UNUSED float __pyx_v_y, CYTHON_UNUSED float __pyx_v_x, int __pyx_skip_dispatch); /* proto*/
 static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI *__pyx_v_self, float __pyx_v_z, float __pyx_v_y, float __pyx_v_x, int __pyx_skip_dispatch); /* proto*/
 static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, float __pyx_v_z, float __pyx_v_y, float __pyx_v_x, int __pyx_skip_dispatch); /* proto*/
-static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, float __pyx_v_x, float __pyx_v_y, float __pyx_v_z, float __pyx_v_roi, __Pyx_memviewslice __pyx_v_values, __Pyx_memviewslice __pyx_v_masks, int __pyx_v_weighting_function); /* proto*/
-
-/* Module declarations from "libc.math" */
+static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, float __pyx_v_x, float __pyx_v_y, float __pyx_v_z, float __pyx_v_roi, __Pyx_memviewslice __pyx_v_values, __Pyx_memviewslice __pyx_v_masks, int __pyx_v_weighting_function, __Pyx_memviewslice __pyx_v_dist_factor); /* proto*/
 
 /* Module declarations from "cython.view" */
 
@@ -2932,6 +2933,8 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
 
 /* Module declarations from "cython" */
 
+/* Module declarations from "libc.math" */
+
 /* Module declarations from "pyart.map._gate_to_grid_map" */
 static int __pyx_v_5pyart_3map_17_gate_to_grid_map_BARNES2;
 static int __pyx_v_5pyart_3map_17_gate_to_grid_map_NEAREST;
@@ -2990,6 +2993,7 @@ static void __pyx_memoryview__slice_assign_scalar(char *, Py_ssize_t *, Py_ssize
 static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *, PyObject *); /*proto*/
 /* #### Code section: typeinfo ### */
 static __Pyx_TypeInfo __Pyx_TypeInfo_float = { "float", NULL, sizeof(float), { 0 }, 0, 'R', 0, 0 };
+static __Pyx_TypeInfo __Pyx_TypeInfo_double = { "double", NULL, sizeof(double), { 0 }, 0, 'R', 0, 0 };
 static __Pyx_TypeInfo __Pyx_TypeInfo_char = { "char", NULL, sizeof(char), { 0 }, 0, 'H', __PYX_IS_UNSIGNED(char), 0 };
 /* #### Code section: before_global_var ### */
 #define __Pyx_MODULE_NAME "pyart.map._gate_to_grid_map"
@@ -3026,6 +3030,7 @@ static const char __pyx_k_ix[] = "ix";
 static const char __pyx_k_iy[] = "iy";
 static const char __pyx_k_iz[] = "iz";
 static const char __pyx_k_nb[] = "nb";
+static const char __pyx_k_np[] = "np";
 static const char __pyx_k__51[] = "?";
 static const char __pyx_k_abc[] = "abc";
 static const char __pyx_k_and[] = " and ";
@@ -3035,7 +3040,6 @@ static const char __pyx_k_new[] = "__new__";
 static const char __pyx_k_obj[] = "obj";
 static const char __pyx_k_roi[] = "roi";
 static const char __pyx_k_sys[] = "sys";
-static const char __pyx_k_toa[] = "toa";
 static const char __pyx_k_base[] = "base";
 static const char __pyx_k_dict[] = "__dict__";
 static const char __pyx_k_main[] = "__main__";
@@ -3043,6 +3047,7 @@ static const char __pyx_k_mode[] = "mode";
 static const char __pyx_k_name[] = "name";
 static const char __pyx_k_ndim[] = "ndim";
 static const char __pyx_k_nray[] = "nray";
+static const char __pyx_k_ones[] = "ones";
 static const char __pyx_k_pack[] = "pack";
 static const char __pyx_k_self[] = "self";
 static const char __pyx_k_size[] = "size";
@@ -3059,6 +3064,7 @@ static const char __pyx_k_index[] = "index";
 static const char __pyx_k_masks[] = "masks";
 static const char __pyx_k_ngate[] = "ngate";
 static const char __pyx_k_nrays[] = "nrays";
+static const char __pyx_k_numpy[] = "numpy";
 static const char __pyx_k_range[] = "range";
 static const char __pyx_k_shape[] = "shape";
 static const char __pyx_k_start[] = "start";
@@ -3119,6 +3125,7 @@ static const char __pyx_k_MemoryError[] = "MemoryError";
 static const char __pyx_k_PickleError[] = "PickleError";
 static const char __pyx_k_RoIFunction[] = "RoIFunction";
 static const char __pyx_k_collections[] = "collections";
+static const char __pyx_k_dist_factor[] = "dist_factor";
 static const char __pyx_k_grid_starts[] = "grid_starts";
 static const char __pyx_k_constant_roi[] = "constant_roi";
 static const char __pyx_k_initializing[] = "_initializing";
@@ -3176,7 +3183,7 @@ static const char __pyx_k_RoIFunction___setstate_cython[] = "RoIFunction.__setst
 static const char __pyx_k_pyx_unpickle_GateToGridMapper[] = "__pyx_unpickle_GateToGridMapper";
 static const char __pyx_k_unable_to_allocate_array_data[] = "unable to allocate array data.";
 static const char __pyx_k_strided_and_direct_or_indirect[] = "<strided and direct or indirect>";
-static const char __pyx_k_pyart_map__gate_to_grid_map_Cyt[] = "\npyart.map._gate_to_grid_map\n===========================\n\nCython classes and functions for efficient mapping of radar gates to\na uniform grid.\n\n.. autosummary::\n    :toctree: generated/\n    :template: dev_template.rst\n\n    GateToGridMapper\n    RoIFunction\n    ConstantRoI\n    DistRoI\n    DistBeamRoI\n\n";
+static const char __pyx_k_Cython_classes_and_functions_fo[] = "\nCython classes and functions for efficient mapping of radar gates to\na uniform grid.\n\n";
 static const char __pyx_k_pyart_map__gate_to_grid_map_pyx[] = "pyart/map/_gate_to_grid_map.pyx";
 static const char __pyx_k_All_dimensions_preceding_dimensi[] = "All dimensions preceding dimension %d must be indexed and not sliced";
 static const char __pyx_k_Buffer_view_does_not_expose_stri[] = "Buffer view does not expose strides";
@@ -3201,7 +3208,7 @@ static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_2[] = "Incompatible c
 static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_3[] = "Incompatible checksums (0x%x vs (0xd59f0cc, 0xcba260c, 0xda0a3de) = (constant_roi))";
 static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_4[] = "Incompatible checksums (0x%x vs (0xc008385, 0xfc69094, 0x2e2cfc7) = (min_radius, num_offsets, offsets, xy_factor, z_factor))";
 static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_5[] = "Incompatible checksums (0x%x vs (0xb113c79, 0x45aa0ff, 0x7f69f63) = (beam_factor, h_factor, min_radius, num_offsets, offsets))";
-static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_6[] = "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))";
+static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_6[] = "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))";
 /* #### Code section: decls ### */
 static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __pyx_array_obj *__pyx_v_self, PyObject *__pyx_v_shape, Py_ssize_t __pyx_v_itemsize, PyObject *__pyx_v_format, PyObject *__pyx_v_mode, int __pyx_v_allocate_buffer); /* proto */
 static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array_2__getbuffer__(struct __pyx_array_obj *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); /* proto */
@@ -3255,13 +3262,13 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI_2get_roi(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI *__pyx_v_self, float __pyx_v_z, float __pyx_v_y, float __pyx_v_x); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI_4__reduce_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI_6__setstate_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistRoI *__pyx_v_self, PyObject *__pyx_v___pyx_state); /* proto */
-static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, PyObject *__pyx_v_h_factor, PyObject *__pyx_v_nb, PyObject *__pyx_v_bsp, PyObject *__pyx_v_min_radius, PyObject *__pyx_v_offsets); /* proto */
+static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, __Pyx_memviewslice __pyx_v_h_factor, float __pyx_v_nb, float __pyx_v_bsp, float __pyx_v_min_radius, PyObject *__pyx_v_offsets); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_2get_roi(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, float __pyx_v_z, float __pyx_v_y, float __pyx_v_x); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_4__reduce_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_6__setstate_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, PyObject *__pyx_v___pyx_state); /* proto */
 static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, PyObject *__pyx_v_grid_shape, PyObject *__pyx_v_grid_starts, PyObject *__pyx_v_grid_steps, __Pyx_memviewslice __pyx_v_grid_sum, __Pyx_memviewslice __pyx_v_grid_wsum); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2find_roi_for_grid(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, __Pyx_memviewslice __pyx_v_roi_array, struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func); /* proto */
-static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, int __pyx_v_ngates, int __pyx_v_nrays, __Pyx_memviewslice __pyx_v_gate_z, __Pyx_memviewslice __pyx_v_gate_y, __Pyx_memviewslice __pyx_v_gate_x, __Pyx_memviewslice __pyx_v_field_data, __Pyx_memviewslice __pyx_v_field_mask, __Pyx_memviewslice __pyx_v_excluded_gates, CYTHON_UNUSED float __pyx_v_toa, struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func, int __pyx_v_weighting_function); /* proto */
+static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, int __pyx_v_ngates, int __pyx_v_nrays, __Pyx_memviewslice __pyx_v_gate_z, __Pyx_memviewslice __pyx_v_gate_y, __Pyx_memviewslice __pyx_v_gate_x, __Pyx_memviewslice __pyx_v_field_data, __Pyx_memviewslice __pyx_v_field_mask, __Pyx_memviewslice __pyx_v_excluded_gates, struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func, int __pyx_v_weighting_function, __Pyx_memviewslice __pyx_v_dist_factor); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__reduce_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_8__setstate_cython__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, PyObject *__pyx_v___pyx_state); /* proto */
 static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_RoIFunction(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state); /* proto */
@@ -3415,6 +3422,7 @@ typedef struct {
   PyObject *__pyx_n_s_dict;
   PyObject *__pyx_n_s_dict_2;
   PyObject *__pyx_kp_u_disable;
+  PyObject *__pyx_n_s_dist_factor;
   PyObject *__pyx_n_s_dtype_is_object;
   PyObject *__pyx_kp_u_enable;
   PyObject *__pyx_n_s_encode;
@@ -3468,10 +3476,13 @@ typedef struct {
   PyObject *__pyx_n_s_ngate;
   PyObject *__pyx_n_s_ngates;
   PyObject *__pyx_kp_s_no_default___reduce___due_to_non;
+  PyObject *__pyx_n_s_np;
   PyObject *__pyx_n_s_nray;
   PyObject *__pyx_n_s_nrays;
+  PyObject *__pyx_n_s_numpy;
   PyObject *__pyx_n_s_obj;
   PyObject *__pyx_n_s_offsets;
+  PyObject *__pyx_n_s_ones;
   PyObject *__pyx_n_s_pack;
   PyObject *__pyx_n_s_pickle;
   PyObject *__pyx_n_s_pyart_map__gate_to_grid_map;
@@ -3513,7 +3524,6 @@ typedef struct {
   PyObject *__pyx_n_s_struct;
   PyObject *__pyx_n_s_sys;
   PyObject *__pyx_n_s_test;
-  PyObject *__pyx_n_s_toa;
   PyObject *__pyx_kp_s_unable_to_allocate_array_data;
   PyObject *__pyx_kp_s_unable_to_allocate_shape_and_str;
   PyObject *__pyx_n_s_unpack;
@@ -3527,19 +3537,20 @@ typedef struct {
   PyObject *__pyx_n_s_y;
   PyObject *__pyx_n_s_z;
   PyObject *__pyx_n_s_z_factor;
-  PyObject *__pyx_float_180_;
+  PyObject *__pyx_float_1e30;
   PyObject *__pyx_int_0;
   PyObject *__pyx_int_1;
   PyObject *__pyx_int_3;
+  PyObject *__pyx_int_35832270;
   PyObject *__pyx_int_48418759;
   PyObject *__pyx_int_73048319;
+  PyObject *__pyx_int_83476354;
   PyObject *__pyx_int_112105877;
-  PyObject *__pyx_int_116532122;
   PyObject *__pyx_int_133603171;
   PyObject *__pyx_int_136983863;
   PyObject *__pyx_int_184977713;
   PyObject *__pyx_int_185678969;
-  PyObject *__pyx_int_194171105;
+  PyObject *__pyx_int_199775785;
   PyObject *__pyx_int_201360261;
   PyObject *__pyx_int_213526028;
   PyObject *__pyx_int_222419149;
@@ -3547,7 +3558,6 @@ typedef struct {
   PyObject *__pyx_int_228631518;
   PyObject *__pyx_int_228825662;
   PyObject *__pyx_int_238750788;
-  PyObject *__pyx_int_264605129;
   PyObject *__pyx_int_264671380;
   PyObject *__pyx_int_neg_1;
   PyObject *__pyx_slice__5;
@@ -3737,6 +3747,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_dict);
   Py_CLEAR(clear_module_state->__pyx_n_s_dict_2);
   Py_CLEAR(clear_module_state->__pyx_kp_u_disable);
+  Py_CLEAR(clear_module_state->__pyx_n_s_dist_factor);
   Py_CLEAR(clear_module_state->__pyx_n_s_dtype_is_object);
   Py_CLEAR(clear_module_state->__pyx_kp_u_enable);
   Py_CLEAR(clear_module_state->__pyx_n_s_encode);
@@ -3790,10 +3801,13 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_ngate);
   Py_CLEAR(clear_module_state->__pyx_n_s_ngates);
   Py_CLEAR(clear_module_state->__pyx_kp_s_no_default___reduce___due_to_non);
+  Py_CLEAR(clear_module_state->__pyx_n_s_np);
   Py_CLEAR(clear_module_state->__pyx_n_s_nray);
   Py_CLEAR(clear_module_state->__pyx_n_s_nrays);
+  Py_CLEAR(clear_module_state->__pyx_n_s_numpy);
   Py_CLEAR(clear_module_state->__pyx_n_s_obj);
   Py_CLEAR(clear_module_state->__pyx_n_s_offsets);
+  Py_CLEAR(clear_module_state->__pyx_n_s_ones);
   Py_CLEAR(clear_module_state->__pyx_n_s_pack);
   Py_CLEAR(clear_module_state->__pyx_n_s_pickle);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyart_map__gate_to_grid_map);
@@ -3835,7 +3849,6 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_struct);
   Py_CLEAR(clear_module_state->__pyx_n_s_sys);
   Py_CLEAR(clear_module_state->__pyx_n_s_test);
-  Py_CLEAR(clear_module_state->__pyx_n_s_toa);
   Py_CLEAR(clear_module_state->__pyx_kp_s_unable_to_allocate_array_data);
   Py_CLEAR(clear_module_state->__pyx_kp_s_unable_to_allocate_shape_and_str);
   Py_CLEAR(clear_module_state->__pyx_n_s_unpack);
@@ -3849,19 +3862,20 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_y);
   Py_CLEAR(clear_module_state->__pyx_n_s_z);
   Py_CLEAR(clear_module_state->__pyx_n_s_z_factor);
-  Py_CLEAR(clear_module_state->__pyx_float_180_);
+  Py_CLEAR(clear_module_state->__pyx_float_1e30);
   Py_CLEAR(clear_module_state->__pyx_int_0);
   Py_CLEAR(clear_module_state->__pyx_int_1);
   Py_CLEAR(clear_module_state->__pyx_int_3);
+  Py_CLEAR(clear_module_state->__pyx_int_35832270);
   Py_CLEAR(clear_module_state->__pyx_int_48418759);
   Py_CLEAR(clear_module_state->__pyx_int_73048319);
+  Py_CLEAR(clear_module_state->__pyx_int_83476354);
   Py_CLEAR(clear_module_state->__pyx_int_112105877);
-  Py_CLEAR(clear_module_state->__pyx_int_116532122);
   Py_CLEAR(clear_module_state->__pyx_int_133603171);
   Py_CLEAR(clear_module_state->__pyx_int_136983863);
   Py_CLEAR(clear_module_state->__pyx_int_184977713);
   Py_CLEAR(clear_module_state->__pyx_int_185678969);
-  Py_CLEAR(clear_module_state->__pyx_int_194171105);
+  Py_CLEAR(clear_module_state->__pyx_int_199775785);
   Py_CLEAR(clear_module_state->__pyx_int_201360261);
   Py_CLEAR(clear_module_state->__pyx_int_213526028);
   Py_CLEAR(clear_module_state->__pyx_int_222419149);
@@ -3869,7 +3883,6 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_int_228631518);
   Py_CLEAR(clear_module_state->__pyx_int_228825662);
   Py_CLEAR(clear_module_state->__pyx_int_238750788);
-  Py_CLEAR(clear_module_state->__pyx_int_264605129);
   Py_CLEAR(clear_module_state->__pyx_int_264671380);
   Py_CLEAR(clear_module_state->__pyx_int_neg_1);
   Py_CLEAR(clear_module_state->__pyx_slice__5);
@@ -4037,6 +4050,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_dict);
   Py_VISIT(traverse_module_state->__pyx_n_s_dict_2);
   Py_VISIT(traverse_module_state->__pyx_kp_u_disable);
+  Py_VISIT(traverse_module_state->__pyx_n_s_dist_factor);
   Py_VISIT(traverse_module_state->__pyx_n_s_dtype_is_object);
   Py_VISIT(traverse_module_state->__pyx_kp_u_enable);
   Py_VISIT(traverse_module_state->__pyx_n_s_encode);
@@ -4090,10 +4104,13 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_ngate);
   Py_VISIT(traverse_module_state->__pyx_n_s_ngates);
   Py_VISIT(traverse_module_state->__pyx_kp_s_no_default___reduce___due_to_non);
+  Py_VISIT(traverse_module_state->__pyx_n_s_np);
   Py_VISIT(traverse_module_state->__pyx_n_s_nray);
   Py_VISIT(traverse_module_state->__pyx_n_s_nrays);
+  Py_VISIT(traverse_module_state->__pyx_n_s_numpy);
   Py_VISIT(traverse_module_state->__pyx_n_s_obj);
   Py_VISIT(traverse_module_state->__pyx_n_s_offsets);
+  Py_VISIT(traverse_module_state->__pyx_n_s_ones);
   Py_VISIT(traverse_module_state->__pyx_n_s_pack);
   Py_VISIT(traverse_module_state->__pyx_n_s_pickle);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyart_map__gate_to_grid_map);
@@ -4135,7 +4152,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_struct);
   Py_VISIT(traverse_module_state->__pyx_n_s_sys);
   Py_VISIT(traverse_module_state->__pyx_n_s_test);
-  Py_VISIT(traverse_module_state->__pyx_n_s_toa);
   Py_VISIT(traverse_module_state->__pyx_kp_s_unable_to_allocate_array_data);
   Py_VISIT(traverse_module_state->__pyx_kp_s_unable_to_allocate_shape_and_str);
   Py_VISIT(traverse_module_state->__pyx_n_s_unpack);
@@ -4149,19 +4165,20 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_y);
   Py_VISIT(traverse_module_state->__pyx_n_s_z);
   Py_VISIT(traverse_module_state->__pyx_n_s_z_factor);
-  Py_VISIT(traverse_module_state->__pyx_float_180_);
+  Py_VISIT(traverse_module_state->__pyx_float_1e30);
   Py_VISIT(traverse_module_state->__pyx_int_0);
   Py_VISIT(traverse_module_state->__pyx_int_1);
   Py_VISIT(traverse_module_state->__pyx_int_3);
+  Py_VISIT(traverse_module_state->__pyx_int_35832270);
   Py_VISIT(traverse_module_state->__pyx_int_48418759);
   Py_VISIT(traverse_module_state->__pyx_int_73048319);
+  Py_VISIT(traverse_module_state->__pyx_int_83476354);
   Py_VISIT(traverse_module_state->__pyx_int_112105877);
-  Py_VISIT(traverse_module_state->__pyx_int_116532122);
   Py_VISIT(traverse_module_state->__pyx_int_133603171);
   Py_VISIT(traverse_module_state->__pyx_int_136983863);
   Py_VISIT(traverse_module_state->__pyx_int_184977713);
   Py_VISIT(traverse_module_state->__pyx_int_185678969);
-  Py_VISIT(traverse_module_state->__pyx_int_194171105);
+  Py_VISIT(traverse_module_state->__pyx_int_199775785);
   Py_VISIT(traverse_module_state->__pyx_int_201360261);
   Py_VISIT(traverse_module_state->__pyx_int_213526028);
   Py_VISIT(traverse_module_state->__pyx_int_222419149);
@@ -4169,7 +4186,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_int_228631518);
   Py_VISIT(traverse_module_state->__pyx_int_228825662);
   Py_VISIT(traverse_module_state->__pyx_int_238750788);
-  Py_VISIT(traverse_module_state->__pyx_int_264605129);
   Py_VISIT(traverse_module_state->__pyx_int_264671380);
   Py_VISIT(traverse_module_state->__pyx_int_neg_1);
   Py_VISIT(traverse_module_state->__pyx_slice__5);
@@ -4355,6 +4371,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_dict __pyx_mstate_global->__pyx_n_s_dict
 #define __pyx_n_s_dict_2 __pyx_mstate_global->__pyx_n_s_dict_2
 #define __pyx_kp_u_disable __pyx_mstate_global->__pyx_kp_u_disable
+#define __pyx_n_s_dist_factor __pyx_mstate_global->__pyx_n_s_dist_factor
 #define __pyx_n_s_dtype_is_object __pyx_mstate_global->__pyx_n_s_dtype_is_object
 #define __pyx_kp_u_enable __pyx_mstate_global->__pyx_kp_u_enable
 #define __pyx_n_s_encode __pyx_mstate_global->__pyx_n_s_encode
@@ -4408,10 +4425,13 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_ngate __pyx_mstate_global->__pyx_n_s_ngate
 #define __pyx_n_s_ngates __pyx_mstate_global->__pyx_n_s_ngates
 #define __pyx_kp_s_no_default___reduce___due_to_non __pyx_mstate_global->__pyx_kp_s_no_default___reduce___due_to_non
+#define __pyx_n_s_np __pyx_mstate_global->__pyx_n_s_np
 #define __pyx_n_s_nray __pyx_mstate_global->__pyx_n_s_nray
 #define __pyx_n_s_nrays __pyx_mstate_global->__pyx_n_s_nrays
+#define __pyx_n_s_numpy __pyx_mstate_global->__pyx_n_s_numpy
 #define __pyx_n_s_obj __pyx_mstate_global->__pyx_n_s_obj
 #define __pyx_n_s_offsets __pyx_mstate_global->__pyx_n_s_offsets
+#define __pyx_n_s_ones __pyx_mstate_global->__pyx_n_s_ones
 #define __pyx_n_s_pack __pyx_mstate_global->__pyx_n_s_pack
 #define __pyx_n_s_pickle __pyx_mstate_global->__pyx_n_s_pickle
 #define __pyx_n_s_pyart_map__gate_to_grid_map __pyx_mstate_global->__pyx_n_s_pyart_map__gate_to_grid_map
@@ -4453,7 +4473,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_struct __pyx_mstate_global->__pyx_n_s_struct
 #define __pyx_n_s_sys __pyx_mstate_global->__pyx_n_s_sys
 #define __pyx_n_s_test __pyx_mstate_global->__pyx_n_s_test
-#define __pyx_n_s_toa __pyx_mstate_global->__pyx_n_s_toa
 #define __pyx_kp_s_unable_to_allocate_array_data __pyx_mstate_global->__pyx_kp_s_unable_to_allocate_array_data
 #define __pyx_kp_s_unable_to_allocate_shape_and_str __pyx_mstate_global->__pyx_kp_s_unable_to_allocate_shape_and_str
 #define __pyx_n_s_unpack __pyx_mstate_global->__pyx_n_s_unpack
@@ -4467,19 +4486,20 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_y __pyx_mstate_global->__pyx_n_s_y
 #define __pyx_n_s_z __pyx_mstate_global->__pyx_n_s_z
 #define __pyx_n_s_z_factor __pyx_mstate_global->__pyx_n_s_z_factor
-#define __pyx_float_180_ __pyx_mstate_global->__pyx_float_180_
+#define __pyx_float_1e30 __pyx_mstate_global->__pyx_float_1e30
 #define __pyx_int_0 __pyx_mstate_global->__pyx_int_0
 #define __pyx_int_1 __pyx_mstate_global->__pyx_int_1
 #define __pyx_int_3 __pyx_mstate_global->__pyx_int_3
+#define __pyx_int_35832270 __pyx_mstate_global->__pyx_int_35832270
 #define __pyx_int_48418759 __pyx_mstate_global->__pyx_int_48418759
 #define __pyx_int_73048319 __pyx_mstate_global->__pyx_int_73048319
+#define __pyx_int_83476354 __pyx_mstate_global->__pyx_int_83476354
 #define __pyx_int_112105877 __pyx_mstate_global->__pyx_int_112105877
-#define __pyx_int_116532122 __pyx_mstate_global->__pyx_int_116532122
 #define __pyx_int_133603171 __pyx_mstate_global->__pyx_int_133603171
 #define __pyx_int_136983863 __pyx_mstate_global->__pyx_int_136983863
 #define __pyx_int_184977713 __pyx_mstate_global->__pyx_int_184977713
 #define __pyx_int_185678969 __pyx_mstate_global->__pyx_int_185678969
-#define __pyx_int_194171105 __pyx_mstate_global->__pyx_int_194171105
+#define __pyx_int_199775785 __pyx_mstate_global->__pyx_int_199775785
 #define __pyx_int_201360261 __pyx_mstate_global->__pyx_int_201360261
 #define __pyx_int_213526028 __pyx_mstate_global->__pyx_int_213526028
 #define __pyx_int_222419149 __pyx_mstate_global->__pyx_int_222419149
@@ -4487,7 +4507,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_int_228631518 __pyx_mstate_global->__pyx_int_228631518
 #define __pyx_int_228825662 __pyx_mstate_global->__pyx_int_228825662
 #define __pyx_int_238750788 __pyx_mstate_global->__pyx_int_238750788
-#define __pyx_int_264605129 __pyx_mstate_global->__pyx_int_264605129
 #define __pyx_int_264671380 __pyx_mstate_global->__pyx_int_264671380
 #define __pyx_int_neg_1 __pyx_mstate_global->__pyx_int_neg_1
 #define __pyx_slice__5 __pyx_mstate_global->__pyx_slice__5
@@ -18163,7 +18182,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":38
+/* "pyart/map/_gate_to_grid_map.pyx":27
  *     """ A class for storing radius of interest calculations. """
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -18203,14 +18222,14 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(CYTHO
     if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
       PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
       #endif
-      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 38, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 27, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5pyart_3map_17_gate_to_grid_map_11RoIFunction_1get_roi)) {
-        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 38, __pyx_L1_error)
+        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 38, __pyx_L1_error)
+        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 27, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 38, __pyx_L1_error)
+        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 27, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_5);
         __Pyx_INCREF(__pyx_t_1);
         __pyx_t_6 = __pyx_t_1; __pyx_t_7 = NULL;
@@ -18234,11 +18253,11 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(CYTHO
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 27, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         }
-        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L1_error)
+        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L1_error)
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_r = __pyx_t_9;
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -18257,7 +18276,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(CYTHO
     #endif
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":40
+  /* "pyart/map/_gate_to_grid_map.pyx":29
  *     cpdef float get_roi(self, float z, float y, float x):
  *         """ Return the radius of influence for coordinates in meters. """
  *         return 0             # <<<<<<<<<<<<<<
@@ -18267,7 +18286,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(CYTHO
   __pyx_r = 0.0;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":38
+  /* "pyart/map/_gate_to_grid_map.pyx":27
  *     """ A class for storing radius of interest calculations. """
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -18351,7 +18370,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -18359,9 +18378,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 38, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 27, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -18369,14 +18388,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 38, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 27, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 38, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 27, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 3)) {
       goto __pyx_L5_argtuple_error;
@@ -18385,13 +18404,13 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
       values[2] = __Pyx_Arg_FASTCALL(__pyx_args, 2);
     }
-    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
-    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
-    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L3_error)
+    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
+    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
+    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 38, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 27, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -18428,8 +18447,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_roi", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 38, __pyx_L1_error)
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 27, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
@@ -18841,7 +18860,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11RoIFunction_4__setst
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":48
+/* "pyart/map/_gate_to_grid_map.pyx":37
  *     cdef float constant_roi
  * 
  *     def __init__(self, float constant_roi):             # <<<<<<<<<<<<<<
@@ -18889,23 +18908,23 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 48, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 37, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 48, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 37, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
     } else {
       values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
     }
-    __pyx_v_constant_roi = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_constant_roi == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 48, __pyx_L3_error)
+    __pyx_v_constant_roi = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_constant_roi == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 37, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 48, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 37, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -18935,7 +18954,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_1__init__(PyOb
 static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_ConstantRoI *__pyx_v_self, float __pyx_v_constant_roi) {
   int __pyx_r;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":50
+  /* "pyart/map/_gate_to_grid_map.pyx":39
  *     def __init__(self, float constant_roi):
  *         """ intialize. """
  *         self.constant_roi = constant_roi             # <<<<<<<<<<<<<<
@@ -18944,7 +18963,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__(struc
  */
   __pyx_v_self->constant_roi = __pyx_v_constant_roi;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":48
+  /* "pyart/map/_gate_to_grid_map.pyx":37
  *     cdef float constant_roi
  * 
  *     def __init__(self, float constant_roi):             # <<<<<<<<<<<<<<
@@ -18957,7 +18976,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__(struc
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":52
+/* "pyart/map/_gate_to_grid_map.pyx":41
  *         self.constant_roi = constant_roi
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -18997,14 +19016,14 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(struc
     if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
       PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
       #endif
-      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 41, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_3get_roi)) {
-        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 52, __pyx_L1_error)
+        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 41, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 52, __pyx_L1_error)
+        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 41, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 52, __pyx_L1_error)
+        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 41, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_5);
         __Pyx_INCREF(__pyx_t_1);
         __pyx_t_6 = __pyx_t_1; __pyx_t_7 = NULL;
@@ -19028,11 +19047,11 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(struc
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 52, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         }
-        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L1_error)
+        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L1_error)
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_r = __pyx_t_9;
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -19051,7 +19070,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(struc
     #endif
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":54
+  /* "pyart/map/_gate_to_grid_map.pyx":43
  *     cpdef float get_roi(self, float z, float y, float x):
  *         """ Return contstant radius of influence. """
  *         return self.constant_roi             # <<<<<<<<<<<<<<
@@ -19061,7 +19080,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(struc
   __pyx_r = __pyx_v_self->constant_roi;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":52
+  /* "pyart/map/_gate_to_grid_map.pyx":41
  *         self.constant_roi = constant_roi
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -19145,7 +19164,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -19153,9 +19172,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 52, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 41, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -19163,14 +19182,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 52, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 41, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 52, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 41, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 3)) {
       goto __pyx_L5_argtuple_error;
@@ -19179,13 +19198,13 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
       values[2] = __Pyx_Arg_FASTCALL(__pyx_args, 2);
     }
-    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
-    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
-    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L3_error)
+    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
+    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
+    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 52, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 41, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -19222,8 +19241,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_2get_roi
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_roi", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L1_error)
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 52, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
@@ -19642,7 +19661,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_6__setst
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":64
+/* "pyart/map/_gate_to_grid_map.pyx":53
  *     cdef float[:, :] offsets
  * 
  *     def __init__(self, z_factor, xy_factor, min_radius, offsets):             # <<<<<<<<<<<<<<
@@ -19699,7 +19718,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_1__init__(PyObject
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 64, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 53, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -19707,9 +19726,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_1__init__(PyObject
           (void)__Pyx_Arg_NewRef_VARARGS(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 64, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 53, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 1); __PYX_ERR(0, 64, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 1); __PYX_ERR(0, 53, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -19717,9 +19736,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_1__init__(PyObject
           (void)__Pyx_Arg_NewRef_VARARGS(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 64, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 53, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 2); __PYX_ERR(0, 64, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 2); __PYX_ERR(0, 53, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
@@ -19727,14 +19746,14 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_1__init__(PyObject
           (void)__Pyx_Arg_NewRef_VARARGS(values[3]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 64, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 53, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 3); __PYX_ERR(0, 64, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, 3); __PYX_ERR(0, 53, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 64, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 53, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 4)) {
       goto __pyx_L5_argtuple_error;
@@ -19751,7 +19770,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_1__init__(PyObject
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 64, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 4, 4, __pyx_nargs); __PYX_ERR(0, 53, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -19805,91 +19824,91 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":67
+  /* "pyart/map/_gate_to_grid_map.pyx":56
  *         """ initalize. """
  *         cdef int i
  *         self.z_factor = z_factor             # <<<<<<<<<<<<<<
  *         self.xy_factor = xy_factor
  *         self.min_radius = min_radius
  */
-  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_z_factor); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 67, __pyx_L1_error)
+  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_z_factor); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 56, __pyx_L1_error)
   __pyx_v_self->z_factor = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":68
+  /* "pyart/map/_gate_to_grid_map.pyx":57
  *         cdef int i
  *         self.z_factor = z_factor
  *         self.xy_factor = xy_factor             # <<<<<<<<<<<<<<
  *         self.min_radius = min_radius
  * 
  */
-  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_xy_factor); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 68, __pyx_L1_error)
+  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_xy_factor); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 57, __pyx_L1_error)
   __pyx_v_self->xy_factor = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":69
+  /* "pyart/map/_gate_to_grid_map.pyx":58
  *         self.z_factor = z_factor
  *         self.xy_factor = xy_factor
  *         self.min_radius = min_radius             # <<<<<<<<<<<<<<
  * 
  *         self.num_offsets = len(offsets)
  */
-  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_min_radius); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 69, __pyx_L1_error)
+  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_min_radius); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 58, __pyx_L1_error)
   __pyx_v_self->min_radius = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":71
+  /* "pyart/map/_gate_to_grid_map.pyx":60
  *         self.min_radius = min_radius
  * 
  *         self.num_offsets = len(offsets)             # <<<<<<<<<<<<<<
  *         # does this array need to be explicitly de-allocated when the
  *         # class instance is removed?
  */
-  __pyx_t_2 = PyObject_Length(__pyx_v_offsets); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 71, __pyx_L1_error)
+  __pyx_t_2 = PyObject_Length(__pyx_v_offsets); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 60, __pyx_L1_error)
   __pyx_v_self->num_offsets = __pyx_t_2;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":75
+  /* "pyart/map/_gate_to_grid_map.pyx":64
  *         # class instance is removed?
  *         self.offsets = cvarray(
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')             # <<<<<<<<<<<<<<
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  */
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 75, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_self->num_offsets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 75, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_self->num_offsets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 75, __pyx_L1_error)
+  __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4)) __PYX_ERR(0, 75, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4)) __PYX_ERR(0, 64, __pyx_L1_error);
   __Pyx_INCREF(__pyx_int_3);
   __Pyx_GIVEREF(__pyx_int_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_int_3)) __PYX_ERR(0, 75, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_int_3)) __PYX_ERR(0, 64, __pyx_L1_error);
   __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_shape, __pyx_t_5) < 0) __PYX_ERR(0, 75, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_shape, __pyx_t_5) < 0) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyInt_FromSize_t((sizeof(float))); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 75, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_FromSize_t((sizeof(float))); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_itemsize, __pyx_t_5) < 0) __PYX_ERR(0, 75, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_itemsize, __pyx_t_5) < 0) __PYX_ERR(0, 64, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_format, __pyx_n_u_f) < 0) __PYX_ERR(0, 75, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_format, __pyx_n_u_f) < 0) __PYX_ERR(0, 64, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":74
+  /* "pyart/map/_gate_to_grid_map.pyx":63
  *         # does this array need to be explicitly de-allocated when the
  *         # class instance is removed?
  *         self.offsets = cvarray(             # <<<<<<<<<<<<<<
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  */
-  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_array_type), __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 74, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_array_type), __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 63, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_6 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_5, PyBUF_WRITABLE); if (unlikely(!__pyx_t_6.memview)) __PYX_ERR(0, 74, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_5, PyBUF_WRITABLE); if (unlikely(!__pyx_t_6.memview)) __PYX_ERR(0, 63, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->offsets, 0);
   __pyx_v_self->offsets = __pyx_t_6;
   __pyx_t_6.memview = NULL;
   __pyx_t_6.data = NULL;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":77
+  /* "pyart/map/_gate_to_grid_map.pyx":66
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):             # <<<<<<<<<<<<<<
@@ -19902,9 +19921,9 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
     __pyx_t_2 = 0;
     __pyx_t_8 = NULL;
   } else {
-    __pyx_t_2 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_v_offsets); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 77, __pyx_L1_error)
+    __pyx_t_2 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_v_offsets); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 66, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 77, __pyx_L1_error)
+    __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 66, __pyx_L1_error)
   }
   for (;;) {
     if (likely(!__pyx_t_8)) {
@@ -19912,28 +19931,28 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
         {
           Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_5);
           #if !CYTHON_ASSUME_SAFE_MACROS
-          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 77, __pyx_L1_error)
+          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 66, __pyx_L1_error)
           #endif
           if (__pyx_t_2 >= __pyx_temp) break;
         }
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_3 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 77, __pyx_L1_error)
+        __pyx_t_3 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 66, __pyx_L1_error)
         #else
-        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 77, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 66, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         #endif
       } else {
         {
           Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_5);
           #if !CYTHON_ASSUME_SAFE_MACROS
-          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 77, __pyx_L1_error)
+          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 66, __pyx_L1_error)
           #endif
           if (__pyx_t_2 >= __pyx_temp) break;
         }
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 77, __pyx_L1_error)
+        __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 66, __pyx_L1_error)
         #else
-        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 77, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 66, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         #endif
       }
@@ -19943,7 +19962,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
         PyObject* exc_type = PyErr_Occurred();
         if (exc_type) {
           if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-          else __PYX_ERR(0, 77, __pyx_L1_error)
+          else __PYX_ERR(0, 66, __pyx_L1_error)
         }
         break;
       }
@@ -19955,7 +19974,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
       if (unlikely(size != 3)) {
         if (size > 3) __Pyx_RaiseTooManyValuesError(3);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        __PYX_ERR(0, 77, __pyx_L1_error)
+        __PYX_ERR(0, 66, __pyx_L1_error)
       }
       #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
       if (likely(PyTuple_CheckExact(sequence))) {
@@ -19971,17 +19990,17 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
       __Pyx_INCREF(__pyx_t_9);
       __Pyx_INCREF(__pyx_t_10);
       #else
-      __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 77, __pyx_L1_error)
+      __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_9 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 77, __pyx_L1_error)
+      __pyx_t_9 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_9);
-      __pyx_t_10 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 77, __pyx_L1_error)
+      __pyx_t_10 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_10);
       #endif
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     } else {
       Py_ssize_t index = -1;
-      __pyx_t_11 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 77, __pyx_L1_error)
+      __pyx_t_11 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 66, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       __pyx_t_12 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_11);
@@ -19991,7 +20010,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
       __Pyx_GOTREF(__pyx_t_9);
       index = 2; __pyx_t_10 = __pyx_t_12(__pyx_t_11); if (unlikely(!__pyx_t_10)) goto __pyx_L5_unpacking_failed;
       __Pyx_GOTREF(__pyx_t_10);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_11), 3) < 0) __PYX_ERR(0, 77, __pyx_L1_error)
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_11), 3) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
       __pyx_t_12 = NULL;
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       goto __pyx_L6_unpacking_done;
@@ -19999,7 +20018,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       __pyx_t_12 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      __PYX_ERR(0, 77, __pyx_L1_error)
+      __PYX_ERR(0, 66, __pyx_L1_error)
       __pyx_L6_unpacking_done:;
     }
     __Pyx_XDECREF_SET(__pyx_v_z_offset, __pyx_t_4);
@@ -20011,15 +20030,15 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
     __pyx_v_i = __pyx_t_7;
     __pyx_t_7 = (__pyx_t_7 + 1);
 
-    /* "pyart/map/_gate_to_grid_map.pyx":78
+    /* "pyart/map/_gate_to_grid_map.pyx":67
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  *             self.offsets[i, 0] = z_offset             # <<<<<<<<<<<<<<
  *             self.offsets[i, 1] = y_offset
  *             self.offsets[i, 2] = x_offset
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_z_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 78, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 78, __pyx_L1_error)}
+    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_z_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 67, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 67, __pyx_L1_error)}
     __pyx_t_13 = __pyx_v_i;
     __pyx_t_14 = 0;
     __pyx_t_15 = -1;
@@ -20033,19 +20052,19 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
     } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
     if (unlikely(__pyx_t_15 != -1)) {
       __Pyx_RaiseBufferIndexError(__pyx_t_15);
-      __PYX_ERR(0, 78, __pyx_L1_error)
+      __PYX_ERR(0, 67, __pyx_L1_error)
     }
     *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_14 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":79
+    /* "pyart/map/_gate_to_grid_map.pyx":68
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  *             self.offsets[i, 0] = z_offset
  *             self.offsets[i, 1] = y_offset             # <<<<<<<<<<<<<<
  *             self.offsets[i, 2] = x_offset
  * 
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_y_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 79, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 79, __pyx_L1_error)}
+    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_y_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 68, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 68, __pyx_L1_error)}
     __pyx_t_14 = __pyx_v_i;
     __pyx_t_13 = 1;
     __pyx_t_15 = -1;
@@ -20059,19 +20078,19 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
     } else if (unlikely(__pyx_t_13 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
     if (unlikely(__pyx_t_15 != -1)) {
       __Pyx_RaiseBufferIndexError(__pyx_t_15);
-      __PYX_ERR(0, 79, __pyx_L1_error)
+      __PYX_ERR(0, 68, __pyx_L1_error)
     }
     *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_14 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":80
+    /* "pyart/map/_gate_to_grid_map.pyx":69
  *             self.offsets[i, 0] = z_offset
  *             self.offsets[i, 1] = y_offset
  *             self.offsets[i, 2] = x_offset             # <<<<<<<<<<<<<<
  * 
  *     @cython.initializedcheck(False)
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_x_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 80, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 80, __pyx_L1_error)}
+    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_x_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 69, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 69, __pyx_L1_error)}
     __pyx_t_13 = __pyx_v_i;
     __pyx_t_14 = 2;
     __pyx_t_15 = -1;
@@ -20085,11 +20104,11 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
     } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
     if (unlikely(__pyx_t_15 != -1)) {
       __Pyx_RaiseBufferIndexError(__pyx_t_15);
-      __PYX_ERR(0, 80, __pyx_L1_error)
+      __PYX_ERR(0, 69, __pyx_L1_error)
     }
     *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_14 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":77
+    /* "pyart/map/_gate_to_grid_map.pyx":66
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):             # <<<<<<<<<<<<<<
@@ -20099,7 +20118,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
   }
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":64
+  /* "pyart/map/_gate_to_grid_map.pyx":53
  *     cdef float[:, :] offsets
  * 
  *     def __init__(self, z_factor, xy_factor, min_radius, offsets):             # <<<<<<<<<<<<<<
@@ -20128,7 +20147,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__(struct __p
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":86
+/* "pyart/map/_gate_to_grid_map.pyx":75
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -20179,14 +20198,14 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
       PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
       #endif
-      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 86, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5pyart_3map_17_gate_to_grid_map_7DistRoI_3get_roi)) {
-        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 86, __pyx_L1_error)
+        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 75, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 86, __pyx_L1_error)
+        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 75, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 86, __pyx_L1_error)
+        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 75, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_5);
         __Pyx_INCREF(__pyx_t_1);
         __pyx_t_6 = __pyx_t_1; __pyx_t_7 = NULL;
@@ -20210,11 +20229,11 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 75, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         }
-        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L1_error)
+        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L1_error)
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_r = __pyx_t_9;
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -20233,7 +20252,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     #endif
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":91
+  /* "pyart/map/_gate_to_grid_map.pyx":80
  *         cdef int i
  * 
  *         min_roi = 999999999.0             # <<<<<<<<<<<<<<
@@ -20242,7 +20261,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
  */
   __pyx_v_min_roi = 999999999.0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":92
+  /* "pyart/map/_gate_to_grid_map.pyx":81
  * 
  *         min_roi = 999999999.0
  *         for i in range(self.num_offsets):             # <<<<<<<<<<<<<<
@@ -20254,7 +20273,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
   for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
     __pyx_v_i = __pyx_t_11;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":93
+    /* "pyart/map/_gate_to_grid_map.pyx":82
  *         min_roi = 999999999.0
  *         for i in range(self.num_offsets):
  *             z_offset = self.offsets[i, 0]             # <<<<<<<<<<<<<<
@@ -20265,7 +20284,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     __pyx_t_13 = 0;
     __pyx_v_z_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_12 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":94
+    /* "pyart/map/_gate_to_grid_map.pyx":83
  *         for i in range(self.num_offsets):
  *             z_offset = self.offsets[i, 0]
  *             y_offset = self.offsets[i, 1]             # <<<<<<<<<<<<<<
@@ -20276,7 +20295,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     __pyx_t_12 = 1;
     __pyx_v_y_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_12 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":95
+    /* "pyart/map/_gate_to_grid_map.pyx":84
  *             z_offset = self.offsets[i, 0]
  *             y_offset = self.offsets[i, 1]
  *             x_offset = self.offsets[i, 2]             # <<<<<<<<<<<<<<
@@ -20287,7 +20306,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     __pyx_t_13 = 2;
     __pyx_v_x_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_12 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":96
+    /* "pyart/map/_gate_to_grid_map.pyx":85
  *             y_offset = self.offsets[i, 1]
  *             x_offset = self.offsets[i, 2]
  *             roi = (self.z_factor * (z - z_offset) + self.xy_factor *             # <<<<<<<<<<<<<<
@@ -20296,7 +20315,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
  */
     __pyx_v_roi = ((__pyx_v_self->z_factor * (__pyx_v_z - __pyx_v_z_offset)) + (__pyx_v_self->xy_factor * sqrt((powf((__pyx_v_x - __pyx_v_x_offset), 2.0) + powf((__pyx_v_y - __pyx_v_y_offset), 2.0)))));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":98
+    /* "pyart/map/_gate_to_grid_map.pyx":87
  *             roi = (self.z_factor * (z - z_offset) + self.xy_factor *
  *                    sqrt((x - x_offset)**2 + (y - y_offset)**2))
  *             if roi < self.min_radius:             # <<<<<<<<<<<<<<
@@ -20306,7 +20325,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     __pyx_t_14 = (__pyx_v_roi < __pyx_v_self->min_radius);
     if (__pyx_t_14) {
 
-      /* "pyart/map/_gate_to_grid_map.pyx":99
+      /* "pyart/map/_gate_to_grid_map.pyx":88
  *                    sqrt((x - x_offset)**2 + (y - y_offset)**2))
  *             if roi < self.min_radius:
  *                 roi = self.min_radius             # <<<<<<<<<<<<<<
@@ -20316,7 +20335,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
       __pyx_t_9 = __pyx_v_self->min_radius;
       __pyx_v_roi = __pyx_t_9;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":98
+      /* "pyart/map/_gate_to_grid_map.pyx":87
  *             roi = (self.z_factor * (z - z_offset) + self.xy_factor *
  *                    sqrt((x - x_offset)**2 + (y - y_offset)**2))
  *             if roi < self.min_radius:             # <<<<<<<<<<<<<<
@@ -20325,7 +20344,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
  */
     }
 
-    /* "pyart/map/_gate_to_grid_map.pyx":100
+    /* "pyart/map/_gate_to_grid_map.pyx":89
  *             if roi < self.min_radius:
  *                 roi = self.min_radius
  *             if roi < min_roi:             # <<<<<<<<<<<<<<
@@ -20335,7 +20354,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     __pyx_t_14 = (__pyx_v_roi < __pyx_v_min_roi);
     if (__pyx_t_14) {
 
-      /* "pyart/map/_gate_to_grid_map.pyx":101
+      /* "pyart/map/_gate_to_grid_map.pyx":90
  *                 roi = self.min_radius
  *             if roi < min_roi:
  *                 min_roi = roi             # <<<<<<<<<<<<<<
@@ -20344,7 +20363,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
  */
       __pyx_v_min_roi = __pyx_v_roi;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":100
+      /* "pyart/map/_gate_to_grid_map.pyx":89
  *             if roi < self.min_radius:
  *                 roi = self.min_radius
  *             if roi < min_roi:             # <<<<<<<<<<<<<<
@@ -20354,7 +20373,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
     }
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":102
+  /* "pyart/map/_gate_to_grid_map.pyx":91
  *             if roi < min_roi:
  *                 min_roi = roi
  *         return min_roi             # <<<<<<<<<<<<<<
@@ -20364,7 +20383,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(struct __p
   __pyx_r = __pyx_v_min_roi;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":86
+  /* "pyart/map/_gate_to_grid_map.pyx":75
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -20448,7 +20467,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -20456,9 +20475,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 86, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 75, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -20466,14 +20485,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 86, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 75, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 86, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 75, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 3)) {
       goto __pyx_L5_argtuple_error;
@@ -20482,13 +20501,13 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
       values[2] = __Pyx_Arg_FASTCALL(__pyx_args, 2);
     }
-    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
-    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
-    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L3_error)
+    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
+    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
+    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 86, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 75, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -20525,8 +20544,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI_2get_roi(stru
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_roi", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 86, __pyx_L1_error)
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 75, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 75, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
@@ -20972,10 +20991,10 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_7DistRoI_6__setstate_c
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":114
- *     cdef float[:, :] offsets
+/* "pyart/map/_gate_to_grid_map.pyx":104
+ *     cdef float[::1] h_factor
  * 
- *     def __init__(self, h_factor, nb, bsp, min_radius, offsets):             # <<<<<<<<<<<<<<
+ *     def __init__(self, float[::1] h_factor, float nb, float bsp, float min_radius, offsets):             # <<<<<<<<<<<<<<
  *         """ initalize. """
  *         cdef int i
  */
@@ -20987,10 +21006,10 @@ PyDoc_STRVAR(__pyx_doc_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__, "
 struct wrapperbase __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__;
 #endif
 static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyObject *__pyx_v_h_factor = 0;
-  PyObject *__pyx_v_nb = 0;
-  PyObject *__pyx_v_bsp = 0;
-  PyObject *__pyx_v_min_radius = 0;
+  __Pyx_memviewslice __pyx_v_h_factor = { 0, 0, { 0 }, { 0 }, { 0 } };
+  float __pyx_v_nb;
+  float __pyx_v_bsp;
+  float __pyx_v_min_radius;
   PyObject *__pyx_v_offsets = 0;
   CYTHON_UNUSED Py_ssize_t __pyx_nargs;
   CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
@@ -21032,7 +21051,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -21040,9 +21059,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 114, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 104, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -21050,9 +21069,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 114, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 104, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
@@ -21060,9 +21079,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[3]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 114, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 104, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  4:
@@ -21070,14 +21089,14 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
           (void)__Pyx_Arg_NewRef_VARARGS(values[4]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 114, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 104, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 114, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 104, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 5)) {
       goto __pyx_L5_argtuple_error;
@@ -21088,15 +21107,15 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
       values[3] = __Pyx_Arg_VARARGS(__pyx_args, 3);
       values[4] = __Pyx_Arg_VARARGS(__pyx_args, 4);
     }
-    __pyx_v_h_factor = values[0];
-    __pyx_v_nb = values[1];
-    __pyx_v_bsp = values[2];
-    __pyx_v_min_radius = values[3];
+    __pyx_v_h_factor = __Pyx_PyObject_to_MemoryviewSlice_dc_float(values[0], PyBUF_WRITABLE); if (unlikely(!__pyx_v_h_factor.memview)) __PYX_ERR(0, 104, __pyx_L3_error)
+    __pyx_v_nb = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_nb == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
+    __pyx_v_bsp = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_bsp == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
+    __pyx_v_min_radius = __pyx_PyFloat_AsFloat(values[3]); if (unlikely((__pyx_v_min_radius == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L3_error)
     __pyx_v_offsets = values[4];
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 114, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 104, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -21106,6 +21125,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
       __Pyx_Arg_XDECREF_VARARGS(values[__pyx_temp]);
     }
   }
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_h_factor, 1);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.DistBeamRoI.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
   return -1;
@@ -21113,6 +21133,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
   __pyx_r = __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *)__pyx_v_self), __pyx_v_h_factor, __pyx_v_nb, __pyx_v_bsp, __pyx_v_min_radius, __pyx_v_offsets);
 
   /* function exit code */
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_h_factor, 1);
   {
     Py_ssize_t __pyx_temp;
     for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
@@ -21123,331 +21144,317 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_1__init__(PyOb
   return __pyx_r;
 }
 
-static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, PyObject *__pyx_v_h_factor, PyObject *__pyx_v_nb, PyObject *__pyx_v_bsp, PyObject *__pyx_v_min_radius, PyObject *__pyx_v_offsets) {
+static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_DistBeamRoI *__pyx_v_self, __Pyx_memviewslice __pyx_v_h_factor, float __pyx_v_nb, float __pyx_v_bsp, float __pyx_v_min_radius, PyObject *__pyx_v_offsets) {
   int __pyx_v_i;
   PyObject *__pyx_v_z_offset = NULL;
   PyObject *__pyx_v_y_offset = NULL;
   PyObject *__pyx_v_x_offset = NULL;
   int __pyx_r;
   __Pyx_RefNannyDeclarations
-  float __pyx_t_1;
+  Py_ssize_t __pyx_t_1;
   PyObject *__pyx_t_2 = NULL;
   PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
-  double __pyx_t_5;
-  Py_ssize_t __pyx_t_6;
-  __Pyx_memviewslice __pyx_t_7 = { 0, 0, { 0 }, { 0 }, { 0 } };
-  int __pyx_t_8;
-  PyObject *(*__pyx_t_9)(PyObject *);
+  __Pyx_memviewslice __pyx_t_5 = { 0, 0, { 0 }, { 0 }, { 0 } };
+  int __pyx_t_6;
+  PyObject *(*__pyx_t_7)(PyObject *);
+  PyObject *__pyx_t_8 = NULL;
+  PyObject *__pyx_t_9 = NULL;
   PyObject *__pyx_t_10 = NULL;
-  PyObject *__pyx_t_11 = NULL;
-  PyObject *__pyx_t_12 = NULL;
-  PyObject *(*__pyx_t_13)(PyObject *);
+  PyObject *(*__pyx_t_11)(PyObject *);
+  float __pyx_t_12;
+  Py_ssize_t __pyx_t_13;
   Py_ssize_t __pyx_t_14;
-  Py_ssize_t __pyx_t_15;
-  int __pyx_t_16;
+  int __pyx_t_15;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":117
+  /* "pyart/map/_gate_to_grid_map.pyx":107
  *         """ initalize. """
  *         cdef int i
  *         self.h_factor = h_factor             # <<<<<<<<<<<<<<
  *         self.min_radius = min_radius
  *         self.beam_factor = tan(nb * bsp * PI / 180.)
  */
-  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_h_factor); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 117, __pyx_L1_error)
-  __pyx_v_self->h_factor = __pyx_t_1;
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->h_factor, 0);
+  __PYX_INC_MEMVIEW(&__pyx_v_h_factor, 1);
+  __pyx_v_self->h_factor = __pyx_v_h_factor;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":118
+  /* "pyart/map/_gate_to_grid_map.pyx":108
  *         cdef int i
  *         self.h_factor = h_factor
  *         self.min_radius = min_radius             # <<<<<<<<<<<<<<
  *         self.beam_factor = tan(nb * bsp * PI / 180.)
  * 
  */
-  __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_min_radius); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 118, __pyx_L1_error)
-  __pyx_v_self->min_radius = __pyx_t_1;
+  __pyx_v_self->min_radius = __pyx_v_min_radius;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":119
+  /* "pyart/map/_gate_to_grid_map.pyx":109
  *         self.h_factor = h_factor
  *         self.min_radius = min_radius
  *         self.beam_factor = tan(nb * bsp * PI / 180.)             # <<<<<<<<<<<<<<
  * 
  *         self.num_offsets = len(offsets)
  */
-  __pyx_t_2 = PyNumber_Multiply(__pyx_v_nb, __pyx_v_bsp); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 119, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_5pyart_3map_17_gate_to_grid_map_PI); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 119, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 119, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyFloat_TrueDivideObjC(__pyx_t_4, __pyx_float_180_, 180., 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 119, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_5 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_5 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_v_self->beam_factor = tan(__pyx_t_5);
+  __pyx_v_self->beam_factor = tan((((double)((__pyx_v_nb * __pyx_v_bsp) * __pyx_v_5pyart_3map_17_gate_to_grid_map_PI)) / 180.));
 
-  /* "pyart/map/_gate_to_grid_map.pyx":121
+  /* "pyart/map/_gate_to_grid_map.pyx":111
  *         self.beam_factor = tan(nb * bsp * PI / 180.)
  * 
  *         self.num_offsets = len(offsets)             # <<<<<<<<<<<<<<
  *         # does this array need to be explicitly de-allocated when the
  *         # class instance is removed?
  */
-  __pyx_t_6 = PyObject_Length(__pyx_v_offsets); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 121, __pyx_L1_error)
-  __pyx_v_self->num_offsets = __pyx_t_6;
+  __pyx_t_1 = PyObject_Length(__pyx_v_offsets); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 111, __pyx_L1_error)
+  __pyx_v_self->num_offsets = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":125
+  /* "pyart/map/_gate_to_grid_map.pyx":115
  *         # class instance is removed?
  *         self.offsets = cvarray(
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')             # <<<<<<<<<<<<<<
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  */
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_self->num_offsets); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_self->num_offsets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 125, __pyx_L1_error)
+  __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 115, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 125, __pyx_L1_error);
+  __Pyx_GIVEREF(__pyx_t_3);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error);
   __Pyx_INCREF(__pyx_int_3);
   __Pyx_GIVEREF(__pyx_int_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_3)) __PYX_ERR(0, 125, __pyx_L1_error);
-  __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_shape, __pyx_t_2) < 0) __PYX_ERR(0, 125, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyInt_FromSize_t((sizeof(float))); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_itemsize, __pyx_t_2) < 0) __PYX_ERR(0, 125, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_format, __pyx_n_u_f) < 0) __PYX_ERR(0, 125, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_int_3)) __PYX_ERR(0, 115, __pyx_L1_error);
+  __pyx_t_3 = 0;
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_shape, __pyx_t_4) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  __pyx_t_4 = __Pyx_PyInt_FromSize_t((sizeof(float))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 115, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_4);
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_itemsize, __pyx_t_4) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_format, __pyx_n_u_f) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":124
+  /* "pyart/map/_gate_to_grid_map.pyx":114
  *         # does this array need to be explicitly de-allocated when the
  *         # class instance is removed?
  *         self.offsets = cvarray(             # <<<<<<<<<<<<<<
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  */
-  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_array_type), __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_7 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_2, PyBUF_WRITABLE); if (unlikely(!__pyx_t_7.memview)) __PYX_ERR(0, 124, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_array_type), __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(0, 114, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->offsets, 0);
-  __pyx_v_self->offsets = __pyx_t_7;
-  __pyx_t_7.memview = NULL;
-  __pyx_t_7.data = NULL;
+  __pyx_v_self->offsets = __pyx_t_5;
+  __pyx_t_5.memview = NULL;
+  __pyx_t_5.data = NULL;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":127
+  /* "pyart/map/_gate_to_grid_map.pyx":117
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):             # <<<<<<<<<<<<<<
  *             self.offsets[i, 0] = z_offset
  *             self.offsets[i, 1] = y_offset
  */
-  __pyx_t_8 = 0;
+  __pyx_t_6 = 0;
   if (likely(PyList_CheckExact(__pyx_v_offsets)) || PyTuple_CheckExact(__pyx_v_offsets)) {
-    __pyx_t_2 = __pyx_v_offsets; __Pyx_INCREF(__pyx_t_2);
-    __pyx_t_6 = 0;
-    __pyx_t_9 = NULL;
+    __pyx_t_4 = __pyx_v_offsets; __Pyx_INCREF(__pyx_t_4);
+    __pyx_t_1 = 0;
+    __pyx_t_7 = NULL;
   } else {
-    __pyx_t_6 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_v_offsets); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_9 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 127, __pyx_L1_error)
+    __pyx_t_1 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_offsets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_4);
+    __pyx_t_7 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 117, __pyx_L1_error)
   }
   for (;;) {
-    if (likely(!__pyx_t_9)) {
-      if (likely(PyList_CheckExact(__pyx_t_2))) {
+    if (likely(!__pyx_t_7)) {
+      if (likely(PyList_CheckExact(__pyx_t_4))) {
         {
-          Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_2);
+          Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_4);
           #if !CYTHON_ASSUME_SAFE_MACROS
-          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 127, __pyx_L1_error)
+          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 117, __pyx_L1_error)
           #endif
-          if (__pyx_t_6 >= __pyx_temp) break;
+          if (__pyx_t_1 >= __pyx_temp) break;
         }
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_3 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely((0 < 0))) __PYX_ERR(0, 127, __pyx_L1_error)
+        __pyx_t_2 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely((0 < 0))) __PYX_ERR(0, 117, __pyx_L1_error)
         #else
-        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
+        __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
         #endif
       } else {
         {
-          Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_2);
+          Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_4);
           #if !CYTHON_ASSUME_SAFE_MACROS
-          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 127, __pyx_L1_error)
+          if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 117, __pyx_L1_error)
           #endif
-          if (__pyx_t_6 >= __pyx_temp) break;
+          if (__pyx_t_1 >= __pyx_temp) break;
         }
         #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely((0 < 0))) __PYX_ERR(0, 127, __pyx_L1_error)
+        __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely((0 < 0))) __PYX_ERR(0, 117, __pyx_L1_error)
         #else
-        __pyx_t_3 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
+        __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
         #endif
       }
     } else {
-      __pyx_t_3 = __pyx_t_9(__pyx_t_2);
-      if (unlikely(!__pyx_t_3)) {
+      __pyx_t_2 = __pyx_t_7(__pyx_t_4);
+      if (unlikely(!__pyx_t_2)) {
         PyObject* exc_type = PyErr_Occurred();
         if (exc_type) {
           if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-          else __PYX_ERR(0, 127, __pyx_L1_error)
+          else __PYX_ERR(0, 117, __pyx_L1_error)
         }
         break;
       }
-      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_GOTREF(__pyx_t_2);
     }
-    if ((likely(PyTuple_CheckExact(__pyx_t_3))) || (PyList_CheckExact(__pyx_t_3))) {
-      PyObject* sequence = __pyx_t_3;
+    if ((likely(PyTuple_CheckExact(__pyx_t_2))) || (PyList_CheckExact(__pyx_t_2))) {
+      PyObject* sequence = __pyx_t_2;
       Py_ssize_t size = __Pyx_PySequence_SIZE(sequence);
       if (unlikely(size != 3)) {
         if (size > 3) __Pyx_RaiseTooManyValuesError(3);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        __PYX_ERR(0, 127, __pyx_L1_error)
+        __PYX_ERR(0, 117, __pyx_L1_error)
       }
       #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
       if (likely(PyTuple_CheckExact(sequence))) {
-        __pyx_t_4 = PyTuple_GET_ITEM(sequence, 0); 
-        __pyx_t_10 = PyTuple_GET_ITEM(sequence, 1); 
-        __pyx_t_11 = PyTuple_GET_ITEM(sequence, 2); 
+        __pyx_t_3 = PyTuple_GET_ITEM(sequence, 0); 
+        __pyx_t_8 = PyTuple_GET_ITEM(sequence, 1); 
+        __pyx_t_9 = PyTuple_GET_ITEM(sequence, 2); 
       } else {
-        __pyx_t_4 = PyList_GET_ITEM(sequence, 0); 
-        __pyx_t_10 = PyList_GET_ITEM(sequence, 1); 
-        __pyx_t_11 = PyList_GET_ITEM(sequence, 2); 
+        __pyx_t_3 = PyList_GET_ITEM(sequence, 0); 
+        __pyx_t_8 = PyList_GET_ITEM(sequence, 1); 
+        __pyx_t_9 = PyList_GET_ITEM(sequence, 2); 
       }
-      __Pyx_INCREF(__pyx_t_4);
-      __Pyx_INCREF(__pyx_t_10);
-      __Pyx_INCREF(__pyx_t_11);
+      __Pyx_INCREF(__pyx_t_3);
+      __Pyx_INCREF(__pyx_t_8);
+      __Pyx_INCREF(__pyx_t_9);
       #else
-      __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 127, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_10 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 127, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_11 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 127, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_11);
+      __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_3);
+      __pyx_t_8 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 117, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_8);
+      __pyx_t_9 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 117, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_9);
       #endif
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     } else {
       Py_ssize_t index = -1;
-      __pyx_t_12 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 127, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_12);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __pyx_t_13 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_12);
-      index = 0; __pyx_t_4 = __pyx_t_13(__pyx_t_12); if (unlikely(!__pyx_t_4)) goto __pyx_L5_unpacking_failed;
-      __Pyx_GOTREF(__pyx_t_4);
-      index = 1; __pyx_t_10 = __pyx_t_13(__pyx_t_12); if (unlikely(!__pyx_t_10)) goto __pyx_L5_unpacking_failed;
+      __pyx_t_10 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 117, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_10);
-      index = 2; __pyx_t_11 = __pyx_t_13(__pyx_t_12); if (unlikely(!__pyx_t_11)) goto __pyx_L5_unpacking_failed;
-      __Pyx_GOTREF(__pyx_t_11);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_13(__pyx_t_12), 3) < 0) __PYX_ERR(0, 127, __pyx_L1_error)
-      __pyx_t_13 = NULL;
-      __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __pyx_t_11 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_10);
+      index = 0; __pyx_t_3 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_3)) goto __pyx_L5_unpacking_failed;
+      __Pyx_GOTREF(__pyx_t_3);
+      index = 1; __pyx_t_8 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_8)) goto __pyx_L5_unpacking_failed;
+      __Pyx_GOTREF(__pyx_t_8);
+      index = 2; __pyx_t_9 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_9)) goto __pyx_L5_unpacking_failed;
+      __Pyx_GOTREF(__pyx_t_9);
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_10), 3) < 0) __PYX_ERR(0, 117, __pyx_L1_error)
+      __pyx_t_11 = NULL;
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
       goto __pyx_L6_unpacking_done;
       __pyx_L5_unpacking_failed:;
-      __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
-      __pyx_t_13 = NULL;
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
+      __pyx_t_11 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      __PYX_ERR(0, 127, __pyx_L1_error)
+      __PYX_ERR(0, 117, __pyx_L1_error)
       __pyx_L6_unpacking_done:;
     }
-    __Pyx_XDECREF_SET(__pyx_v_z_offset, __pyx_t_4);
-    __pyx_t_4 = 0;
-    __Pyx_XDECREF_SET(__pyx_v_y_offset, __pyx_t_10);
-    __pyx_t_10 = 0;
-    __Pyx_XDECREF_SET(__pyx_v_x_offset, __pyx_t_11);
-    __pyx_t_11 = 0;
-    __pyx_v_i = __pyx_t_8;
-    __pyx_t_8 = (__pyx_t_8 + 1);
+    __Pyx_XDECREF_SET(__pyx_v_z_offset, __pyx_t_3);
+    __pyx_t_3 = 0;
+    __Pyx_XDECREF_SET(__pyx_v_y_offset, __pyx_t_8);
+    __pyx_t_8 = 0;
+    __Pyx_XDECREF_SET(__pyx_v_x_offset, __pyx_t_9);
+    __pyx_t_9 = 0;
+    __pyx_v_i = __pyx_t_6;
+    __pyx_t_6 = (__pyx_t_6 + 1);
 
-    /* "pyart/map/_gate_to_grid_map.pyx":128
+    /* "pyart/map/_gate_to_grid_map.pyx":118
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  *             self.offsets[i, 0] = z_offset             # <<<<<<<<<<<<<<
  *             self.offsets[i, 1] = y_offset
  *             self.offsets[i, 2] = x_offset
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_z_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 128, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 128, __pyx_L1_error)}
-    __pyx_t_14 = __pyx_v_i;
-    __pyx_t_15 = 0;
-    __pyx_t_16 = -1;
+    __pyx_t_12 = __pyx_PyFloat_AsFloat(__pyx_v_z_offset); if (unlikely((__pyx_t_12 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 118, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 118, __pyx_L1_error)}
+    __pyx_t_13 = __pyx_v_i;
+    __pyx_t_14 = 0;
+    __pyx_t_15 = -1;
+    if (__pyx_t_13 < 0) {
+      __pyx_t_13 += __pyx_v_self->offsets.shape[0];
+      if (unlikely(__pyx_t_13 < 0)) __pyx_t_15 = 0;
+    } else if (unlikely(__pyx_t_13 >= __pyx_v_self->offsets.shape[0])) __pyx_t_15 = 0;
     if (__pyx_t_14 < 0) {
-      __pyx_t_14 += __pyx_v_self->offsets.shape[0];
-      if (unlikely(__pyx_t_14 < 0)) __pyx_t_16 = 0;
-    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[0])) __pyx_t_16 = 0;
-    if (__pyx_t_15 < 0) {
-      __pyx_t_15 += __pyx_v_self->offsets.shape[1];
-      if (unlikely(__pyx_t_15 < 0)) __pyx_t_16 = 1;
-    } else if (unlikely(__pyx_t_15 >= __pyx_v_self->offsets.shape[1])) __pyx_t_16 = 1;
-    if (unlikely(__pyx_t_16 != -1)) {
-      __Pyx_RaiseBufferIndexError(__pyx_t_16);
-      __PYX_ERR(0, 128, __pyx_L1_error)
-    }
-    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_14 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_15 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
-
-    /* "pyart/map/_gate_to_grid_map.pyx":129
+      __pyx_t_14 += __pyx_v_self->offsets.shape[1];
+      if (unlikely(__pyx_t_14 < 0)) __pyx_t_15 = 1;
+    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
+    if (unlikely(__pyx_t_15 != -1)) {
+      __Pyx_RaiseBufferIndexError(__pyx_t_15);
+      __PYX_ERR(0, 118, __pyx_L1_error)
+    }
+    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_14 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_12;
+
+    /* "pyart/map/_gate_to_grid_map.pyx":119
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):
  *             self.offsets[i, 0] = z_offset
  *             self.offsets[i, 1] = y_offset             # <<<<<<<<<<<<<<
  *             self.offsets[i, 2] = x_offset
  * 
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_y_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 129, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 129, __pyx_L1_error)}
-    __pyx_t_15 = __pyx_v_i;
-    __pyx_t_14 = 1;
-    __pyx_t_16 = -1;
-    if (__pyx_t_15 < 0) {
-      __pyx_t_15 += __pyx_v_self->offsets.shape[0];
-      if (unlikely(__pyx_t_15 < 0)) __pyx_t_16 = 0;
-    } else if (unlikely(__pyx_t_15 >= __pyx_v_self->offsets.shape[0])) __pyx_t_16 = 0;
+    __pyx_t_12 = __pyx_PyFloat_AsFloat(__pyx_v_y_offset); if (unlikely((__pyx_t_12 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 119, __pyx_L1_error)}
+    __pyx_t_14 = __pyx_v_i;
+    __pyx_t_13 = 1;
+    __pyx_t_15 = -1;
     if (__pyx_t_14 < 0) {
-      __pyx_t_14 += __pyx_v_self->offsets.shape[1];
-      if (unlikely(__pyx_t_14 < 0)) __pyx_t_16 = 1;
-    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[1])) __pyx_t_16 = 1;
-    if (unlikely(__pyx_t_16 != -1)) {
-      __Pyx_RaiseBufferIndexError(__pyx_t_16);
-      __PYX_ERR(0, 129, __pyx_L1_error)
+      __pyx_t_14 += __pyx_v_self->offsets.shape[0];
+      if (unlikely(__pyx_t_14 < 0)) __pyx_t_15 = 0;
+    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[0])) __pyx_t_15 = 0;
+    if (__pyx_t_13 < 0) {
+      __pyx_t_13 += __pyx_v_self->offsets.shape[1];
+      if (unlikely(__pyx_t_13 < 0)) __pyx_t_15 = 1;
+    } else if (unlikely(__pyx_t_13 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
+    if (unlikely(__pyx_t_15 != -1)) {
+      __Pyx_RaiseBufferIndexError(__pyx_t_15);
+      __PYX_ERR(0, 119, __pyx_L1_error)
     }
-    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_15 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_14 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
+    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_14 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_12;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":130
+    /* "pyart/map/_gate_to_grid_map.pyx":120
  *             self.offsets[i, 0] = z_offset
  *             self.offsets[i, 1] = y_offset
  *             self.offsets[i, 2] = x_offset             # <<<<<<<<<<<<<<
  * 
  *     @cython.initializedcheck(False)
  */
-    __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_x_offset); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
-    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 130, __pyx_L1_error)}
-    __pyx_t_14 = __pyx_v_i;
-    __pyx_t_15 = 2;
-    __pyx_t_16 = -1;
+    __pyx_t_12 = __pyx_PyFloat_AsFloat(__pyx_v_x_offset); if (unlikely((__pyx_t_12 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 120, __pyx_L1_error)
+    if (unlikely(!__pyx_v_self->offsets.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(0, 120, __pyx_L1_error)}
+    __pyx_t_13 = __pyx_v_i;
+    __pyx_t_14 = 2;
+    __pyx_t_15 = -1;
+    if (__pyx_t_13 < 0) {
+      __pyx_t_13 += __pyx_v_self->offsets.shape[0];
+      if (unlikely(__pyx_t_13 < 0)) __pyx_t_15 = 0;
+    } else if (unlikely(__pyx_t_13 >= __pyx_v_self->offsets.shape[0])) __pyx_t_15 = 0;
     if (__pyx_t_14 < 0) {
-      __pyx_t_14 += __pyx_v_self->offsets.shape[0];
-      if (unlikely(__pyx_t_14 < 0)) __pyx_t_16 = 0;
-    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[0])) __pyx_t_16 = 0;
-    if (__pyx_t_15 < 0) {
-      __pyx_t_15 += __pyx_v_self->offsets.shape[1];
-      if (unlikely(__pyx_t_15 < 0)) __pyx_t_16 = 1;
-    } else if (unlikely(__pyx_t_15 >= __pyx_v_self->offsets.shape[1])) __pyx_t_16 = 1;
-    if (unlikely(__pyx_t_16 != -1)) {
-      __Pyx_RaiseBufferIndexError(__pyx_t_16);
-      __PYX_ERR(0, 130, __pyx_L1_error)
-    }
-    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_14 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_15 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_1;
-
-    /* "pyart/map/_gate_to_grid_map.pyx":127
+      __pyx_t_14 += __pyx_v_self->offsets.shape[1];
+      if (unlikely(__pyx_t_14 < 0)) __pyx_t_15 = 1;
+    } else if (unlikely(__pyx_t_14 >= __pyx_v_self->offsets.shape[1])) __pyx_t_15 = 1;
+    if (unlikely(__pyx_t_15 != -1)) {
+      __Pyx_RaiseBufferIndexError(__pyx_t_15);
+      __PYX_ERR(0, 120, __pyx_L1_error)
+    }
+    *((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_14 * __pyx_v_self->offsets.strides[1]) )) = __pyx_t_12;
+
+    /* "pyart/map/_gate_to_grid_map.pyx":117
  *             shape=(self.num_offsets, 3), itemsize=sizeof(float), format='f')
  * 
  *         for i, (z_offset, y_offset, x_offset) in enumerate(offsets):             # <<<<<<<<<<<<<<
@@ -21455,12 +21462,12 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struc
  *             self.offsets[i, 1] = y_offset
  */
   }
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":114
- *     cdef float[:, :] offsets
+  /* "pyart/map/_gate_to_grid_map.pyx":104
+ *     cdef float[::1] h_factor
  * 
- *     def __init__(self, h_factor, nb, bsp, min_radius, offsets):             # <<<<<<<<<<<<<<
+ *     def __init__(self, float[::1] h_factor, float nb, float bsp, float min_radius, offsets):             # <<<<<<<<<<<<<<
  *         """ initalize. """
  *         cdef int i
  */
@@ -21472,10 +21479,10 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struc
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
-  __PYX_XCLEAR_MEMVIEW(&__pyx_t_7, 1);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_t_5, 1);
+  __Pyx_XDECREF(__pyx_t_8);
+  __Pyx_XDECREF(__pyx_t_9);
   __Pyx_XDECREF(__pyx_t_10);
-  __Pyx_XDECREF(__pyx_t_11);
-  __Pyx_XDECREF(__pyx_t_12);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.DistBeamRoI.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = -1;
   __pyx_L0:;
@@ -21486,7 +21493,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__(struc
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":136
+/* "pyart/map/_gate_to_grid_map.pyx":126
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -21523,7 +21530,8 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
   int __pyx_t_11;
   Py_ssize_t __pyx_t_12;
   Py_ssize_t __pyx_t_13;
-  int __pyx_t_14;
+  Py_ssize_t __pyx_t_14;
+  int __pyx_t_15;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -21537,14 +21545,14 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
     if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
       PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
       #endif
-      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
+      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_roi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
       if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_3get_roi)) {
-        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
+        __pyx_t_3 = PyFloat_FromDouble(__pyx_v_z); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 136, __pyx_L1_error)
+        __pyx_t_4 = PyFloat_FromDouble(__pyx_v_y); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 126, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
+        __pyx_t_5 = PyFloat_FromDouble(__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 126, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_5);
         __Pyx_INCREF(__pyx_t_1);
         __pyx_t_6 = __pyx_t_1; __pyx_t_7 = NULL;
@@ -21568,11 +21576,11 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         }
-        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error)
+        __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_2); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_r = __pyx_t_9;
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -21591,7 +21599,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
     #endif
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":142
+  /* "pyart/map/_gate_to_grid_map.pyx":132
  *         cdef int i
  * 
  *         min_roi = 999999999.0             # <<<<<<<<<<<<<<
@@ -21600,7 +21608,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
  */
   __pyx_v_min_roi = 999999999.0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":143
+  /* "pyart/map/_gate_to_grid_map.pyx":133
  * 
  *         min_roi = 999999999.0
  *         for i in range(self.num_offsets):             # <<<<<<<<<<<<<<
@@ -21612,7 +21620,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
   for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
     __pyx_v_i = __pyx_t_11;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":144
+    /* "pyart/map/_gate_to_grid_map.pyx":134
  *         min_roi = 999999999.0
  *         for i in range(self.num_offsets):
  *             z_offset = self.offsets[i, 0]             # <<<<<<<<<<<<<<
@@ -21623,49 +21631,76 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
     __pyx_t_13 = 0;
     __pyx_v_z_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_12 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":145
+    /* "pyart/map/_gate_to_grid_map.pyx":135
  *         for i in range(self.num_offsets):
  *             z_offset = self.offsets[i, 0]
  *             y_offset = self.offsets[i, 1]             # <<<<<<<<<<<<<<
  *             x_offset = self.offsets[i, 2]
- *             roi = (self.h_factor * ((z - z_offset) / 20.0) +
+ *             roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +
  */
     __pyx_t_13 = __pyx_v_i;
     __pyx_t_12 = 1;
     __pyx_v_y_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_13 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_12 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":146
+    /* "pyart/map/_gate_to_grid_map.pyx":136
  *             z_offset = self.offsets[i, 0]
  *             y_offset = self.offsets[i, 1]
  *             x_offset = self.offsets[i, 2]             # <<<<<<<<<<<<<<
- *             roi = (self.h_factor * ((z - z_offset) / 20.0) +
- *                    sqrt((y - y_offset)**2 + (x - x_offset)**2) *
+ *             roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +
+ *                         (self.h_factor[1] * (y - y_offset))**2 +
  */
     __pyx_t_12 = __pyx_v_i;
     __pyx_t_13 = 2;
     __pyx_v_x_offset = (*((float *) ( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->offsets.data + __pyx_t_12 * __pyx_v_self->offsets.strides[0]) ) + __pyx_t_13 * __pyx_v_self->offsets.strides[1]) )));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":147
+    /* "pyart/map/_gate_to_grid_map.pyx":137
  *             y_offset = self.offsets[i, 1]
  *             x_offset = self.offsets[i, 2]
- *             roi = (self.h_factor * ((z - z_offset) / 20.0) +             # <<<<<<<<<<<<<<
- *                    sqrt((y - y_offset)**2 + (x - x_offset)**2) *
- *                    self.beam_factor)
+ *             roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +             # <<<<<<<<<<<<<<
+ *                         (self.h_factor[1] * (y - y_offset))**2 +
+ *                         (self.h_factor[2] * (x - x_offset))**2) *
+ */
+    __pyx_t_13 = 0;
+
+    /* "pyart/map/_gate_to_grid_map.pyx":138
+ *             x_offset = self.offsets[i, 2]
+ *             roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +
+ *                         (self.h_factor[1] * (y - y_offset))**2 +             # <<<<<<<<<<<<<<
+ *                         (self.h_factor[2] * (x - x_offset))**2) *
+ *                    self.beam_factor
+ */
+    __pyx_t_12 = 1;
+
+    /* "pyart/map/_gate_to_grid_map.pyx":139
+ *             roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +
+ *                         (self.h_factor[1] * (y - y_offset))**2 +
+ *                         (self.h_factor[2] * (x - x_offset))**2) *             # <<<<<<<<<<<<<<
+ *                    self.beam_factor
+ *             )
+ */
+    __pyx_t_14 = 2;
+
+    /* "pyart/map/_gate_to_grid_map.pyx":140
+ *                         (self.h_factor[1] * (y - y_offset))**2 +
+ *                         (self.h_factor[2] * (x - x_offset))**2) *
+ *                    self.beam_factor             # <<<<<<<<<<<<<<
+ *             )
+ *             if roi < self.min_radius:
  */
-    __pyx_v_roi = ((__pyx_v_self->h_factor * (((double)(__pyx_v_z - __pyx_v_z_offset)) / 20.0)) + (sqrt((powf((__pyx_v_y - __pyx_v_y_offset), 2.0) + powf((__pyx_v_x - __pyx_v_x_offset), 2.0))) * __pyx_v_self->beam_factor));
+    __pyx_v_roi = (sqrt(((powf(((*((float *) ( /* dim=0 */ ((char *) (((float *) __pyx_v_self->h_factor.data) + __pyx_t_13)) ))) * (__pyx_v_z - __pyx_v_z_offset)), 2.0) + powf(((*((float *) ( /* dim=0 */ ((char *) (((float *) __pyx_v_self->h_factor.data) + __pyx_t_12)) ))) * (__pyx_v_y - __pyx_v_y_offset)), 2.0)) + powf(((*((float *) ( /* dim=0 */ ((char *) (((float *) __pyx_v_self->h_factor.data) + __pyx_t_14)) ))) * (__pyx_v_x - __pyx_v_x_offset)), 2.0))) * __pyx_v_self->beam_factor);
 
-    /* "pyart/map/_gate_to_grid_map.pyx":150
- *                    sqrt((y - y_offset)**2 + (x - x_offset)**2) *
- *                    self.beam_factor)
+    /* "pyart/map/_gate_to_grid_map.pyx":142
+ *                    self.beam_factor
+ *             )
  *             if roi < self.min_radius:             # <<<<<<<<<<<<<<
  *                 roi = self.min_radius
  *             if roi < min_roi:
  */
-    __pyx_t_14 = (__pyx_v_roi < __pyx_v_self->min_radius);
-    if (__pyx_t_14) {
+    __pyx_t_15 = (__pyx_v_roi < __pyx_v_self->min_radius);
+    if (__pyx_t_15) {
 
-      /* "pyart/map/_gate_to_grid_map.pyx":151
- *                    self.beam_factor)
+      /* "pyart/map/_gate_to_grid_map.pyx":143
+ *             )
  *             if roi < self.min_radius:
  *                 roi = self.min_radius             # <<<<<<<<<<<<<<
  *             if roi < min_roi:
@@ -21674,26 +21709,26 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
       __pyx_t_9 = __pyx_v_self->min_radius;
       __pyx_v_roi = __pyx_t_9;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":150
- *                    sqrt((y - y_offset)**2 + (x - x_offset)**2) *
- *                    self.beam_factor)
+      /* "pyart/map/_gate_to_grid_map.pyx":142
+ *                    self.beam_factor
+ *             )
  *             if roi < self.min_radius:             # <<<<<<<<<<<<<<
  *                 roi = self.min_radius
  *             if roi < min_roi:
  */
     }
 
-    /* "pyart/map/_gate_to_grid_map.pyx":152
+    /* "pyart/map/_gate_to_grid_map.pyx":144
  *             if roi < self.min_radius:
  *                 roi = self.min_radius
  *             if roi < min_roi:             # <<<<<<<<<<<<<<
  *                 min_roi = roi
  *         return min_roi
  */
-    __pyx_t_14 = (__pyx_v_roi < __pyx_v_min_roi);
-    if (__pyx_t_14) {
+    __pyx_t_15 = (__pyx_v_roi < __pyx_v_min_roi);
+    if (__pyx_t_15) {
 
-      /* "pyart/map/_gate_to_grid_map.pyx":153
+      /* "pyart/map/_gate_to_grid_map.pyx":145
  *                 roi = self.min_radius
  *             if roi < min_roi:
  *                 min_roi = roi             # <<<<<<<<<<<<<<
@@ -21702,7 +21737,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
  */
       __pyx_v_min_roi = __pyx_v_roi;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":152
+      /* "pyart/map/_gate_to_grid_map.pyx":144
  *             if roi < self.min_radius:
  *                 roi = self.min_radius
  *             if roi < min_roi:             # <<<<<<<<<<<<<<
@@ -21712,7 +21747,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
     }
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":154
+  /* "pyart/map/_gate_to_grid_map.pyx":146
  *             if roi < min_roi:
  *                 min_roi = roi
  *         return min_roi             # <<<<<<<<<<<<<<
@@ -21722,7 +21757,7 @@ static float __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(struc
   __pyx_r = __pyx_v_min_roi;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":136
+  /* "pyart/map/_gate_to_grid_map.pyx":126
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
@@ -21806,7 +21841,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -21814,9 +21849,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 136, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 1); __PYX_ERR(0, 126, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -21824,14 +21859,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 136, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, 2); __PYX_ERR(0, 126, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 136, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "get_roi") < 0)) __PYX_ERR(0, 126, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 3)) {
       goto __pyx_L5_argtuple_error;
@@ -21840,13 +21875,13 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
       values[2] = __Pyx_Arg_FASTCALL(__pyx_args, 2);
     }
-    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
-    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
-    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L3_error)
+    __pyx_v_z = __pyx_PyFloat_AsFloat(values[0]); if (unlikely((__pyx_v_z == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
+    __pyx_v_y = __pyx_PyFloat_AsFloat(values[1]); if (unlikely((__pyx_v_y == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
+    __pyx_v_x = __pyx_PyFloat_AsFloat(values[2]); if (unlikely((__pyx_v_x == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 136, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("get_roi", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 126, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -21883,8 +21918,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_2get_roi
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_roi", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error)
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi(__pyx_v_self, __pyx_v_z, __pyx_v_y, __pyx_v_x, 1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
@@ -21975,7 +22010,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_4__reduc
  */
   __pyx_t_1 = PyFloat_FromDouble(__pyx_v_self->beam_factor); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_self->h_factor); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
+  if (unlikely(!__pyx_v_self->h_factor.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 5, __pyx_L1_error)}
+  __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->h_factor, 1, (PyObject *(*)(char *)) __pyx_memview_get_float, (int (*)(char *, PyObject *)) __pyx_memview_set_float, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = PyFloat_FromDouble(__pyx_v_self->min_radius); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -22330,8 +22366,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_6__setst
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":182
- *     cdef float[:, :, :, ::1] grid_wsum
+/* "pyart/map/_gate_to_grid_map.pyx":176
+ * 
  * 
  *     def __init__(self, tuple grid_shape, tuple grid_starts, tuple grid_steps,             # <<<<<<<<<<<<<<
  *                  float[:, :, :, ::1] grid_sum, float[:, :, :, ::1] grid_wsum):
@@ -22390,7 +22426,7 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 182, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 176, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -22398,9 +22434,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
           (void)__Pyx_Arg_NewRef_VARARGS(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 182, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 176, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 182, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 176, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -22408,9 +22444,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
           (void)__Pyx_Arg_NewRef_VARARGS(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 182, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 176, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 182, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 176, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
@@ -22418,9 +22454,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
           (void)__Pyx_Arg_NewRef_VARARGS(values[3]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 182, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 176, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 182, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 176, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  4:
@@ -22428,14 +22464,14 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
           (void)__Pyx_Arg_NewRef_VARARGS(values[4]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 182, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 176, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 182, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 176, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 182, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 176, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 5)) {
       goto __pyx_L5_argtuple_error;
@@ -22449,12 +22485,12 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
     __pyx_v_grid_shape = ((PyObject*)values[0]);
     __pyx_v_grid_starts = ((PyObject*)values[1]);
     __pyx_v_grid_steps = ((PyObject*)values[2]);
-    __pyx_v_grid_sum = __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(values[3], PyBUF_WRITABLE); if (unlikely(!__pyx_v_grid_sum.memview)) __PYX_ERR(0, 183, __pyx_L3_error)
-    __pyx_v_grid_wsum = __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(values[4], PyBUF_WRITABLE); if (unlikely(!__pyx_v_grid_wsum.memview)) __PYX_ERR(0, 183, __pyx_L3_error)
+    __pyx_v_grid_sum = __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(values[3], PyBUF_WRITABLE); if (unlikely(!__pyx_v_grid_sum.memview)) __PYX_ERR(0, 177, __pyx_L3_error)
+    __pyx_v_grid_wsum = __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(values[4], PyBUF_WRITABLE); if (unlikely(!__pyx_v_grid_wsum.memview)) __PYX_ERR(0, 177, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 182, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 176, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -22470,9 +22506,9 @@ static int __pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_1__init__
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_shape), (&PyTuple_Type), 1, "grid_shape", 1))) __PYX_ERR(0, 182, __pyx_L1_error)
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_starts), (&PyTuple_Type), 1, "grid_starts", 1))) __PYX_ERR(0, 182, __pyx_L1_error)
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_steps), (&PyTuple_Type), 1, "grid_steps", 1))) __PYX_ERR(0, 182, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_shape), (&PyTuple_Type), 1, "grid_shape", 1))) __PYX_ERR(0, 176, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_starts), (&PyTuple_Type), 1, "grid_starts", 1))) __PYX_ERR(0, 176, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_grid_steps), (&PyTuple_Type), 1, "grid_steps", 1))) __PYX_ERR(0, 176, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self), __pyx_v_grid_shape, __pyx_v_grid_starts, __pyx_v_grid_steps, __pyx_v_grid_sum, __pyx_v_grid_wsum);
 
   /* function exit code */
@@ -22509,12 +22545,14 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   PyObject *__pyx_t_3 = NULL;
   float __pyx_t_4;
   int __pyx_t_5;
+  PyObject *__pyx_t_6 = NULL;
+  __Pyx_memviewslice __pyx_t_7 = { 0, 0, { 0 }, { 0 }, { 0 } };
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":187
+  /* "pyart/map/_gate_to_grid_map.pyx":181
  * 
  *         # unpack tuples
  *         nz, ny, nx = grid_shape             # <<<<<<<<<<<<<<
@@ -22527,7 +22565,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     if (unlikely(size != 3)) {
       if (size > 3) __Pyx_RaiseTooManyValuesError(3);
       else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-      __PYX_ERR(0, 187, __pyx_L1_error)
+      __PYX_ERR(0, 181, __pyx_L1_error)
     }
     #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
     __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); 
@@ -22537,15 +22575,15 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     __Pyx_INCREF(__pyx_t_2);
     __Pyx_INCREF(__pyx_t_3);
     #else
-    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 187, __pyx_L1_error)
+    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 187, __pyx_L1_error)
+    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_3 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 187, __pyx_L1_error)
+    __pyx_t_3 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 181, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     #endif
   } else {
-    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 187, __pyx_L1_error)
+    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 181, __pyx_L1_error)
   }
   __pyx_v_nz = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -22554,7 +22592,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   __pyx_v_nx = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":188
+  /* "pyart/map/_gate_to_grid_map.pyx":182
  *         # unpack tuples
  *         nz, ny, nx = grid_shape
  *         z_start, y_start, x_start = grid_starts             # <<<<<<<<<<<<<<
@@ -22567,7 +22605,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     if (unlikely(size != 3)) {
       if (size > 3) __Pyx_RaiseTooManyValuesError(3);
       else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-      __PYX_ERR(0, 188, __pyx_L1_error)
+      __PYX_ERR(0, 182, __pyx_L1_error)
     }
     #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
     __pyx_t_3 = PyTuple_GET_ITEM(sequence, 0); 
@@ -22577,15 +22615,15 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     __Pyx_INCREF(__pyx_t_2);
     __Pyx_INCREF(__pyx_t_1);
     #else
-    __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 188, __pyx_L1_error)
+    __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 188, __pyx_L1_error)
+    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_1 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 188, __pyx_L1_error)
+    __pyx_t_1 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 182, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     #endif
   } else {
-    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 188, __pyx_L1_error)
+    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 182, __pyx_L1_error)
   }
   __pyx_v_z_start = __pyx_t_3;
   __pyx_t_3 = 0;
@@ -22594,7 +22632,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   __pyx_v_x_start = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":189
+  /* "pyart/map/_gate_to_grid_map.pyx":183
  *         nz, ny, nx = grid_shape
  *         z_start, y_start, x_start = grid_starts
  *         z_step, y_step, x_step = grid_steps             # <<<<<<<<<<<<<<
@@ -22607,7 +22645,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     if (unlikely(size != 3)) {
       if (size > 3) __Pyx_RaiseTooManyValuesError(3);
       else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-      __PYX_ERR(0, 189, __pyx_L1_error)
+      __PYX_ERR(0, 183, __pyx_L1_error)
     }
     #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
     __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); 
@@ -22617,15 +22655,15 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
     __Pyx_INCREF(__pyx_t_2);
     __Pyx_INCREF(__pyx_t_3);
     #else
-    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 189, __pyx_L1_error)
+    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 183, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 189, __pyx_L1_error)
+    __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 183, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_3 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 189, __pyx_L1_error)
+    __pyx_t_3 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 183, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     #endif
   } else {
-    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 189, __pyx_L1_error)
+    __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 183, __pyx_L1_error)
   }
   __pyx_v_z_step = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -22634,97 +22672,97 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   __pyx_v_x_step = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":192
+  /* "pyart/map/_gate_to_grid_map.pyx":186
  * 
  *         # set attributes
  *         self.x_step = x_step             # <<<<<<<<<<<<<<
  *         self.y_step = y_step
  *         self.z_step = z_step
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_x_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 192, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_x_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 186, __pyx_L1_error)
   __pyx_v_self->x_step = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":193
+  /* "pyart/map/_gate_to_grid_map.pyx":187
  *         # set attributes
  *         self.x_step = x_step
  *         self.y_step = y_step             # <<<<<<<<<<<<<<
  *         self.z_step = z_step
  *         self.x_start = x_start
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_y_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 193, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_y_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 187, __pyx_L1_error)
   __pyx_v_self->y_step = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":194
+  /* "pyart/map/_gate_to_grid_map.pyx":188
  *         self.x_step = x_step
  *         self.y_step = y_step
  *         self.z_step = z_step             # <<<<<<<<<<<<<<
  *         self.x_start = x_start
  *         self.y_start = y_start
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_z_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 194, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_z_step); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 188, __pyx_L1_error)
   __pyx_v_self->z_step = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":195
+  /* "pyart/map/_gate_to_grid_map.pyx":189
  *         self.y_step = y_step
  *         self.z_step = z_step
  *         self.x_start = x_start             # <<<<<<<<<<<<<<
  *         self.y_start = y_start
  *         self.z_start = z_start
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_x_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 195, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_x_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 189, __pyx_L1_error)
   __pyx_v_self->x_start = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":196
+  /* "pyart/map/_gate_to_grid_map.pyx":190
  *         self.z_step = z_step
  *         self.x_start = x_start
  *         self.y_start = y_start             # <<<<<<<<<<<<<<
  *         self.z_start = z_start
  *         self.nx = nx
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_y_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 196, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_y_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 190, __pyx_L1_error)
   __pyx_v_self->y_start = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":197
+  /* "pyart/map/_gate_to_grid_map.pyx":191
  *         self.x_start = x_start
  *         self.y_start = y_start
  *         self.z_start = z_start             # <<<<<<<<<<<<<<
  *         self.nx = nx
  *         self.ny = ny
  */
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_z_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 197, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_v_z_start); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 191, __pyx_L1_error)
   __pyx_v_self->z_start = __pyx_t_4;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":198
+  /* "pyart/map/_gate_to_grid_map.pyx":192
  *         self.y_start = y_start
  *         self.z_start = z_start
  *         self.nx = nx             # <<<<<<<<<<<<<<
  *         self.ny = ny
  *         self.nz = nz
  */
-  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_nx); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 198, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_nx); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 192, __pyx_L1_error)
   __pyx_v_self->nx = __pyx_t_5;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":199
+  /* "pyart/map/_gate_to_grid_map.pyx":193
  *         self.z_start = z_start
  *         self.nx = nx
  *         self.ny = ny             # <<<<<<<<<<<<<<
  *         self.nz = nz
  *         self.nfields = grid_sum.shape[3]
  */
-  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_ny); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 199, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_ny); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 193, __pyx_L1_error)
   __pyx_v_self->ny = __pyx_t_5;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":200
+  /* "pyart/map/_gate_to_grid_map.pyx":194
  *         self.nx = nx
  *         self.ny = ny
  *         self.nz = nz             # <<<<<<<<<<<<<<
  *         self.nfields = grid_sum.shape[3]
  *         self.grid_sum = grid_sum
  */
-  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_nz); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 200, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_nz); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 194, __pyx_L1_error)
   __pyx_v_self->nz = __pyx_t_5;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":201
+  /* "pyart/map/_gate_to_grid_map.pyx":195
  *         self.ny = ny
  *         self.nz = nz
  *         self.nfields = grid_sum.shape[3]             # <<<<<<<<<<<<<<
@@ -22733,31 +22771,92 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
  */
   __pyx_v_self->nfields = (__pyx_v_grid_sum.shape[3]);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":202
+  /* "pyart/map/_gate_to_grid_map.pyx":196
  *         self.nz = nz
  *         self.nfields = grid_sum.shape[3]
  *         self.grid_sum = grid_sum             # <<<<<<<<<<<<<<
  *         self.grid_wsum = grid_wsum
- *         return
+ *         self.min_dist2 = 1e30*np.ones((nz, ny, nx, self.nfields))
  */
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->grid_sum, 0);
   __PYX_INC_MEMVIEW(&__pyx_v_grid_sum, 1);
   __pyx_v_self->grid_sum = __pyx_v_grid_sum;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":203
+  /* "pyart/map/_gate_to_grid_map.pyx":197
  *         self.nfields = grid_sum.shape[3]
  *         self.grid_sum = grid_sum
  *         self.grid_wsum = grid_wsum             # <<<<<<<<<<<<<<
+ *         self.min_dist2 = 1e30*np.ones((nz, ny, nx, self.nfields))
  *         return
- * 
  */
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->grid_wsum, 0);
   __PYX_INC_MEMVIEW(&__pyx_v_grid_wsum, 1);
   __pyx_v_self->grid_wsum = __pyx_v_grid_wsum;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":204
+  /* "pyart/map/_gate_to_grid_map.pyx":198
  *         self.grid_sum = grid_sum
  *         self.grid_wsum = grid_wsum
+ *         self.min_dist2 = 1e30*np.ones((nz, ny, nx, self.nfields))             # <<<<<<<<<<<<<<
+ *         return
+ * 
+ */
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ones); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_self->nfields); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_6 = PyTuple_New(4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_6);
+  __Pyx_INCREF(__pyx_v_nz);
+  __Pyx_GIVEREF(__pyx_v_nz);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_nz)) __PYX_ERR(0, 198, __pyx_L1_error);
+  __Pyx_INCREF(__pyx_v_ny);
+  __Pyx_GIVEREF(__pyx_v_ny);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_ny)) __PYX_ERR(0, 198, __pyx_L1_error);
+  __Pyx_INCREF(__pyx_v_nx);
+  __Pyx_GIVEREF(__pyx_v_nx);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_v_nx)) __PYX_ERR(0, 198, __pyx_L1_error);
+  __Pyx_GIVEREF(__pyx_t_2);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 3, __pyx_t_2)) __PYX_ERR(0, 198, __pyx_L1_error);
+  __pyx_t_2 = 0;
+  __pyx_t_2 = NULL;
+  __pyx_t_5 = 0;
+  #if CYTHON_UNPACK_METHODS
+  if (unlikely(PyMethod_Check(__pyx_t_1))) {
+    __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_1);
+    if (likely(__pyx_t_2)) {
+      PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);
+      __Pyx_INCREF(__pyx_t_2);
+      __Pyx_INCREF(function);
+      __Pyx_DECREF_SET(__pyx_t_1, function);
+      __pyx_t_5 = 1;
+    }
+  }
+  #endif
+  {
+    PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_t_6};
+    __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
+    __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
+    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+    if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 198, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  }
+  __pyx_t_1 = PyNumber_Multiply(__pyx_float_1e30, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_t_7 = __Pyx_PyObject_to_MemoryviewSlice_dsdsdsds_double(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_7.memview)) __PYX_ERR(0, 198, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_self->min_dist2, 0);
+  __pyx_v_self->min_dist2 = __pyx_t_7;
+  __pyx_t_7.memview = NULL;
+  __pyx_t_7.data = NULL;
+
+  /* "pyart/map/_gate_to_grid_map.pyx":199
+ *         self.grid_wsum = grid_wsum
+ *         self.min_dist2 = 1e30*np.ones((nz, ny, nx, self.nfields))
  *         return             # <<<<<<<<<<<<<<
  * 
  *     @cython.boundscheck(False)
@@ -22765,8 +22864,8 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":182
- *     cdef float[:, :, :, ::1] grid_wsum
+  /* "pyart/map/_gate_to_grid_map.pyx":176
+ * 
  * 
  *     def __init__(self, tuple grid_shape, tuple grid_starts, tuple grid_steps,             # <<<<<<<<<<<<<<
  *                  float[:, :, :, ::1] grid_sum, float[:, :, :, ::1] grid_wsum):
@@ -22778,6 +22877,8 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_XDECREF(__pyx_t_6);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_t_7, 1);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.GateToGridMapper.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = -1;
   __pyx_L0:;
@@ -22794,7 +22895,7 @@ static int __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__(
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":206
+/* "pyart/map/_gate_to_grid_map.pyx":201
  *         return
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -22859,7 +22960,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 206, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 201, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -22867,14 +22968,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 206, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 201, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("find_roi_for_grid", 1, 2, 2, 1); __PYX_ERR(0, 206, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("find_roi_for_grid", 1, 2, 2, 1); __PYX_ERR(0, 201, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "find_roi_for_grid") < 0)) __PYX_ERR(0, 206, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "find_roi_for_grid") < 0)) __PYX_ERR(0, 201, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 2)) {
       goto __pyx_L5_argtuple_error;
@@ -22882,12 +22983,12 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
       values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
     }
-    __pyx_v_roi_array = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(values[0], PyBUF_WRITABLE); if (unlikely(!__pyx_v_roi_array.memview)) __PYX_ERR(0, 209, __pyx_L3_error)
+    __pyx_v_roi_array = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(values[0], PyBUF_WRITABLE); if (unlikely(!__pyx_v_roi_array.memview)) __PYX_ERR(0, 204, __pyx_L3_error)
     __pyx_v_roi_func = ((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *)values[1]);
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("find_roi_for_grid", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 206, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("find_roi_for_grid", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 201, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -22902,7 +23003,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __Pyx_RefNannyFinishContext();
   return NULL;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_roi_func), __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, 1, "roi_func", 0))) __PYX_ERR(0, 209, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_roi_func), __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, 1, "roi_func", 0))) __PYX_ERR(0, 204, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2find_roi_for_grid(((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self), __pyx_v_roi_array, __pyx_v_roi_func);
 
   /* function exit code */
@@ -22949,7 +23050,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("find_roi_for_grid", 1);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":224
+  /* "pyart/map/_gate_to_grid_map.pyx":219
  *         cdef int ix, iy, iz
  *         cdef float x, y, z, roi
  *         for ix in range(self.nx):             # <<<<<<<<<<<<<<
@@ -22961,7 +23062,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_ix = __pyx_t_3;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":225
+    /* "pyart/map/_gate_to_grid_map.pyx":220
  *         cdef float x, y, z, roi
  *         for ix in range(self.nx):
  *             for iy in range(self.ny):             # <<<<<<<<<<<<<<
@@ -22973,7 +23074,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
     for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {
       __pyx_v_iy = __pyx_t_6;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":226
+      /* "pyart/map/_gate_to_grid_map.pyx":221
  *         for ix in range(self.nx):
  *             for iy in range(self.ny):
  *                 for iz in range(self.nz):             # <<<<<<<<<<<<<<
@@ -22985,7 +23086,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
       for (__pyx_t_9 = 0; __pyx_t_9 < __pyx_t_8; __pyx_t_9+=1) {
         __pyx_v_iz = __pyx_t_9;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":227
+        /* "pyart/map/_gate_to_grid_map.pyx":222
  *             for iy in range(self.ny):
  *                 for iz in range(self.nz):
  *                     x = self.x_start + self.x_step * ix             # <<<<<<<<<<<<<<
@@ -22994,7 +23095,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
  */
         __pyx_v_x = (__pyx_v_self->x_start + (__pyx_v_self->x_step * __pyx_v_ix));
 
-        /* "pyart/map/_gate_to_grid_map.pyx":228
+        /* "pyart/map/_gate_to_grid_map.pyx":223
  *                 for iz in range(self.nz):
  *                     x = self.x_start + self.x_step * ix
  *                     y = self.y_start + self.y_step * iy             # <<<<<<<<<<<<<<
@@ -23003,7 +23104,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
  */
         __pyx_v_y = (__pyx_v_self->y_start + (__pyx_v_self->y_step * __pyx_v_iy));
 
-        /* "pyart/map/_gate_to_grid_map.pyx":229
+        /* "pyart/map/_gate_to_grid_map.pyx":224
  *                     x = self.x_start + self.x_step * ix
  *                     y = self.y_start + self.y_step * iy
  *                     z = self.z_start + self.z_step * iz             # <<<<<<<<<<<<<<
@@ -23012,17 +23113,17 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
  */
         __pyx_v_z = (__pyx_v_self->z_start + (__pyx_v_self->z_step * __pyx_v_iz));
 
-        /* "pyart/map/_gate_to_grid_map.pyx":230
+        /* "pyart/map/_gate_to_grid_map.pyx":225
  *                     y = self.y_start + self.y_step * iy
  *                     z = self.z_start + self.z_step * iz
  *                     roi = roi_func.get_roi(z, y, x)             # <<<<<<<<<<<<<<
  *                     roi_array[iz, iy, ix] = roi
  *         return
  */
-        __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction *)__pyx_v_roi_func->__pyx_vtab)->get_roi(__pyx_v_roi_func, __pyx_v_z, __pyx_v_y, __pyx_v_x, 0); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 230, __pyx_L1_error)
+        __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction *)__pyx_v_roi_func->__pyx_vtab)->get_roi(__pyx_v_roi_func, __pyx_v_z, __pyx_v_y, __pyx_v_x, 0); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 225, __pyx_L1_error)
         __pyx_v_roi = __pyx_t_10;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":231
+        /* "pyart/map/_gate_to_grid_map.pyx":226
  *                     z = self.z_start + self.z_step * iz
  *                     roi = roi_func.get_roi(z, y, x)
  *                     roi_array[iz, iy, ix] = roi             # <<<<<<<<<<<<<<
@@ -23037,7 +23138,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
     }
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":232
+  /* "pyart/map/_gate_to_grid_map.pyx":227
  *                     roi = roi_func.get_roi(z, y, x)
  *                     roi_array[iz, iy, ix] = roi
  *         return             # <<<<<<<<<<<<<<
@@ -23048,7 +23149,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":206
+  /* "pyart/map/_gate_to_grid_map.pyx":201
  *         return
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -23066,7 +23167,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_2fi
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":234
+/* "pyart/map/_gate_to_grid_map.pyx":229
  *         return
  * 
  *     @cython.cdivision(True)             # <<<<<<<<<<<<<<
@@ -23082,7 +23183,7 @@ PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
 PyObject *__pyx_args, PyObject *__pyx_kwds
 #endif
 ); /*proto*/
-PyDoc_STRVAR(__pyx_doc_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid, "\n        Map radar gates unto the regular grid.\n\n        The grid_sum and grid_wsum arrays used to initalize the class\n        are update with the mapped gate data.\n\n        Parameters\n        ----------\n        ngates, nrays : int\n            Number of gates and rays in the radar volume.\n        gate_z, gate_y, gate_x : 2D float32 array\n            Cartesian locations of the gates in meters.\n        field_data : 3D float32 array\n            Array containing field data for the radar, dimension are ordered\n            as nrays, ngates, nfields.\n        field_mask : 3D uint8 array\n            Array containing masking of the field data for the radar,\n            dimension are ordered as nrays, ngates, nfields.\n        excluded_gates : 2D uint8 array\n            Array containing gate masking information. Gates with non-zero\n            values will not be included in the mapping.\n        offset : tuple of floats\n            Offset of the radar from the grid origin. Dimension are ordered\n            as z, y, x.\n            Top of atmosphere. Gates above this level are considered.\n        roi_func : RoIFunction\n            Object whose get_roi method returns the radius of influence.\n        weighting_function : int\n            Function to use for weighting gates based upon distance.\n            0 for Barnes, 1 for Cressman, 2 for Nearest and 3 for Barnes 2\n            neighbor weighting.\n\n        ");
+PyDoc_STRVAR(__pyx_doc_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid, "\n        Map radar gates unto the regular grid.\n\n        The grid_sum and grid_wsum arrays used to initalize the class\n        are update with the mapped gate data.\n\n        Parameters\n        ----------\n        ngates, nrays : int\n            Number of gates and rays in the radar volume.\n        gate_z, gate_y, gate_x : 2D float32 array\n            Cartesian locations of the gates in meters.\n        field_data : 3D float32 array\n            Array containing field data for the radar, dimension are ordered\n            as nrays, ngates, nfields.\n        field_mask : 3D uint8 array\n            Array containing masking of the field data for the radar,\n            dimension are ordered as nrays, ngates, nfields.\n        excluded_gates : 2D uint8 array\n            Array containing gate masking information. Gates with non-zero\n            values will not be included in the mapping.\n        offset : tuple of floats\n            Offset of the radar from the grid origin. Dimension are ordered\n            as z, y, x.\n            Top of atmosphere. Gates above this level are considered.\n        roi_func : RoIFunction\n            Object whose get_roi method returns the radius of influence.\n        weighting_function : int\n            Function to use for weighting gates based upon distance.\n            0 for Barnes, 1 for Cressman, 2 for Nearest and 3 for Barnes 2\n            neighbor weighting.\n        dist_factor: 3-element float32 array\n            Scaling factors for squared z,y,x difference in distance calculation.\n            For example:\n            A value of (0.0, 1.0, 1.0)  combined with an h_factor=(0.0, 1.0, 1.0)\n            (if calling DistBeamRoI) or z_factor=0.0 (if calling DistRoI) results in\n            the exclusion of the z dimension in gridding weighting and could\n            serve as a potential solution for gridding a single PPI sweep.\n\n        ");
 static PyMethodDef __pyx_mdef_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_5map_gates_to_grid = {"map_gates_to_grid", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_5map_gates_to_grid, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid};
 static PyObject *__pyx_pw_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_5map_gates_to_grid(PyObject *__pyx_v_self, 
 #if CYTHON_METH_FASTCALL
@@ -23099,9 +23200,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __Pyx_memviewslice __pyx_v_field_data = { 0, 0, { 0 }, { 0 }, { 0 } };
   __Pyx_memviewslice __pyx_v_field_mask = { 0, 0, { 0 }, { 0 }, { 0 } };
   __Pyx_memviewslice __pyx_v_excluded_gates = { 0, 0, { 0 }, { 0 }, { 0 } };
-  CYTHON_UNUSED float __pyx_v_toa;
   struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func = 0;
   int __pyx_v_weighting_function;
+  __Pyx_memviewslice __pyx_v_dist_factor = { 0, 0, { 0 }, { 0 }, { 0 } };
   #if !CYTHON_METH_FASTCALL
   CYTHON_UNUSED Py_ssize_t __pyx_nargs;
   #endif
@@ -23122,7 +23223,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   #endif
   __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
   {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_ngates,&__pyx_n_s_nrays,&__pyx_n_s_gate_z,&__pyx_n_s_gate_y,&__pyx_n_s_gate_x,&__pyx_n_s_field_data,&__pyx_n_s_field_mask,&__pyx_n_s_excluded_gates,&__pyx_n_s_toa,&__pyx_n_s_roi_func,&__pyx_n_s_weighting_function,0};
+    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_ngates,&__pyx_n_s_nrays,&__pyx_n_s_gate_z,&__pyx_n_s_gate_y,&__pyx_n_s_gate_x,&__pyx_n_s_field_data,&__pyx_n_s_field_mask,&__pyx_n_s_excluded_gates,&__pyx_n_s_roi_func,&__pyx_n_s_weighting_function,&__pyx_n_s_dist_factor,0};
     if (__pyx_kwds) {
       Py_ssize_t kw_args;
       switch (__pyx_nargs) {
@@ -23158,7 +23259,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -23166,9 +23267,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 1); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 1); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -23176,9 +23277,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 2); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 2); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
@@ -23186,9 +23287,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[3]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 3); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 3); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  4:
@@ -23196,9 +23297,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[4]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 4); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 4); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  5:
@@ -23206,9 +23307,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[5]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 5); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 5); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  6:
@@ -23216,9 +23317,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[6]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 6); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 6); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  7:
@@ -23226,44 +23327,44 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[7]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 7); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 7); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  8:
-        if (likely((values[8] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_toa)) != 0)) {
+        if (likely((values[8] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_roi_func)) != 0)) {
           (void)__Pyx_Arg_NewRef_FASTCALL(values[8]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 8); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 8); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  9:
-        if (likely((values[9] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_roi_func)) != 0)) {
+        if (likely((values[9] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_weighting_function)) != 0)) {
           (void)__Pyx_Arg_NewRef_FASTCALL(values[9]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 9); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 9); __PYX_ERR(0, 229, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case 10:
-        if (likely((values[10] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_weighting_function)) != 0)) {
+        if (likely((values[10] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_dist_factor)) != 0)) {
           (void)__Pyx_Arg_NewRef_FASTCALL(values[10]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 229, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 10); __PYX_ERR(0, 234, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, 10); __PYX_ERR(0, 229, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "map_gates_to_grid") < 0)) __PYX_ERR(0, 234, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "map_gates_to_grid") < 0)) __PYX_ERR(0, 229, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 11)) {
       goto __pyx_L5_argtuple_error;
@@ -23280,21 +23381,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       values[9] = __Pyx_Arg_FASTCALL(__pyx_args, 9);
       values[10] = __Pyx_Arg_FASTCALL(__pyx_args, 10);
     }
-    __pyx_v_ngates = __Pyx_PyInt_As_int(values[0]); if (unlikely((__pyx_v_ngates == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 239, __pyx_L3_error)
-    __pyx_v_nrays = __Pyx_PyInt_As_int(values[1]); if (unlikely((__pyx_v_nrays == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 239, __pyx_L3_error)
-    __pyx_v_gate_z = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[2], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_z.memview)) __PYX_ERR(0, 240, __pyx_L3_error)
-    __pyx_v_gate_y = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[3], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_y.memview)) __PYX_ERR(0, 240, __pyx_L3_error)
-    __pyx_v_gate_x = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[4], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_x.memview)) __PYX_ERR(0, 240, __pyx_L3_error)
-    __pyx_v_field_data = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(values[5], PyBUF_WRITABLE); if (unlikely(!__pyx_v_field_data.memview)) __PYX_ERR(0, 241, __pyx_L3_error)
-    __pyx_v_field_mask = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_char(values[6], PyBUF_WRITABLE); if (unlikely(!__pyx_v_field_mask.memview)) __PYX_ERR(0, 242, __pyx_L3_error)
-    __pyx_v_excluded_gates = __Pyx_PyObject_to_MemoryviewSlice_d_dc_char(values[7], PyBUF_WRITABLE); if (unlikely(!__pyx_v_excluded_gates.memview)) __PYX_ERR(0, 242, __pyx_L3_error)
-    __pyx_v_toa = __pyx_PyFloat_AsFloat(values[8]); if (unlikely((__pyx_v_toa == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 243, __pyx_L3_error)
-    __pyx_v_roi_func = ((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *)values[9]);
-    __pyx_v_weighting_function = __Pyx_PyInt_As_int(values[10]); if (unlikely((__pyx_v_weighting_function == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 243, __pyx_L3_error)
+    __pyx_v_ngates = __Pyx_PyInt_As_int(values[0]); if (unlikely((__pyx_v_ngates == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+    __pyx_v_nrays = __Pyx_PyInt_As_int(values[1]); if (unlikely((__pyx_v_nrays == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 234, __pyx_L3_error)
+    __pyx_v_gate_z = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[2], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_z.memview)) __PYX_ERR(0, 235, __pyx_L3_error)
+    __pyx_v_gate_y = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[3], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_y.memview)) __PYX_ERR(0, 235, __pyx_L3_error)
+    __pyx_v_gate_x = __Pyx_PyObject_to_MemoryviewSlice_d_dc_float(values[4], PyBUF_WRITABLE); if (unlikely(!__pyx_v_gate_x.memview)) __PYX_ERR(0, 235, __pyx_L3_error)
+    __pyx_v_field_data = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(values[5], PyBUF_WRITABLE); if (unlikely(!__pyx_v_field_data.memview)) __PYX_ERR(0, 236, __pyx_L3_error)
+    __pyx_v_field_mask = __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_char(values[6], PyBUF_WRITABLE); if (unlikely(!__pyx_v_field_mask.memview)) __PYX_ERR(0, 237, __pyx_L3_error)
+    __pyx_v_excluded_gates = __Pyx_PyObject_to_MemoryviewSlice_d_dc_char(values[7], PyBUF_WRITABLE); if (unlikely(!__pyx_v_excluded_gates.memview)) __PYX_ERR(0, 237, __pyx_L3_error)
+    __pyx_v_roi_func = ((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *)values[8]);
+    __pyx_v_weighting_function = __Pyx_PyInt_As_int(values[9]); if (unlikely((__pyx_v_weighting_function == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 238, __pyx_L3_error)
+    __pyx_v_dist_factor = __Pyx_PyObject_to_MemoryviewSlice_dc_float(values[10], PyBUF_WRITABLE); if (unlikely(!__pyx_v_dist_factor.memview)) __PYX_ERR(0, 239, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, __pyx_nargs); __PYX_ERR(0, 234, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("map_gates_to_grid", 1, 11, 11, __pyx_nargs); __PYX_ERR(0, 229, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -23310,12 +23411,13 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_field_data, 1);
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_field_mask, 1);
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_excluded_gates, 1);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_dist_factor, 1);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.GateToGridMapper.map_gates_to_grid", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
   return NULL;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_roi_func), __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, 1, "roi_func", 0))) __PYX_ERR(0, 243, __pyx_L1_error)
-  __pyx_r = __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self), __pyx_v_ngates, __pyx_v_nrays, __pyx_v_gate_z, __pyx_v_gate_y, __pyx_v_gate_x, __pyx_v_field_data, __pyx_v_field_mask, __pyx_v_excluded_gates, __pyx_v_toa, __pyx_v_roi_func, __pyx_v_weighting_function);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_roi_func), __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, 1, "roi_func", 0))) __PYX_ERR(0, 238, __pyx_L1_error)
+  __pyx_r = __pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(((struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self), __pyx_v_ngates, __pyx_v_nrays, __pyx_v_gate_z, __pyx_v_gate_y, __pyx_v_gate_x, __pyx_v_field_data, __pyx_v_field_mask, __pyx_v_excluded_gates, __pyx_v_roi_func, __pyx_v_weighting_function, __pyx_v_dist_factor);
 
   /* function exit code */
   goto __pyx_L0;
@@ -23328,6 +23430,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_field_data, 1);
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_field_mask, 1);
   __PYX_XCLEAR_MEMVIEW(&__pyx_v_excluded_gates, 1);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v_dist_factor, 1);
   {
     Py_ssize_t __pyx_temp;
     for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
@@ -23338,7 +23441,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   return __pyx_r;
 }
 
-static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, int __pyx_v_ngates, int __pyx_v_nrays, __Pyx_memviewslice __pyx_v_gate_z, __Pyx_memviewslice __pyx_v_gate_y, __Pyx_memviewslice __pyx_v_gate_x, __Pyx_memviewslice __pyx_v_field_data, __Pyx_memviewslice __pyx_v_field_mask, __Pyx_memviewslice __pyx_v_excluded_gates, CYTHON_UNUSED float __pyx_v_toa, struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func, int __pyx_v_weighting_function) {
+static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4map_gates_to_grid(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, int __pyx_v_ngates, int __pyx_v_nrays, __Pyx_memviewslice __pyx_v_gate_z, __Pyx_memviewslice __pyx_v_gate_y, __Pyx_memviewslice __pyx_v_gate_x, __Pyx_memviewslice __pyx_v_field_data, __Pyx_memviewslice __pyx_v_field_mask, __Pyx_memviewslice __pyx_v_excluded_gates, struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *__pyx_v_roi_func, int __pyx_v_weighting_function, __Pyx_memviewslice __pyx_v_dist_factor) {
   float __pyx_v_roi;
   __Pyx_memviewslice __pyx_v_values = { 0, 0, { 0 }, { 0 }, { 0 } };
   __Pyx_memviewslice __pyx_v_masks = { 0, 0, { 0 }, { 0 }, { 0 } };
@@ -23366,7 +23469,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("map_gates_to_grid", 1);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":283
+  /* "pyart/map/_gate_to_grid_map.pyx":286
  *         cdef float x, y, z
  * 
  *         for nray in range(nrays):             # <<<<<<<<<<<<<<
@@ -23378,7 +23481,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_nray = __pyx_t_3;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":284
+    /* "pyart/map/_gate_to_grid_map.pyx":287
  * 
  *         for nray in range(nrays):
  *             for ngate in range(ngates):             # <<<<<<<<<<<<<<
@@ -23390,7 +23493,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
     for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {
       __pyx_v_ngate = __pyx_t_6;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":287
+      /* "pyart/map/_gate_to_grid_map.pyx":290
  * 
  *                 # continue if gate excluded
  *                 if excluded_gates[nray, ngate]:             # <<<<<<<<<<<<<<
@@ -23402,7 +23505,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
       __pyx_t_9 = ((*((char *) ( /* dim=1 */ ((char *) (((char *) ( /* dim=0 */ (__pyx_v_excluded_gates.data + __pyx_t_7 * __pyx_v_excluded_gates.strides[0]) )) + __pyx_t_8)) ))) != 0);
       if (__pyx_t_9) {
 
-        /* "pyart/map/_gate_to_grid_map.pyx":288
+        /* "pyart/map/_gate_to_grid_map.pyx":291
  *                 # continue if gate excluded
  *                 if excluded_gates[nray, ngate]:
  *                     continue             # <<<<<<<<<<<<<<
@@ -23411,7 +23514,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
  */
         goto __pyx_L5_continue;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":287
+        /* "pyart/map/_gate_to_grid_map.pyx":290
  * 
  *                 # continue if gate excluded
  *                 if excluded_gates[nray, ngate]:             # <<<<<<<<<<<<<<
@@ -23420,7 +23523,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
  */
       }
 
-      /* "pyart/map/_gate_to_grid_map.pyx":290
+      /* "pyart/map/_gate_to_grid_map.pyx":293
  *                     continue
  * 
  *                 x = gate_x[nray, ngate]             # <<<<<<<<<<<<<<
@@ -23431,7 +23534,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
       __pyx_t_7 = __pyx_v_ngate;
       __pyx_v_x = (*((float *) ( /* dim=1 */ ((char *) (((float *) ( /* dim=0 */ (__pyx_v_gate_x.data + __pyx_t_8 * __pyx_v_gate_x.strides[0]) )) + __pyx_t_7)) )));
 
-      /* "pyart/map/_gate_to_grid_map.pyx":291
+      /* "pyart/map/_gate_to_grid_map.pyx":294
  * 
  *                 x = gate_x[nray, ngate]
  *                 y = gate_y[nray, ngate]             # <<<<<<<<<<<<<<
@@ -23442,7 +23545,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
       __pyx_t_8 = __pyx_v_ngate;
       __pyx_v_y = (*((float *) ( /* dim=1 */ ((char *) (((float *) ( /* dim=0 */ (__pyx_v_gate_y.data + __pyx_t_7 * __pyx_v_gate_y.strides[0]) )) + __pyx_t_8)) )));
 
-      /* "pyart/map/_gate_to_grid_map.pyx":292
+      /* "pyart/map/_gate_to_grid_map.pyx":295
  *                 x = gate_x[nray, ngate]
  *                 y = gate_y[nray, ngate]
  *                 z = gate_z[nray, ngate]             # <<<<<<<<<<<<<<
@@ -23453,17 +23556,17 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_4ma
       __pyx_t_7 = __pyx_v_ngate;
       __pyx_v_z = (*((float *) ( /* dim=1 */ ((char *) (((float *) ( /* dim=0 */ (__pyx_v_gate_z.data + __pyx_t_8 * __pyx_v_gate_z.strides[0]) )) + __pyx_t_7)) )));
 
-      /* "pyart/map/_gate_to_grid_map.pyx":293
+      /* "pyart/map/_gate_to_grid_map.pyx":296
  *                 y = gate_y[nray, ngate]
  *                 z = gate_z[nray, ngate]
  *                 roi = roi_func.get_roi(z, y, x)             # <<<<<<<<<<<<<<
  *                 values = field_data[nray, ngate]
  *                 masks = field_mask[nray, ngate]
  */
-      __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction *)__pyx_v_roi_func->__pyx_vtab)->get_roi(__pyx_v_roi_func, __pyx_v_z, __pyx_v_y, __pyx_v_x, 0); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 293, __pyx_L1_error)
+      __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction *)__pyx_v_roi_func->__pyx_vtab)->get_roi(__pyx_v_roi_func, __pyx_v_z, __pyx_v_y, __pyx_v_x, 0); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 296, __pyx_L1_error)
       __pyx_v_roi = __pyx_t_10;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":294
+      /* "pyart/map/_gate_to_grid_map.pyx":297
  *                 z = gate_z[nray, ngate]
  *                 roi = roi_func.get_roi(z, y, x)
  *                 values = field_data[nray, ngate]             # <<<<<<<<<<<<<<
@@ -23494,12 +23597,12 @@ __PYX_XCLEAR_MEMVIEW(&__pyx_v_values, 1);
       __pyx_t_11.memview = NULL;
       __pyx_t_11.data = NULL;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":295
+      /* "pyart/map/_gate_to_grid_map.pyx":298
  *                 roi = roi_func.get_roi(z, y, x)
  *                 values = field_data[nray, ngate]
  *                 masks = field_mask[nray, ngate]             # <<<<<<<<<<<<<<
  * 
- *                 self.map_gate(x, y, z, roi, values, masks, weighting_function)
+ *                 self.map_gate(x, y, z, roi, values, masks, weighting_function,
  */
       __pyx_t_12.data = __pyx_v_field_mask.data;
       __pyx_t_12.memview = __pyx_v_field_mask.memview;
@@ -23525,19 +23628,19 @@ __PYX_XCLEAR_MEMVIEW(&__pyx_v_masks, 1);
       __pyx_t_12.memview = NULL;
       __pyx_t_12.data = NULL;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":297
+      /* "pyart/map/_gate_to_grid_map.pyx":300
  *                 masks = field_mask[nray, ngate]
  * 
- *                 self.map_gate(x, y, z, roi, values, masks, weighting_function)             # <<<<<<<<<<<<<<
+ *                 self.map_gate(x, y, z, roi, values, masks, weighting_function,             # <<<<<<<<<<<<<<
+ *                               dist_factor)
  * 
- *     @cython.initializedcheck(False)
  */
-      ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self->__pyx_vtab)->map_gate(__pyx_v_self, __pyx_v_x, __pyx_v_y, __pyx_v_z, __pyx_v_roi, __pyx_v_values, __pyx_v_masks, __pyx_v_weighting_function); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 297, __pyx_L1_error)
+      ((struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *)__pyx_v_self->__pyx_vtab)->map_gate(__pyx_v_self, __pyx_v_x, __pyx_v_y, __pyx_v_z, __pyx_v_roi, __pyx_v_values, __pyx_v_masks, __pyx_v_weighting_function, __pyx_v_dist_factor); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 300, __pyx_L1_error)
       __pyx_L5_continue:;
     }
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":234
+  /* "pyart/map/_gate_to_grid_map.pyx":229
  *         return
  * 
  *     @cython.cdivision(True)             # <<<<<<<<<<<<<<
@@ -23561,22 +23664,21 @@ __PYX_XCLEAR_MEMVIEW(&__pyx_v_masks, 1);
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":303
+/* "pyart/map/_gate_to_grid_map.pyx":307
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cdef int map_gate(self, float x, float y, float z, float roi,             # <<<<<<<<<<<<<<
  *                       float[:] values, char[:] masks,
- *                       int weighting_function):
+ *                       int weighting_function, float[:] dist_factor):
  */
 
-static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, float __pyx_v_x, float __pyx_v_y, float __pyx_v_z, float __pyx_v_roi, __Pyx_memviewslice __pyx_v_values, __Pyx_memviewslice __pyx_v_masks, int __pyx_v_weighting_function) {
+static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v_self, float __pyx_v_x, float __pyx_v_y, float __pyx_v_z, float __pyx_v_roi, __Pyx_memviewslice __pyx_v_values, __Pyx_memviewslice __pyx_v_masks, int __pyx_v_weighting_function, __Pyx_memviewslice __pyx_v_dist_factor) {
   float __pyx_v_xg;
   float __pyx_v_yg;
   float __pyx_v_zg;
   float __pyx_v_weight;
   float __pyx_v_roi2;
   float __pyx_v_dist2;
-  float __pyx_v_min_dist2;
   int __pyx_v_x_min;
   int __pyx_v_x_max;
   int __pyx_v_y_min;
@@ -23601,20 +23703,19 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   long __pyx_t_8;
   long __pyx_t_9;
   int __pyx_t_10;
-  int __pyx_t_11;
-  int __pyx_t_12;
-  int __pyx_t_13;
+  Py_ssize_t __pyx_t_11;
+  Py_ssize_t __pyx_t_12;
+  Py_ssize_t __pyx_t_13;
   int __pyx_t_14;
-  Py_ssize_t __pyx_t_15;
-  Py_ssize_t __pyx_t_16;
+  int __pyx_t_15;
+  int __pyx_t_16;
   Py_ssize_t __pyx_t_17;
   Py_ssize_t __pyx_t_18;
-  Py_ssize_t __pyx_t_19;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":313
+  /* "pyart/map/_gate_to_grid_map.pyx":317
  * 
  *         # shift positions so that grid starts at 0
  *         x -= self.x_start             # <<<<<<<<<<<<<<
@@ -23623,7 +23724,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   __pyx_v_x = (__pyx_v_x - __pyx_v_self->x_start);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":314
+  /* "pyart/map/_gate_to_grid_map.pyx":318
  *         # shift positions so that grid starts at 0
  *         x -= self.x_start
  *         y -= self.y_start             # <<<<<<<<<<<<<<
@@ -23632,7 +23733,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   __pyx_v_y = (__pyx_v_y - __pyx_v_self->y_start);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":315
+  /* "pyart/map/_gate_to_grid_map.pyx":319
  *         x -= self.x_start
  *         y -= self.y_start
  *         z -= self.z_start             # <<<<<<<<<<<<<<
@@ -23641,17 +23742,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   __pyx_v_z = (__pyx_v_z - __pyx_v_self->z_start);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":317
+  /* "pyart/map/_gate_to_grid_map.pyx":321
  *         z -= self.z_start
  * 
  *         x_min = find_min(x, roi, self.x_step)             # <<<<<<<<<<<<<<
  *         if x_min > self.nx-1:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_x, __pyx_v_roi, __pyx_v_self->x_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 317, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_x, __pyx_v_roi, __pyx_v_self->x_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 321, __pyx_L1_error)
   __pyx_v_x_min = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":318
+  /* "pyart/map/_gate_to_grid_map.pyx":322
  * 
  *         x_min = find_min(x, roi, self.x_step)
  *         if x_min > self.nx-1:             # <<<<<<<<<<<<<<
@@ -23661,7 +23762,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_x_min > (__pyx_v_self->nx - 1));
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":319
+    /* "pyart/map/_gate_to_grid_map.pyx":323
  *         x_min = find_min(x, roi, self.x_step)
  *         if x_min > self.nx-1:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23671,7 +23772,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":318
+    /* "pyart/map/_gate_to_grid_map.pyx":322
  * 
  *         x_min = find_min(x, roi, self.x_step)
  *         if x_min > self.nx-1:             # <<<<<<<<<<<<<<
@@ -23680,17 +23781,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":320
+  /* "pyart/map/_gate_to_grid_map.pyx":324
  *         if x_min > self.nx-1:
  *             return 0
  *         x_max = find_max(x, roi, self.x_step, self.nx)             # <<<<<<<<<<<<<<
  *         if x_max < 0:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_x, __pyx_v_roi, __pyx_v_self->x_step, __pyx_v_self->nx); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 320, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_x, __pyx_v_roi, __pyx_v_self->x_step, __pyx_v_self->nx); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 324, __pyx_L1_error)
   __pyx_v_x_max = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":321
+  /* "pyart/map/_gate_to_grid_map.pyx":325
  *             return 0
  *         x_max = find_max(x, roi, self.x_step, self.nx)
  *         if x_max < 0:             # <<<<<<<<<<<<<<
@@ -23700,7 +23801,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_x_max < 0);
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":322
+    /* "pyart/map/_gate_to_grid_map.pyx":326
  *         x_max = find_max(x, roi, self.x_step, self.nx)
  *         if x_max < 0:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23710,7 +23811,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":321
+    /* "pyart/map/_gate_to_grid_map.pyx":325
  *             return 0
  *         x_max = find_max(x, roi, self.x_step, self.nx)
  *         if x_max < 0:             # <<<<<<<<<<<<<<
@@ -23719,17 +23820,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":324
+  /* "pyart/map/_gate_to_grid_map.pyx":328
  *             return 0
  * 
  *         y_min = find_min(y, roi, self.y_step)             # <<<<<<<<<<<<<<
  *         if y_min > self.ny-1:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_y, __pyx_v_roi, __pyx_v_self->y_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 324, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_y, __pyx_v_roi, __pyx_v_self->y_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 328, __pyx_L1_error)
   __pyx_v_y_min = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":325
+  /* "pyart/map/_gate_to_grid_map.pyx":329
  * 
  *         y_min = find_min(y, roi, self.y_step)
  *         if y_min > self.ny-1:             # <<<<<<<<<<<<<<
@@ -23739,7 +23840,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_y_min > (__pyx_v_self->ny - 1));
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":326
+    /* "pyart/map/_gate_to_grid_map.pyx":330
  *         y_min = find_min(y, roi, self.y_step)
  *         if y_min > self.ny-1:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23749,7 +23850,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":325
+    /* "pyart/map/_gate_to_grid_map.pyx":329
  * 
  *         y_min = find_min(y, roi, self.y_step)
  *         if y_min > self.ny-1:             # <<<<<<<<<<<<<<
@@ -23758,17 +23859,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":327
+  /* "pyart/map/_gate_to_grid_map.pyx":331
  *         if y_min > self.ny-1:
  *             return 0
  *         y_max = find_max(y, roi, self.y_step, self.ny)             # <<<<<<<<<<<<<<
  *         if y_max < 0:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_y, __pyx_v_roi, __pyx_v_self->y_step, __pyx_v_self->ny); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 327, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_y, __pyx_v_roi, __pyx_v_self->y_step, __pyx_v_self->ny); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 331, __pyx_L1_error)
   __pyx_v_y_max = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":328
+  /* "pyart/map/_gate_to_grid_map.pyx":332
  *             return 0
  *         y_max = find_max(y, roi, self.y_step, self.ny)
  *         if y_max < 0:             # <<<<<<<<<<<<<<
@@ -23778,7 +23879,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_y_max < 0);
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":329
+    /* "pyart/map/_gate_to_grid_map.pyx":333
  *         y_max = find_max(y, roi, self.y_step, self.ny)
  *         if y_max < 0:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23788,7 +23889,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":328
+    /* "pyart/map/_gate_to_grid_map.pyx":332
  *             return 0
  *         y_max = find_max(y, roi, self.y_step, self.ny)
  *         if y_max < 0:             # <<<<<<<<<<<<<<
@@ -23797,17 +23898,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":331
+  /* "pyart/map/_gate_to_grid_map.pyx":335
  *             return 0
  * 
  *         z_min = find_min(z, roi, self.z_step)             # <<<<<<<<<<<<<<
  *         if z_min > self.nz-1:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_z, __pyx_v_roi, __pyx_v_self->z_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 331, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(__pyx_v_z, __pyx_v_roi, __pyx_v_self->z_step); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 335, __pyx_L1_error)
   __pyx_v_z_min = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":332
+  /* "pyart/map/_gate_to_grid_map.pyx":336
  * 
  *         z_min = find_min(z, roi, self.z_step)
  *         if z_min > self.nz-1:             # <<<<<<<<<<<<<<
@@ -23817,7 +23918,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_z_min > (__pyx_v_self->nz - 1));
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":333
+    /* "pyart/map/_gate_to_grid_map.pyx":337
  *         z_min = find_min(z, roi, self.z_step)
  *         if z_min > self.nz-1:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23827,7 +23928,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":332
+    /* "pyart/map/_gate_to_grid_map.pyx":336
  * 
  *         z_min = find_min(z, roi, self.z_step)
  *         if z_min > self.nz-1:             # <<<<<<<<<<<<<<
@@ -23836,17 +23937,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":334
+  /* "pyart/map/_gate_to_grid_map.pyx":338
  *         if z_min > self.nz-1:
  *             return 0
  *         z_max = find_max(z, roi, self.z_step, self.nz)             # <<<<<<<<<<<<<<
  *         if z_max < 0:
  *             return 0
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_z, __pyx_v_roi, __pyx_v_self->z_step, __pyx_v_self->nz); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 334, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(__pyx_v_z, __pyx_v_roi, __pyx_v_self->z_step, __pyx_v_self->nz); if (unlikely(__pyx_t_1 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 338, __pyx_L1_error)
   __pyx_v_z_max = __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":335
+  /* "pyart/map/_gate_to_grid_map.pyx":339
  *             return 0
  *         z_max = find_max(z, roi, self.z_step, self.nz)
  *         if z_max < 0:             # <<<<<<<<<<<<<<
@@ -23856,7 +23957,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_t_2 = (__pyx_v_z_max < 0);
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":336
+    /* "pyart/map/_gate_to_grid_map.pyx":340
  *         z_max = find_max(z, roi, self.z_step, self.nz)
  *         if z_max < 0:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23866,7 +23967,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":335
+    /* "pyart/map/_gate_to_grid_map.pyx":339
  *             return 0
  *         z_max = find_max(z, roi, self.z_step, self.nz)
  *         if z_max < 0:             # <<<<<<<<<<<<<<
@@ -23875,7 +23976,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":338
+  /* "pyart/map/_gate_to_grid_map.pyx":342
  *             return 0
  * 
  *         roi2 = roi * roi             # <<<<<<<<<<<<<<
@@ -23884,36 +23985,27 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
   __pyx_v_roi2 = (__pyx_v_roi * __pyx_v_roi);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":340
+  /* "pyart/map/_gate_to_grid_map.pyx":344
  *         roi2 = roi * roi
  * 
  *         if weighting_function == NEAREST:             # <<<<<<<<<<<<<<
  *             # Get the xi, yi, zi of desired weight
- *             min_dist2 = 1e30
+ *             x_argmin = -1
  */
   __pyx_t_2 = (__pyx_v_weighting_function == __pyx_v_5pyart_3map_17_gate_to_grid_map_NEAREST);
   if (__pyx_t_2) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":342
+    /* "pyart/map/_gate_to_grid_map.pyx":346
  *         if weighting_function == NEAREST:
  *             # Get the xi, yi, zi of desired weight
- *             min_dist2 = 1e30             # <<<<<<<<<<<<<<
- *             x_argmin = -1
- *             y_argmin = -1
- */
-    __pyx_v_min_dist2 = 1e30;
-
-    /* "pyart/map/_gate_to_grid_map.pyx":343
- *             # Get the xi, yi, zi of desired weight
- *             min_dist2 = 1e30
  *             x_argmin = -1             # <<<<<<<<<<<<<<
  *             y_argmin = -1
  *             z_argmin = -1
  */
     __pyx_v_x_argmin = -1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":344
- *             min_dist2 = 1e30
+    /* "pyart/map/_gate_to_grid_map.pyx":347
+ *             # Get the xi, yi, zi of desired weight
  *             x_argmin = -1
  *             y_argmin = -1             # <<<<<<<<<<<<<<
  *             z_argmin = -1
@@ -23921,7 +24013,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
     __pyx_v_y_argmin = -1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":345
+    /* "pyart/map/_gate_to_grid_map.pyx":348
  *             x_argmin = -1
  *             y_argmin = -1
  *             z_argmin = -1             # <<<<<<<<<<<<<<
@@ -23930,7 +24022,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
     __pyx_v_z_argmin = -1;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":346
+    /* "pyart/map/_gate_to_grid_map.pyx":349
  *             y_argmin = -1
  *             z_argmin = -1
  *             for xi in range(x_min, x_max+1):             # <<<<<<<<<<<<<<
@@ -23942,7 +24034,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     for (__pyx_t_1 = __pyx_v_x_min; __pyx_t_1 < __pyx_t_4; __pyx_t_1+=1) {
       __pyx_v_xi = __pyx_t_1;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":347
+      /* "pyart/map/_gate_to_grid_map.pyx":350
  *             z_argmin = -1
  *             for xi in range(x_min, x_max+1):
  *                 for yi in range(y_min, y_max+1):             # <<<<<<<<<<<<<<
@@ -23954,7 +24046,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
       for (__pyx_t_7 = __pyx_v_y_min; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
         __pyx_v_yi = __pyx_t_7;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":348
+        /* "pyart/map/_gate_to_grid_map.pyx":351
  *             for xi in range(x_min, x_max+1):
  *                 for yi in range(y_min, y_max+1):
  *                     for zi in range(z_min, z_max+1):             # <<<<<<<<<<<<<<
@@ -23966,7 +24058,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
         for (__pyx_t_10 = __pyx_v_z_min; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) {
           __pyx_v_zi = __pyx_t_10;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":349
+          /* "pyart/map/_gate_to_grid_map.pyx":352
  *                 for yi in range(y_min, y_max+1):
  *                     for zi in range(z_min, z_max+1):
  *                         xg = self.x_step * xi             # <<<<<<<<<<<<<<
@@ -23975,239 +24067,257 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
           __pyx_v_xg = (__pyx_v_self->x_step * __pyx_v_xi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":350
+          /* "pyart/map/_gate_to_grid_map.pyx":353
  *                     for zi in range(z_min, z_max+1):
  *                         xg = self.x_step * xi
  *                         yg = self.y_step * yi             # <<<<<<<<<<<<<<
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +
  */
           __pyx_v_yg = (__pyx_v_self->y_step * __pyx_v_yi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":351
+          /* "pyart/map/_gate_to_grid_map.pyx":354
  *                         xg = self.x_step * xi
  *                         yg = self.y_step * yi
  *                         zg = self.z_step * zi             # <<<<<<<<<<<<<<
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
- *                         if dist2 < min_dist2:
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +
+ *                                  dist_factor[1] * (yg - y)**2 +
  */
           __pyx_v_zg = (__pyx_v_self->z_step * __pyx_v_zi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":352
+          /* "pyart/map/_gate_to_grid_map.pyx":355
  *                         yg = self.y_step * yi
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)             # <<<<<<<<<<<<<<
- *                         if dist2 < min_dist2:
- *                             min_dist2 = dist2
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[1] * (yg - y)**2 +
+ *                                  dist_factor[0] * (zg - z)**2)
  */
-          __pyx_v_dist2 = ((((__pyx_v_xg - __pyx_v_x) * (__pyx_v_xg - __pyx_v_x)) + ((__pyx_v_yg - __pyx_v_y) * (__pyx_v_yg - __pyx_v_y))) + ((__pyx_v_zg - __pyx_v_z) * (__pyx_v_zg - __pyx_v_z)));
+          __pyx_t_11 = 2;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":353
+          /* "pyart/map/_gate_to_grid_map.pyx":356
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
- *                         if dist2 < min_dist2:             # <<<<<<<<<<<<<<
- *                             min_dist2 = dist2
- *                             x_argmin = xi
- */
-          __pyx_t_2 = (__pyx_v_dist2 < __pyx_v_min_dist2);
-          if (__pyx_t_2) {
-
-            /* "pyart/map/_gate_to_grid_map.pyx":354
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
- *                         if dist2 < min_dist2:
- *                             min_dist2 = dist2             # <<<<<<<<<<<<<<
- *                             x_argmin = xi
- *                             y_argmin = yi
- */
-            __pyx_v_min_dist2 = __pyx_v_dist2;
-
-            /* "pyart/map/_gate_to_grid_map.pyx":355
- *                         if dist2 < min_dist2:
- *                             min_dist2 = dist2
- *                             x_argmin = xi             # <<<<<<<<<<<<<<
- *                             y_argmin = yi
- *                             z_argmin = zi
- */
-            __pyx_v_x_argmin = __pyx_v_xi;
-
-            /* "pyart/map/_gate_to_grid_map.pyx":356
- *                             min_dist2 = dist2
- *                             x_argmin = xi
- *                             y_argmin = yi             # <<<<<<<<<<<<<<
- *                             z_argmin = zi
- * 
- */
-            __pyx_v_y_argmin = __pyx_v_yi;
-
-            /* "pyart/map/_gate_to_grid_map.pyx":357
- *                             x_argmin = xi
- *                             y_argmin = yi
- *                             z_argmin = zi             # <<<<<<<<<<<<<<
- * 
- *             for xi in range(x_min, x_max+1):
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +
+ *                                  dist_factor[1] * (yg - y)**2 +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[0] * (zg - z)**2)
+ *                         if dist2 >= roi2:
+ */
+          __pyx_t_12 = 1;
+
+          /* "pyart/map/_gate_to_grid_map.pyx":357
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +
+ *                                  dist_factor[1] * (yg - y)**2 +
+ *                                  dist_factor[0] * (zg - z)**2)             # <<<<<<<<<<<<<<
+ *                         if dist2 >= roi2:
+ *                             continue
  */
-            __pyx_v_z_argmin = __pyx_v_zi;
+          __pyx_t_13 = 0;
 
-            /* "pyart/map/_gate_to_grid_map.pyx":353
+          /* "pyart/map/_gate_to_grid_map.pyx":356
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
- *                         if dist2 < min_dist2:             # <<<<<<<<<<<<<<
- *                             min_dist2 = dist2
- *                             x_argmin = xi
+ *                         dist2 = (dist_factor[2] * (xg - x)**2 +
+ *                                  dist_factor[1] * (yg - y)**2 +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[0] * (zg - z)**2)
+ *                         if dist2 >= roi2:
  */
-          }
-        }
-      }
-    }
+          __pyx_v_dist2 = ((((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_11 * __pyx_v_dist_factor.strides[0]) ))) * powf((__pyx_v_xg - __pyx_v_x), 2.0)) + ((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_12 * __pyx_v_dist_factor.strides[0]) ))) * powf((__pyx_v_yg - __pyx_v_y), 2.0))) + ((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_13 * __pyx_v_dist_factor.strides[0]) ))) * powf((__pyx_v_zg - __pyx_v_z), 2.0)));
 
-    /* "pyart/map/_gate_to_grid_map.pyx":359
- *                             z_argmin = zi
- * 
- *             for xi in range(x_min, x_max+1):             # <<<<<<<<<<<<<<
- *                 for yi in range(y_min, y_max+1):
- *                     for zi in range(z_min, z_max+1):
+          /* "pyart/map/_gate_to_grid_map.pyx":358
+ *                                  dist_factor[1] * (yg - y)**2 +
+ *                                  dist_factor[0] * (zg - z)**2)
+ *                         if dist2 >= roi2:             # <<<<<<<<<<<<<<
+ *                             continue
+ *                         for i in range(self.nfields):
  */
-    __pyx_t_3 = (__pyx_v_x_max + 1);
-    __pyx_t_4 = __pyx_t_3;
-    for (__pyx_t_1 = __pyx_v_x_min; __pyx_t_1 < __pyx_t_4; __pyx_t_1+=1) {
-      __pyx_v_xi = __pyx_t_1;
+          __pyx_t_2 = (__pyx_v_dist2 >= __pyx_v_roi2);
+          if (__pyx_t_2) {
 
-      /* "pyart/map/_gate_to_grid_map.pyx":360
- * 
- *             for xi in range(x_min, x_max+1):
- *                 for yi in range(y_min, y_max+1):             # <<<<<<<<<<<<<<
- *                     for zi in range(z_min, z_max+1):
- *                         if (xi == x_argmin and
+            /* "pyart/map/_gate_to_grid_map.pyx":359
+ *                                  dist_factor[0] * (zg - z)**2)
+ *                         if dist2 >= roi2:
+ *                             continue             # <<<<<<<<<<<<<<
+ *                         for i in range(self.nfields):
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:
  */
-      __pyx_t_5 = (__pyx_v_y_max + 1);
-      __pyx_t_6 = __pyx_t_5;
-      for (__pyx_t_7 = __pyx_v_y_min; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
-        __pyx_v_yi = __pyx_t_7;
+            goto __pyx_L14_continue;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":361
- *             for xi in range(x_min, x_max+1):
- *                 for yi in range(y_min, y_max+1):
- *                     for zi in range(z_min, z_max+1):             # <<<<<<<<<<<<<<
- *                         if (xi == x_argmin and
- *                             yi == y_argmin and
+            /* "pyart/map/_gate_to_grid_map.pyx":358
+ *                                  dist_factor[1] * (yg - y)**2 +
+ *                                  dist_factor[0] * (zg - z)**2)
+ *                         if dist2 >= roi2:             # <<<<<<<<<<<<<<
+ *                             continue
+ *                         for i in range(self.nfields):
  */
-        __pyx_t_8 = (__pyx_v_z_max + 1);
-        __pyx_t_9 = __pyx_t_8;
-        for (__pyx_t_10 = __pyx_v_z_min; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) {
-          __pyx_v_zi = __pyx_t_10;
-
-          /* "pyart/map/_gate_to_grid_map.pyx":362
- *                 for yi in range(y_min, y_max+1):
- *                     for zi in range(z_min, z_max+1):
- *                         if (xi == x_argmin and             # <<<<<<<<<<<<<<
- *                             yi == y_argmin and
- *                             zi == z_argmin):
- */
-          __pyx_t_11 = (__pyx_v_xi == __pyx_v_x_argmin);
-          if (__pyx_t_11) {
-          } else {
-            __pyx_t_2 = __pyx_t_11;
-            goto __pyx_L24_bool_binop_done;
-          }
-
-          /* "pyart/map/_gate_to_grid_map.pyx":363
- *                     for zi in range(z_min, z_max+1):
- *                         if (xi == x_argmin and
- *                             yi == y_argmin and             # <<<<<<<<<<<<<<
- *                             zi == z_argmin):
- *                             for i in range(self.nfields):
- */
-          __pyx_t_11 = (__pyx_v_yi == __pyx_v_y_argmin);
-          if (__pyx_t_11) {
-          } else {
-            __pyx_t_2 = __pyx_t_11;
-            goto __pyx_L24_bool_binop_done;
           }
 
-          /* "pyart/map/_gate_to_grid_map.pyx":364
- *                         if (xi == x_argmin and
- *                             yi == y_argmin and
- *                             zi == z_argmin):             # <<<<<<<<<<<<<<
- *                             for i in range(self.nfields):
- *                                 self.grid_wsum[zi, yi, xi, i] += 1
+          /* "pyart/map/_gate_to_grid_map.pyx":360
+ *                         if dist2 >= roi2:
+ *                             continue
+ *                         for i in range(self.nfields):             # <<<<<<<<<<<<<<
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2
  */
-          __pyx_t_11 = (__pyx_v_zi == __pyx_v_z_argmin);
-          __pyx_t_2 = __pyx_t_11;
-          __pyx_L24_bool_binop_done:;
+          __pyx_t_14 = __pyx_v_self->nfields;
+          __pyx_t_15 = __pyx_t_14;
+          for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) {
+            __pyx_v_i = __pyx_t_16;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":362
- *                 for yi in range(y_min, y_max+1):
- *                     for zi in range(z_min, z_max+1):
- *                         if (xi == x_argmin and             # <<<<<<<<<<<<<<
- *                             yi == y_argmin and
- *                             zi == z_argmin):
+            /* "pyart/map/_gate_to_grid_map.pyx":361
+ *                             continue
+ *                         for i in range(self.nfields):
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:             # <<<<<<<<<<<<<<
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2
+ *                                 x_argmin = xi
  */
-          if (__pyx_t_2) {
+            __pyx_t_13 = __pyx_v_zi;
+            __pyx_t_12 = __pyx_v_yi;
+            __pyx_t_11 = __pyx_v_xi;
+            __pyx_t_17 = __pyx_v_i;
+            __pyx_t_2 = (__pyx_v_dist2 < (*((double *) ( /* dim=3 */ (( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->min_dist2.data + __pyx_t_13 * __pyx_v_self->min_dist2.strides[0]) ) + __pyx_t_12 * __pyx_v_self->min_dist2.strides[1]) ) + __pyx_t_11 * __pyx_v_self->min_dist2.strides[2]) ) + __pyx_t_17 * __pyx_v_self->min_dist2.strides[3]) ))));
+            if (__pyx_t_2) {
 
-            /* "pyart/map/_gate_to_grid_map.pyx":365
- *                             yi == y_argmin and
- *                             zi == z_argmin):
- *                             for i in range(self.nfields):             # <<<<<<<<<<<<<<
- *                                 self.grid_wsum[zi, yi, xi, i] += 1
- *                                 self.grid_sum[zi, yi, xi, i] += values[i]
+              /* "pyart/map/_gate_to_grid_map.pyx":362
+ *                         for i in range(self.nfields):
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2             # <<<<<<<<<<<<<<
+ *                                 x_argmin = xi
+ *                                 y_argmin = yi
  */
-            __pyx_t_12 = __pyx_v_self->nfields;
-            __pyx_t_13 = __pyx_t_12;
-            for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
-              __pyx_v_i = __pyx_t_14;
+              __pyx_t_17 = __pyx_v_zi;
+              __pyx_t_11 = __pyx_v_yi;
+              __pyx_t_12 = __pyx_v_xi;
+              __pyx_t_13 = __pyx_v_i;
+              *((double *) ( /* dim=3 */ (( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->min_dist2.data + __pyx_t_17 * __pyx_v_self->min_dist2.strides[0]) ) + __pyx_t_11 * __pyx_v_self->min_dist2.strides[1]) ) + __pyx_t_12 * __pyx_v_self->min_dist2.strides[2]) ) + __pyx_t_13 * __pyx_v_self->min_dist2.strides[3]) )) = __pyx_v_dist2;
+
+              /* "pyart/map/_gate_to_grid_map.pyx":363
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2
+ *                                 x_argmin = xi             # <<<<<<<<<<<<<<
+ *                                 y_argmin = yi
+ *                                 z_argmin = zi
+ */
+              __pyx_v_x_argmin = __pyx_v_xi;
+
+              /* "pyart/map/_gate_to_grid_map.pyx":364
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2
+ *                                 x_argmin = xi
+ *                                 y_argmin = yi             # <<<<<<<<<<<<<<
+ *                                 z_argmin = zi
+ *                                 if masks[i]:
+ */
+              __pyx_v_y_argmin = __pyx_v_yi;
+
+              /* "pyart/map/_gate_to_grid_map.pyx":365
+ *                                 x_argmin = xi
+ *                                 y_argmin = yi
+ *                                 z_argmin = zi             # <<<<<<<<<<<<<<
+ *                                 if masks[i]:
+ *                                     self.grid_wsum[zi, yi, xi, i] = 0
+ */
+              __pyx_v_z_argmin = __pyx_v_zi;
 
               /* "pyart/map/_gate_to_grid_map.pyx":366
- *                             zi == z_argmin):
- *                             for i in range(self.nfields):
- *                                 self.grid_wsum[zi, yi, xi, i] += 1             # <<<<<<<<<<<<<<
- *                                 self.grid_sum[zi, yi, xi, i] += values[i]
- * 
+ *                                 y_argmin = yi
+ *                                 z_argmin = zi
+ *                                 if masks[i]:             # <<<<<<<<<<<<<<
+ *                                     self.grid_wsum[zi, yi, xi, i] = 0
+ *                                     self.grid_sum[zi, yi, xi, i] = 0
+ */
+              __pyx_t_13 = __pyx_v_i;
+              __pyx_t_2 = ((*((char *) ( /* dim=0 */ (__pyx_v_masks.data + __pyx_t_13 * __pyx_v_masks.strides[0]) ))) != 0);
+              if (__pyx_t_2) {
+
+                /* "pyart/map/_gate_to_grid_map.pyx":367
+ *                                 z_argmin = zi
+ *                                 if masks[i]:
+ *                                     self.grid_wsum[zi, yi, xi, i] = 0             # <<<<<<<<<<<<<<
+ *                                     self.grid_sum[zi, yi, xi, i] = 0
+ *                                 else:
+ */
+                __pyx_t_13 = __pyx_v_zi;
+                __pyx_t_12 = __pyx_v_yi;
+                __pyx_t_11 = __pyx_v_xi;
+                __pyx_t_17 = __pyx_v_i;
+                *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_wsum.data + __pyx_t_13 * __pyx_v_self->grid_wsum.strides[0]) ) + __pyx_t_12 * __pyx_v_self->grid_wsum.strides[1]) ) + __pyx_t_11 * __pyx_v_self->grid_wsum.strides[2]) )) + __pyx_t_17)) )) = 0.0;
+
+                /* "pyart/map/_gate_to_grid_map.pyx":368
+ *                                 if masks[i]:
+ *                                     self.grid_wsum[zi, yi, xi, i] = 0
+ *                                     self.grid_sum[zi, yi, xi, i] = 0             # <<<<<<<<<<<<<<
+ *                                 else:
+ *                                     self.grid_wsum[z_argmin, y_argmin, x_argmin, i] = 1
+ */
+                __pyx_t_17 = __pyx_v_zi;
+                __pyx_t_11 = __pyx_v_yi;
+                __pyx_t_12 = __pyx_v_xi;
+                __pyx_t_13 = __pyx_v_i;
+                *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_sum.data + __pyx_t_17 * __pyx_v_self->grid_sum.strides[0]) ) + __pyx_t_11 * __pyx_v_self->grid_sum.strides[1]) ) + __pyx_t_12 * __pyx_v_self->grid_sum.strides[2]) )) + __pyx_t_13)) )) = 0.0;
+
+                /* "pyart/map/_gate_to_grid_map.pyx":366
+ *                                 y_argmin = yi
+ *                                 z_argmin = zi
+ *                                 if masks[i]:             # <<<<<<<<<<<<<<
+ *                                     self.grid_wsum[zi, yi, xi, i] = 0
+ *                                     self.grid_sum[zi, yi, xi, i] = 0
+ */
+                goto __pyx_L20;
+              }
+
+              /* "pyart/map/_gate_to_grid_map.pyx":370
+ *                                     self.grid_sum[zi, yi, xi, i] = 0
+ *                                 else:
+ *                                     self.grid_wsum[z_argmin, y_argmin, x_argmin, i] = 1             # <<<<<<<<<<<<<<
+ *                                     self.grid_sum[z_argmin, y_argmin, x_argmin, i] = values[i]
+ *         else:
  */
-              __pyx_t_15 = __pyx_v_zi;
-              __pyx_t_16 = __pyx_v_yi;
-              __pyx_t_17 = __pyx_v_xi;
-              __pyx_t_18 = __pyx_v_i;
-              *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_wsum.data + __pyx_t_15 * __pyx_v_self->grid_wsum.strides[0]) ) + __pyx_t_16 * __pyx_v_self->grid_wsum.strides[1]) ) + __pyx_t_17 * __pyx_v_self->grid_wsum.strides[2]) )) + __pyx_t_18)) )) += 1.0;
-
-              /* "pyart/map/_gate_to_grid_map.pyx":367
- *                             for i in range(self.nfields):
- *                                 self.grid_wsum[zi, yi, xi, i] += 1
- *                                 self.grid_sum[zi, yi, xi, i] += values[i]             # <<<<<<<<<<<<<<
- * 
+              /*else*/ {
+                __pyx_t_13 = __pyx_v_z_argmin;
+                __pyx_t_12 = __pyx_v_y_argmin;
+                __pyx_t_11 = __pyx_v_x_argmin;
+                __pyx_t_17 = __pyx_v_i;
+                *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_wsum.data + __pyx_t_13 * __pyx_v_self->grid_wsum.strides[0]) ) + __pyx_t_12 * __pyx_v_self->grid_wsum.strides[1]) ) + __pyx_t_11 * __pyx_v_self->grid_wsum.strides[2]) )) + __pyx_t_17)) )) = 1.0;
+
+                /* "pyart/map/_gate_to_grid_map.pyx":371
+ *                                 else:
+ *                                     self.grid_wsum[z_argmin, y_argmin, x_argmin, i] = 1
+ *                                     self.grid_sum[z_argmin, y_argmin, x_argmin, i] = values[i]             # <<<<<<<<<<<<<<
  *         else:
+ *             for xi in range(x_min, x_max+1):
  */
-              __pyx_t_18 = __pyx_v_i;
-              __pyx_t_17 = __pyx_v_zi;
-              __pyx_t_16 = __pyx_v_yi;
-              __pyx_t_15 = __pyx_v_xi;
-              __pyx_t_19 = __pyx_v_i;
-              *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_sum.data + __pyx_t_17 * __pyx_v_self->grid_sum.strides[0]) ) + __pyx_t_16 * __pyx_v_self->grid_sum.strides[1]) ) + __pyx_t_15 * __pyx_v_self->grid_sum.strides[2]) )) + __pyx_t_19)) )) += (*((float *) ( /* dim=0 */ (__pyx_v_values.data + __pyx_t_18 * __pyx_v_values.strides[0]) )));
-            }
+                __pyx_t_17 = __pyx_v_i;
+                __pyx_t_11 = __pyx_v_z_argmin;
+                __pyx_t_12 = __pyx_v_y_argmin;
+                __pyx_t_13 = __pyx_v_x_argmin;
+                __pyx_t_18 = __pyx_v_i;
+                *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_sum.data + __pyx_t_11 * __pyx_v_self->grid_sum.strides[0]) ) + __pyx_t_12 * __pyx_v_self->grid_sum.strides[1]) ) + __pyx_t_13 * __pyx_v_self->grid_sum.strides[2]) )) + __pyx_t_18)) )) = (*((float *) ( /* dim=0 */ (__pyx_v_values.data + __pyx_t_17 * __pyx_v_values.strides[0]) )));
+              }
+              __pyx_L20:;
 
-            /* "pyart/map/_gate_to_grid_map.pyx":362
- *                 for yi in range(y_min, y_max+1):
- *                     for zi in range(z_min, z_max+1):
- *                         if (xi == x_argmin and             # <<<<<<<<<<<<<<
- *                             yi == y_argmin and
- *                             zi == z_argmin):
+              /* "pyart/map/_gate_to_grid_map.pyx":361
+ *                             continue
+ *                         for i in range(self.nfields):
+ *                             if dist2 < self.min_dist2[zi, yi, xi, i]:             # <<<<<<<<<<<<<<
+ *                                 self.min_dist2[zi, yi, xi, i] = dist2
+ *                                 x_argmin = xi
  */
+            }
           }
+          __pyx_L14_continue:;
         }
       }
     }
 
-    /* "pyart/map/_gate_to_grid_map.pyx":340
+    /* "pyart/map/_gate_to_grid_map.pyx":344
  *         roi2 = roi * roi
  * 
  *         if weighting_function == NEAREST:             # <<<<<<<<<<<<<<
  *             # Get the xi, yi, zi of desired weight
- *             min_dist2 = 1e30
+ *             x_argmin = -1
  */
     goto __pyx_L9;
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":370
- * 
+  /* "pyart/map/_gate_to_grid_map.pyx":373
+ *                                     self.grid_sum[z_argmin, y_argmin, x_argmin, i] = values[i]
  *         else:
  *             for xi in range(x_min, x_max+1):             # <<<<<<<<<<<<<<
  *                 for yi in range(y_min, y_max+1):
@@ -24219,7 +24329,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
     for (__pyx_t_1 = __pyx_v_x_min; __pyx_t_1 < __pyx_t_4; __pyx_t_1+=1) {
       __pyx_v_xi = __pyx_t_1;
 
-      /* "pyart/map/_gate_to_grid_map.pyx":371
+      /* "pyart/map/_gate_to_grid_map.pyx":374
  *         else:
  *             for xi in range(x_min, x_max+1):
  *                 for yi in range(y_min, y_max+1):             # <<<<<<<<<<<<<<
@@ -24231,7 +24341,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
       for (__pyx_t_7 = __pyx_v_y_min; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
         __pyx_v_yi = __pyx_t_7;
 
-        /* "pyart/map/_gate_to_grid_map.pyx":372
+        /* "pyart/map/_gate_to_grid_map.pyx":375
  *             for xi in range(x_min, x_max+1):
  *                 for yi in range(y_min, y_max+1):
  *                     for zi in range(z_min, z_max+1):             # <<<<<<<<<<<<<<
@@ -24243,7 +24353,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
         for (__pyx_t_10 = __pyx_v_z_min; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) {
           __pyx_v_zi = __pyx_t_10;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":373
+          /* "pyart/map/_gate_to_grid_map.pyx":376
  *                 for yi in range(y_min, y_max+1):
  *                     for zi in range(z_min, z_max+1):
  *                         xg = self.x_step * xi             # <<<<<<<<<<<<<<
@@ -24252,35 +24362,62 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
           __pyx_v_xg = (__pyx_v_self->x_step * __pyx_v_xi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":374
+          /* "pyart/map/_gate_to_grid_map.pyx":377
  *                     for zi in range(z_min, z_max+1):
  *                         xg = self.x_step * xi
  *                         yg = self.y_step * yi             # <<<<<<<<<<<<<<
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
  */
           __pyx_v_yg = (__pyx_v_self->y_step * __pyx_v_yi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":375
+          /* "pyart/map/_gate_to_grid_map.pyx":378
  *                         xg = self.x_step * xi
  *                         yg = self.y_step * yi
  *                         zg = self.z_step * zi             # <<<<<<<<<<<<<<
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
- * 
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
+ *                                  dist_factor[1] * (yg-y)*(yg-y) +
  */
           __pyx_v_zg = (__pyx_v_self->z_step * __pyx_v_zi);
 
-          /* "pyart/map/_gate_to_grid_map.pyx":376
+          /* "pyart/map/_gate_to_grid_map.pyx":379
  *                         yg = self.y_step * yi
  *                         zg = self.z_step * zi
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)             # <<<<<<<<<<<<<<
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[1] * (yg-y)*(yg-y) +
+ *                                  dist_factor[0] * (zg-z)*(zg-z))
+ */
+          __pyx_t_17 = 2;
+
+          /* "pyart/map/_gate_to_grid_map.pyx":380
+ *                         zg = self.z_step * zi
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
+ *                                  dist_factor[1] * (yg-y)*(yg-y) +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[0] * (zg-z)*(zg-z))
+ * 
+ */
+          __pyx_t_18 = 1;
+
+          /* "pyart/map/_gate_to_grid_map.pyx":381
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
+ *                                  dist_factor[1] * (yg-y)*(yg-y) +
+ *                                  dist_factor[0] * (zg-z)*(zg-z))             # <<<<<<<<<<<<<<
  * 
  *                         if dist2 > roi2:
  */
-          __pyx_v_dist2 = ((((__pyx_v_xg - __pyx_v_x) * (__pyx_v_xg - __pyx_v_x)) + ((__pyx_v_yg - __pyx_v_y) * (__pyx_v_yg - __pyx_v_y))) + ((__pyx_v_zg - __pyx_v_z) * (__pyx_v_zg - __pyx_v_z)));
+          __pyx_t_13 = 0;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":378
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
+          /* "pyart/map/_gate_to_grid_map.pyx":380
+ *                         zg = self.z_step * zi
+ *                         dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
+ *                                  dist_factor[1] * (yg-y)*(yg-y) +             # <<<<<<<<<<<<<<
+ *                                  dist_factor[0] * (zg-z)*(zg-z))
+ * 
+ */
+          __pyx_v_dist2 = (((((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_17 * __pyx_v_dist_factor.strides[0]) ))) * (__pyx_v_xg - __pyx_v_x)) * (__pyx_v_xg - __pyx_v_x)) + (((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_18 * __pyx_v_dist_factor.strides[0]) ))) * (__pyx_v_yg - __pyx_v_y)) * (__pyx_v_yg - __pyx_v_y))) + (((*((float *) ( /* dim=0 */ (__pyx_v_dist_factor.data + __pyx_t_13 * __pyx_v_dist_factor.strides[0]) ))) * (__pyx_v_zg - __pyx_v_z)) * (__pyx_v_zg - __pyx_v_z)));
+
+          /* "pyart/map/_gate_to_grid_map.pyx":383
+ *                                  dist_factor[0] * (zg-z)*(zg-z))
  * 
  *                         if dist2 > roi2:             # <<<<<<<<<<<<<<
  *                             continue
@@ -24289,17 +24426,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
           __pyx_t_2 = (__pyx_v_dist2 > __pyx_v_roi2);
           if (__pyx_t_2) {
 
-            /* "pyart/map/_gate_to_grid_map.pyx":379
+            /* "pyart/map/_gate_to_grid_map.pyx":384
  * 
  *                         if dist2 > roi2:
  *                             continue             # <<<<<<<<<<<<<<
  * 
  *                         if weighting_function == BARNES:
  */
-            goto __pyx_L33_continue;
+            goto __pyx_L25_continue;
 
-            /* "pyart/map/_gate_to_grid_map.pyx":378
- *                         dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
+            /* "pyart/map/_gate_to_grid_map.pyx":383
+ *                                  dist_factor[0] * (zg-z)*(zg-z))
  * 
  *                         if dist2 > roi2:             # <<<<<<<<<<<<<<
  *                             continue
@@ -24307,7 +24444,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
           }
 
-          /* "pyart/map/_gate_to_grid_map.pyx":381
+          /* "pyart/map/_gate_to_grid_map.pyx":386
  *                             continue
  * 
  *                         if weighting_function == BARNES:             # <<<<<<<<<<<<<<
@@ -24317,7 +24454,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
           __pyx_t_2 = (__pyx_v_weighting_function == __pyx_v_5pyart_3map_17_gate_to_grid_map_BARNES);
           if (__pyx_t_2) {
 
-            /* "pyart/map/_gate_to_grid_map.pyx":382
+            /* "pyart/map/_gate_to_grid_map.pyx":387
  * 
  *                         if weighting_function == BARNES:
  *                             weight = exp(-(dist2) / (2*roi2)) + 1e-5             # <<<<<<<<<<<<<<
@@ -24326,17 +24463,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
             __pyx_v_weight = (exp(((-__pyx_v_dist2) / (2.0 * __pyx_v_roi2))) + 1e-5);
 
-            /* "pyart/map/_gate_to_grid_map.pyx":381
+            /* "pyart/map/_gate_to_grid_map.pyx":386
  *                             continue
  * 
  *                         if weighting_function == BARNES:             # <<<<<<<<<<<<<<
  *                             weight = exp(-(dist2) / (2*roi2)) + 1e-5
  *                         elif weighting_function == BARNES2:
  */
-            goto __pyx_L36;
+            goto __pyx_L28;
           }
 
-          /* "pyart/map/_gate_to_grid_map.pyx":383
+          /* "pyart/map/_gate_to_grid_map.pyx":388
  *                         if weighting_function == BARNES:
  *                             weight = exp(-(dist2) / (2*roi2)) + 1e-5
  *                         elif weighting_function == BARNES2:             # <<<<<<<<<<<<<<
@@ -24346,7 +24483,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
           __pyx_t_2 = (__pyx_v_weighting_function == __pyx_v_5pyart_3map_17_gate_to_grid_map_BARNES2);
           if (__pyx_t_2) {
 
-            /* "pyart/map/_gate_to_grid_map.pyx":384
+            /* "pyart/map/_gate_to_grid_map.pyx":389
  *                             weight = exp(-(dist2) / (2*roi2)) + 1e-5
  *                         elif weighting_function == BARNES2:
  *                             weight = exp(-(dist2) / (roi2/4)) + 1e-5             # <<<<<<<<<<<<<<
@@ -24355,17 +24492,17 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
             __pyx_v_weight = (exp(((-__pyx_v_dist2) / (__pyx_v_roi2 / 4.0))) + 1e-5);
 
-            /* "pyart/map/_gate_to_grid_map.pyx":383
+            /* "pyart/map/_gate_to_grid_map.pyx":388
  *                         if weighting_function == BARNES:
  *                             weight = exp(-(dist2) / (2*roi2)) + 1e-5
  *                         elif weighting_function == BARNES2:             # <<<<<<<<<<<<<<
  *                             weight = exp(-(dist2) / (roi2/4)) + 1e-5
  *                         else: # Cressman
  */
-            goto __pyx_L36;
+            goto __pyx_L28;
           }
 
-          /* "pyart/map/_gate_to_grid_map.pyx":386
+          /* "pyart/map/_gate_to_grid_map.pyx":391
  *                             weight = exp(-(dist2) / (roi2/4)) + 1e-5
  *                         else: # Cressman
  *                             weight = (roi2 - dist2) / (roi2 + dist2)             # <<<<<<<<<<<<<<
@@ -24375,41 +24512,41 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
           /*else*/ {
             __pyx_v_weight = ((__pyx_v_roi2 - __pyx_v_dist2) / (__pyx_v_roi2 + __pyx_v_dist2));
           }
-          __pyx_L36:;
+          __pyx_L28:;
 
-          /* "pyart/map/_gate_to_grid_map.pyx":388
+          /* "pyart/map/_gate_to_grid_map.pyx":393
  *                             weight = (roi2 - dist2) / (roi2 + dist2)
  * 
  *                         for i in range(self.nfields):             # <<<<<<<<<<<<<<
  *                             if masks[i]:
  *                                 continue
  */
-          __pyx_t_12 = __pyx_v_self->nfields;
-          __pyx_t_13 = __pyx_t_12;
-          for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
-            __pyx_v_i = __pyx_t_14;
+          __pyx_t_14 = __pyx_v_self->nfields;
+          __pyx_t_15 = __pyx_t_14;
+          for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) {
+            __pyx_v_i = __pyx_t_16;
 
-            /* "pyart/map/_gate_to_grid_map.pyx":389
+            /* "pyart/map/_gate_to_grid_map.pyx":394
  * 
  *                         for i in range(self.nfields):
  *                             if masks[i]:             # <<<<<<<<<<<<<<
  *                                 continue
  *                             self.grid_sum[zi, yi, xi, i] += weight * values[i]
  */
-            __pyx_t_18 = __pyx_v_i;
-            __pyx_t_2 = ((*((char *) ( /* dim=0 */ (__pyx_v_masks.data + __pyx_t_18 * __pyx_v_masks.strides[0]) ))) != 0);
+            __pyx_t_13 = __pyx_v_i;
+            __pyx_t_2 = ((*((char *) ( /* dim=0 */ (__pyx_v_masks.data + __pyx_t_13 * __pyx_v_masks.strides[0]) ))) != 0);
             if (__pyx_t_2) {
 
-              /* "pyart/map/_gate_to_grid_map.pyx":390
+              /* "pyart/map/_gate_to_grid_map.pyx":395
  *                         for i in range(self.nfields):
  *                             if masks[i]:
  *                                 continue             # <<<<<<<<<<<<<<
  *                             self.grid_sum[zi, yi, xi, i] += weight * values[i]
  *                             self.grid_wsum[zi, yi, xi, i] += weight
  */
-              goto __pyx_L37_continue;
+              goto __pyx_L29_continue;
 
-              /* "pyart/map/_gate_to_grid_map.pyx":389
+              /* "pyart/map/_gate_to_grid_map.pyx":394
  * 
  *                         for i in range(self.nfields):
  *                             if masks[i]:             # <<<<<<<<<<<<<<
@@ -24418,42 +24555,42 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
  */
             }
 
-            /* "pyart/map/_gate_to_grid_map.pyx":391
+            /* "pyart/map/_gate_to_grid_map.pyx":396
  *                             if masks[i]:
  *                                 continue
  *                             self.grid_sum[zi, yi, xi, i] += weight * values[i]             # <<<<<<<<<<<<<<
  *                             self.grid_wsum[zi, yi, xi, i] += weight
  *         return 1
  */
-            __pyx_t_18 = __pyx_v_i;
-            __pyx_t_19 = __pyx_v_zi;
-            __pyx_t_15 = __pyx_v_yi;
-            __pyx_t_16 = __pyx_v_xi;
-            __pyx_t_17 = __pyx_v_i;
-            *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_sum.data + __pyx_t_19 * __pyx_v_self->grid_sum.strides[0]) ) + __pyx_t_15 * __pyx_v_self->grid_sum.strides[1]) ) + __pyx_t_16 * __pyx_v_self->grid_sum.strides[2]) )) + __pyx_t_17)) )) += (__pyx_v_weight * (*((float *) ( /* dim=0 */ (__pyx_v_values.data + __pyx_t_18 * __pyx_v_values.strides[0]) ))));
+            __pyx_t_13 = __pyx_v_i;
+            __pyx_t_18 = __pyx_v_zi;
+            __pyx_t_17 = __pyx_v_yi;
+            __pyx_t_12 = __pyx_v_xi;
+            __pyx_t_11 = __pyx_v_i;
+            *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_sum.data + __pyx_t_18 * __pyx_v_self->grid_sum.strides[0]) ) + __pyx_t_17 * __pyx_v_self->grid_sum.strides[1]) ) + __pyx_t_12 * __pyx_v_self->grid_sum.strides[2]) )) + __pyx_t_11)) )) += (__pyx_v_weight * (*((float *) ( /* dim=0 */ (__pyx_v_values.data + __pyx_t_13 * __pyx_v_values.strides[0]) ))));
 
-            /* "pyart/map/_gate_to_grid_map.pyx":392
+            /* "pyart/map/_gate_to_grid_map.pyx":397
  *                                 continue
  *                             self.grid_sum[zi, yi, xi, i] += weight * values[i]
  *                             self.grid_wsum[zi, yi, xi, i] += weight             # <<<<<<<<<<<<<<
  *         return 1
  * 
  */
-            __pyx_t_18 = __pyx_v_zi;
-            __pyx_t_17 = __pyx_v_yi;
-            __pyx_t_16 = __pyx_v_xi;
-            __pyx_t_15 = __pyx_v_i;
-            *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_wsum.data + __pyx_t_18 * __pyx_v_self->grid_wsum.strides[0]) ) + __pyx_t_17 * __pyx_v_self->grid_wsum.strides[1]) ) + __pyx_t_16 * __pyx_v_self->grid_wsum.strides[2]) )) + __pyx_t_15)) )) += __pyx_v_weight;
-            __pyx_L37_continue:;
+            __pyx_t_13 = __pyx_v_zi;
+            __pyx_t_11 = __pyx_v_yi;
+            __pyx_t_12 = __pyx_v_xi;
+            __pyx_t_17 = __pyx_v_i;
+            *((float *) ( /* dim=3 */ ((char *) (((float *) ( /* dim=2 */ (( /* dim=1 */ (( /* dim=0 */ (__pyx_v_self->grid_wsum.data + __pyx_t_13 * __pyx_v_self->grid_wsum.strides[0]) ) + __pyx_t_11 * __pyx_v_self->grid_wsum.strides[1]) ) + __pyx_t_12 * __pyx_v_self->grid_wsum.strides[2]) )) + __pyx_t_17)) )) += __pyx_v_weight;
+            __pyx_L29_continue:;
           }
-          __pyx_L33_continue:;
+          __pyx_L25_continue:;
         }
       }
     }
   }
   __pyx_L9:;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":393
+  /* "pyart/map/_gate_to_grid_map.pyx":398
  *                             self.grid_sum[zi, yi, xi, i] += weight * values[i]
  *                             self.grid_wsum[zi, yi, xi, i] += weight
  *         return 1             # <<<<<<<<<<<<<<
@@ -24463,12 +24600,12 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate(s
   __pyx_r = 1;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":303
+  /* "pyart/map/_gate_to_grid_map.pyx":307
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cdef int map_gate(self, float x, float y, float z, float roi,             # <<<<<<<<<<<<<<
  *                       float[:] values, char[:] masks,
- *                       int weighting_function):
+ *                       int weighting_function, float[:] dist_factor):
  */
 
   /* function exit code */
@@ -24545,7 +24682,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
   PyObject *__pyx_t_11 = NULL;
   PyObject *__pyx_t_12 = NULL;
   PyObject *__pyx_t_13 = NULL;
-  int __pyx_t_14;
+  PyObject *__pyx_t_14 = NULL;
+  int __pyx_t_15;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -24554,7 +24692,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
   /* "(tree fragment)":5
  *     cdef object _dict
  *     cdef bint use_setstate
- *     state = (self.grid_sum, self.grid_wsum, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)             # <<<<<<<<<<<<<<
+ *     state = (self.grid_sum, self.grid_wsum, self.min_dist2, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)             # <<<<<<<<<<<<<<
  *     _dict = getattr(self, '__dict__', None)
  *     if _dict is not None:
  */
@@ -24564,52 +24702,57 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
   if (unlikely(!__pyx_v_self->grid_wsum.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 5, __pyx_L1_error)}
   __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->grid_wsum, 4, (PyObject *(*)(char *)) __pyx_memview_get_float, (int (*)(char *, PyObject *)) __pyx_memview_set_float, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_self->nfields); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
+  if (unlikely(!__pyx_v_self->min_dist2.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 5, __pyx_L1_error)}
+  __pyx_t_3 = __pyx_memoryview_fromslice(__pyx_v_self->min_dist2, 4, (PyObject *(*)(char *)) __pyx_memview_get_double, (int (*)(char *, PyObject *)) __pyx_memview_set_double, 0);; if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_self->nx); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_self->nfields); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyInt_From_int(__pyx_v_self->ny); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_From_int(__pyx_v_self->nx); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_self->nz); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_self->ny); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_7 = PyFloat_FromDouble(__pyx_v_self->x_start); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_self->nz); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  __pyx_t_8 = PyFloat_FromDouble(__pyx_v_self->x_step); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_8 = PyFloat_FromDouble(__pyx_v_self->x_start); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_8);
-  __pyx_t_9 = PyFloat_FromDouble(__pyx_v_self->y_start); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_9 = PyFloat_FromDouble(__pyx_v_self->x_step); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_9);
-  __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->y_step); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->y_start); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_10);
-  __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->z_start); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->y_step); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
-  __pyx_t_12 = PyFloat_FromDouble(__pyx_v_self->z_step); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_12 = PyFloat_FromDouble(__pyx_v_self->z_start); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_12);
-  __pyx_t_13 = PyTuple_New(12); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_t_13 = PyFloat_FromDouble(__pyx_v_self->z_step); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 5, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_13);
+  __pyx_t_14 = PyTuple_New(13); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_14);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 2, __pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 2, __pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 3, __pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 3, __pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 4, __pyx_t_5)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 4, __pyx_t_5)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_6);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 5, __pyx_t_6)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 5, __pyx_t_6)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_7);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 6, __pyx_t_7)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 6, __pyx_t_7)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_8);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 7, __pyx_t_8)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 7, __pyx_t_8)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_9);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 8, __pyx_t_9)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 8, __pyx_t_9)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_10);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 9, __pyx_t_10)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 9, __pyx_t_10)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_11);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 10, __pyx_t_11)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 10, __pyx_t_11)) __PYX_ERR(1, 5, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_12);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 11, __pyx_t_12)) __PYX_ERR(1, 5, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 11, __pyx_t_12)) __PYX_ERR(1, 5, __pyx_L1_error);
+  __Pyx_GIVEREF(__pyx_t_13);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 12, __pyx_t_13)) __PYX_ERR(1, 5, __pyx_L1_error);
   __pyx_t_1 = 0;
   __pyx_t_2 = 0;
   __pyx_t_3 = 0;
@@ -24622,30 +24765,31 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
   __pyx_t_10 = 0;
   __pyx_t_11 = 0;
   __pyx_t_12 = 0;
-  __pyx_v_state = ((PyObject*)__pyx_t_13);
   __pyx_t_13 = 0;
+  __pyx_v_state = ((PyObject*)__pyx_t_14);
+  __pyx_t_14 = 0;
 
   /* "(tree fragment)":6
  *     cdef bint use_setstate
- *     state = (self.grid_sum, self.grid_wsum, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
+ *     state = (self.grid_sum, self.grid_wsum, self.min_dist2, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
  *     _dict = getattr(self, '__dict__', None)             # <<<<<<<<<<<<<<
  *     if _dict is not None:
  *         state += (_dict,)
  */
-  __pyx_t_13 = __Pyx_GetAttr3(((PyObject *)__pyx_v_self), __pyx_n_s_dict, Py_None); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 6, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_13);
-  __pyx_v__dict = __pyx_t_13;
-  __pyx_t_13 = 0;
+  __pyx_t_14 = __Pyx_GetAttr3(((PyObject *)__pyx_v_self), __pyx_n_s_dict, Py_None); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 6, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_14);
+  __pyx_v__dict = __pyx_t_14;
+  __pyx_t_14 = 0;
 
   /* "(tree fragment)":7
- *     state = (self.grid_sum, self.grid_wsum, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
+ *     state = (self.grid_sum, self.grid_wsum, self.min_dist2, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
  *     _dict = getattr(self, '__dict__', None)
  *     if _dict is not None:             # <<<<<<<<<<<<<<
  *         state += (_dict,)
  *         use_setstate = True
  */
-  __pyx_t_14 = (__pyx_v__dict != Py_None);
-  if (__pyx_t_14) {
+  __pyx_t_15 = (__pyx_v__dict != Py_None);
+  if (__pyx_t_15) {
 
     /* "(tree fragment)":8
  *     _dict = getattr(self, '__dict__', None)
@@ -24654,16 +24798,16 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
  *         use_setstate = True
  *     else:
  */
-    __pyx_t_13 = PyTuple_New(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 8, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_13);
+    __pyx_t_14 = PyTuple_New(1); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 8, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_14);
     __Pyx_INCREF(__pyx_v__dict);
     __Pyx_GIVEREF(__pyx_v__dict);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_v__dict)) __PYX_ERR(1, 8, __pyx_L1_error);
-    __pyx_t_12 = PyNumber_InPlaceAdd(__pyx_v_state, __pyx_t_13); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 8, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_12);
-    __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
-    __Pyx_DECREF_SET(__pyx_v_state, ((PyObject*)__pyx_t_12));
-    __pyx_t_12 = 0;
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_v__dict)) __PYX_ERR(1, 8, __pyx_L1_error);
+    __pyx_t_13 = PyNumber_InPlaceAdd(__pyx_v_state, __pyx_t_14); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 8, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_13);
+    __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
+    __Pyx_DECREF_SET(__pyx_v_state, ((PyObject*)__pyx_t_13));
+    __pyx_t_13 = 0;
 
     /* "(tree fragment)":9
  *     if _dict is not None:
@@ -24675,7 +24819,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
     __pyx_v_use_setstate = 1;
 
     /* "(tree fragment)":7
- *     state = (self.grid_sum, self.grid_wsum, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
+ *     state = (self.grid_sum, self.grid_wsum, self.min_dist2, self.nfields, self.nx, self.ny, self.nz, self.x_start, self.x_step, self.y_start, self.y_step, self.z_start, self.z_step)
  *     _dict = getattr(self, '__dict__', None)
  *     if _dict is not None:             # <<<<<<<<<<<<<<
  *         state += (_dict,)
@@ -24689,7 +24833,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
  *     else:
  *         use_setstate = False             # <<<<<<<<<<<<<<
  *     if use_setstate:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, None), state
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, None), state
  */
   /*else*/ {
     __pyx_v_use_setstate = 0;
@@ -24700,7 +24844,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
  *     else:
  *         use_setstate = False
  *     if use_setstate:             # <<<<<<<<<<<<<<
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, None), state
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, None), state
  *     else:
  */
   if (__pyx_v_use_setstate) {
@@ -24708,80 +24852,80 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
     /* "(tree fragment)":13
  *         use_setstate = False
  *     if use_setstate:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, None), state             # <<<<<<<<<<<<<<
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, None), state             # <<<<<<<<<<<<<<
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  */
     __Pyx_XDECREF(__pyx_r);
-    __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_pyx_unpickle_GateToGridMapper); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 13, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_12);
-    __pyx_t_13 = PyTuple_New(3); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 13, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_pyx_unpickle_GateToGridMapper); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 13, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_13);
+    __pyx_t_14 = PyTuple_New(3); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 13, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_14);
     __Pyx_INCREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))));
     __Pyx_GIVEREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))));
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))))) __PYX_ERR(1, 13, __pyx_L1_error);
-    __Pyx_INCREF(__pyx_int_194171105);
-    __Pyx_GIVEREF(__pyx_int_194171105);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_int_194171105)) __PYX_ERR(1, 13, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))))) __PYX_ERR(1, 13, __pyx_L1_error);
+    __Pyx_INCREF(__pyx_int_83476354);
+    __Pyx_GIVEREF(__pyx_int_83476354);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_int_83476354)) __PYX_ERR(1, 13, __pyx_L1_error);
     __Pyx_INCREF(Py_None);
     __Pyx_GIVEREF(Py_None);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 2, Py_None)) __PYX_ERR(1, 13, __pyx_L1_error);
-    __pyx_t_11 = PyTuple_New(3); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 13, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_11);
-    __Pyx_GIVEREF(__pyx_t_12);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_12)) __PYX_ERR(1, 13, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 2, Py_None)) __PYX_ERR(1, 13, __pyx_L1_error);
+    __pyx_t_12 = PyTuple_New(3); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 13, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_12);
     __Pyx_GIVEREF(__pyx_t_13);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_13)) __PYX_ERR(1, 13, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_13)) __PYX_ERR(1, 13, __pyx_L1_error);
+    __Pyx_GIVEREF(__pyx_t_14);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_14)) __PYX_ERR(1, 13, __pyx_L1_error);
     __Pyx_INCREF(__pyx_v_state);
     __Pyx_GIVEREF(__pyx_v_state);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 2, __pyx_v_state)) __PYX_ERR(1, 13, __pyx_L1_error);
-    __pyx_t_12 = 0;
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_12, 2, __pyx_v_state)) __PYX_ERR(1, 13, __pyx_L1_error);
     __pyx_t_13 = 0;
-    __pyx_r = __pyx_t_11;
-    __pyx_t_11 = 0;
+    __pyx_t_14 = 0;
+    __pyx_r = __pyx_t_12;
+    __pyx_t_12 = 0;
     goto __pyx_L0;
 
     /* "(tree fragment)":12
  *     else:
  *         use_setstate = False
  *     if use_setstate:             # <<<<<<<<<<<<<<
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, None), state
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, None), state
  *     else:
  */
   }
 
   /* "(tree fragment)":15
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, None), state
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, None), state
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)             # <<<<<<<<<<<<<<
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)             # <<<<<<<<<<<<<<
  * def __setstate_cython__(self, __pyx_state):
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)
  */
   /*else*/ {
     __Pyx_XDECREF(__pyx_r);
-    __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_pyx_unpickle_GateToGridMapper); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 15, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_11);
-    __pyx_t_13 = PyTuple_New(3); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 15, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_13);
+    __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_pyx_unpickle_GateToGridMapper); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 15, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_12);
+    __pyx_t_14 = PyTuple_New(3); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 15, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_14);
     __Pyx_INCREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))));
     __Pyx_GIVEREF(((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))));
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))))) __PYX_ERR(1, 15, __pyx_L1_error);
-    __Pyx_INCREF(__pyx_int_194171105);
-    __Pyx_GIVEREF(__pyx_int_194171105);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_int_194171105)) __PYX_ERR(1, 15, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 0, ((PyObject *)Py_TYPE(((PyObject *)__pyx_v_self))))) __PYX_ERR(1, 15, __pyx_L1_error);
+    __Pyx_INCREF(__pyx_int_83476354);
+    __Pyx_GIVEREF(__pyx_int_83476354);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_int_83476354)) __PYX_ERR(1, 15, __pyx_L1_error);
     __Pyx_INCREF(__pyx_v_state);
     __Pyx_GIVEREF(__pyx_v_state);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 2, __pyx_v_state)) __PYX_ERR(1, 15, __pyx_L1_error);
-    __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 15, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_12);
-    __Pyx_GIVEREF(__pyx_t_11);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_11)) __PYX_ERR(1, 15, __pyx_L1_error);
-    __Pyx_GIVEREF(__pyx_t_13);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_13)) __PYX_ERR(1, 15, __pyx_L1_error);
-    __pyx_t_11 = 0;
-    __pyx_t_13 = 0;
-    __pyx_r = __pyx_t_12;
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_14, 2, __pyx_v_state)) __PYX_ERR(1, 15, __pyx_L1_error);
+    __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 15, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_13);
+    __Pyx_GIVEREF(__pyx_t_12);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_12)) __PYX_ERR(1, 15, __pyx_L1_error);
+    __Pyx_GIVEREF(__pyx_t_14);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_14)) __PYX_ERR(1, 15, __pyx_L1_error);
     __pyx_t_12 = 0;
+    __pyx_t_14 = 0;
+    __pyx_r = __pyx_t_13;
+    __pyx_t_13 = 0;
     goto __pyx_L0;
   }
 
@@ -24806,6 +24950,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
   __Pyx_XDECREF(__pyx_t_11);
   __Pyx_XDECREF(__pyx_t_12);
   __Pyx_XDECREF(__pyx_t_13);
+  __Pyx_XDECREF(__pyx_t_14);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.GateToGridMapper.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = NULL;
   __pyx_L0:;
@@ -24818,7 +24963,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_6__
 
 /* "(tree fragment)":16
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)
  */
@@ -24929,7 +25074,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_8__
   __Pyx_RefNannySetupContext("__setstate_cython__", 1);
 
   /* "(tree fragment)":17
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  * def __setstate_cython__(self, __pyx_state):
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)             # <<<<<<<<<<<<<<
  */
@@ -24940,7 +25085,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_8__
 
   /* "(tree fragment)":16
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)
  */
@@ -24958,7 +25103,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_8__
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":397
+/* "pyart/map/_gate_to_grid_map.pyx":402
  * 
  * @cython.cdivision(True)
  * cdef int find_min(float a, float roi, float step):             # <<<<<<<<<<<<<<
@@ -24971,7 +25116,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
   int __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":400
+  /* "pyart/map/_gate_to_grid_map.pyx":405
  *     """ Find the mimumum gate index for a dimension. """
  *     cdef int a_min
  *     if step == 0:             # <<<<<<<<<<<<<<
@@ -24981,7 +25126,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
   __pyx_t_1 = (__pyx_v_step == 0.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":401
+    /* "pyart/map/_gate_to_grid_map.pyx":406
  *     cdef int a_min
  *     if step == 0:
  *         return 0             # <<<<<<<<<<<<<<
@@ -24991,7 +25136,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":400
+    /* "pyart/map/_gate_to_grid_map.pyx":405
  *     """ Find the mimumum gate index for a dimension. """
  *     cdef int a_min
  *     if step == 0:             # <<<<<<<<<<<<<<
@@ -25000,7 +25145,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":402
+  /* "pyart/map/_gate_to_grid_map.pyx":407
  *     if step == 0:
  *         return 0
  *     a_min = <int>ceil((a - roi) / step)             # <<<<<<<<<<<<<<
@@ -25009,7 +25154,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
  */
   __pyx_v_a_min = ((int)ceil(((__pyx_v_a - __pyx_v_roi) / __pyx_v_step)));
 
-  /* "pyart/map/_gate_to_grid_map.pyx":403
+  /* "pyart/map/_gate_to_grid_map.pyx":408
  *         return 0
  *     a_min = <int>ceil((a - roi) / step)
  *     if a_min < 0:             # <<<<<<<<<<<<<<
@@ -25019,7 +25164,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
   __pyx_t_1 = (__pyx_v_a_min < 0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":404
+    /* "pyart/map/_gate_to_grid_map.pyx":409
  *     a_min = <int>ceil((a - roi) / step)
  *     if a_min < 0:
  *         a_min = 0             # <<<<<<<<<<<<<<
@@ -25028,7 +25173,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
  */
     __pyx_v_a_min = 0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":403
+    /* "pyart/map/_gate_to_grid_map.pyx":408
  *         return 0
  *     a_min = <int>ceil((a - roi) / step)
  *     if a_min < 0:             # <<<<<<<<<<<<<<
@@ -25037,7 +25182,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":405
+  /* "pyart/map/_gate_to_grid_map.pyx":410
  *     if a_min < 0:
  *         a_min = 0
  *     return a_min             # <<<<<<<<<<<<<<
@@ -25047,7 +25192,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
   __pyx_r = __pyx_v_a_min;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":397
+  /* "pyart/map/_gate_to_grid_map.pyx":402
  * 
  * @cython.cdivision(True)
  * cdef int find_min(float a, float roi, float step):             # <<<<<<<<<<<<<<
@@ -25060,7 +25205,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_min(float __pyx_v_a, flo
   return __pyx_r;
 }
 
-/* "pyart/map/_gate_to_grid_map.pyx":409
+/* "pyart/map/_gate_to_grid_map.pyx":414
  * 
  * @cython.cdivision(True)
  * cdef int find_max(float a, float roi, float step, int na):             # <<<<<<<<<<<<<<
@@ -25073,7 +25218,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
   int __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":412
+  /* "pyart/map/_gate_to_grid_map.pyx":417
  *     """ Find the maximum gate index for a dimension. """
  *     cdef int a_max
  *     if step == 0:             # <<<<<<<<<<<<<<
@@ -25083,7 +25228,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
   __pyx_t_1 = (__pyx_v_step == 0.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":413
+    /* "pyart/map/_gate_to_grid_map.pyx":418
  *     cdef int a_max
  *     if step == 0:
  *         return 0             # <<<<<<<<<<<<<<
@@ -25093,7 +25238,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/_gate_to_grid_map.pyx":412
+    /* "pyart/map/_gate_to_grid_map.pyx":417
  *     """ Find the maximum gate index for a dimension. """
  *     cdef int a_max
  *     if step == 0:             # <<<<<<<<<<<<<<
@@ -25102,7 +25247,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":414
+  /* "pyart/map/_gate_to_grid_map.pyx":419
  *     if step == 0:
  *         return 0
  *     a_max = <int>floor((a + roi) / step)             # <<<<<<<<<<<<<<
@@ -25111,7 +25256,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
  */
   __pyx_v_a_max = ((int)floor(((__pyx_v_a + __pyx_v_roi) / __pyx_v_step)));
 
-  /* "pyart/map/_gate_to_grid_map.pyx":415
+  /* "pyart/map/_gate_to_grid_map.pyx":420
  *         return 0
  *     a_max = <int>floor((a + roi) / step)
  *     if a_max > na-1:             # <<<<<<<<<<<<<<
@@ -25121,7 +25266,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
   __pyx_t_1 = (__pyx_v_a_max > (__pyx_v_na - 1));
   if (__pyx_t_1) {
 
-    /* "pyart/map/_gate_to_grid_map.pyx":416
+    /* "pyart/map/_gate_to_grid_map.pyx":421
  *     a_max = <int>floor((a + roi) / step)
  *     if a_max > na-1:
  *         a_max = na-1             # <<<<<<<<<<<<<<
@@ -25129,7 +25274,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
  */
     __pyx_v_a_max = (__pyx_v_na - 1);
 
-    /* "pyart/map/_gate_to_grid_map.pyx":415
+    /* "pyart/map/_gate_to_grid_map.pyx":420
  *         return 0
  *     a_max = <int>floor((a + roi) / step)
  *     if a_max > na-1:             # <<<<<<<<<<<<<<
@@ -25138,7 +25283,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
  */
   }
 
-  /* "pyart/map/_gate_to_grid_map.pyx":417
+  /* "pyart/map/_gate_to_grid_map.pyx":422
  *     if a_max > na-1:
  *         a_max = na-1
  *     return a_max             # <<<<<<<<<<<<<<
@@ -25146,7 +25291,7 @@ static int __pyx_f_5pyart_3map_17_gate_to_grid_map_find_max(float __pyx_v_a, flo
   __pyx_r = __pyx_v_a_max;
   goto __pyx_L0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":409
+  /* "pyart/map/_gate_to_grid_map.pyx":414
  * 
  * @cython.cdivision(True)
  * cdef int find_max(float a, float roi, float step, int na):             # <<<<<<<<<<<<<<
@@ -26826,14 +26971,15 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_DistBeam
   __Pyx_RefNannyDeclarations
   PyObject *__pyx_t_1 = NULL;
   float __pyx_t_2;
-  int __pyx_t_3;
-  __Pyx_memviewslice __pyx_t_4 = { 0, 0, { 0 }, { 0 }, { 0 } };
-  int __pyx_t_5;
-  Py_ssize_t __pyx_t_6;
-  int __pyx_t_7;
-  PyObject *__pyx_t_8 = NULL;
+  __Pyx_memviewslice __pyx_t_3 = { 0, 0, { 0 }, { 0 }, { 0 } };
+  int __pyx_t_4;
+  __Pyx_memviewslice __pyx_t_5 = { 0, 0, { 0 }, { 0 }, { 0 } };
+  int __pyx_t_6;
+  Py_ssize_t __pyx_t_7;
+  int __pyx_t_8;
   PyObject *__pyx_t_9 = NULL;
   PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -26861,9 +27007,12 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_DistBeam
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_2 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_to_MemoryviewSlice_dc_float(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_3.memview)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->h_factor = __pyx_t_2;
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v___pyx_result->h_factor, 0);
+  __pyx_v___pyx_result->h_factor = __pyx_t_3;
+  __pyx_t_3.memview = NULL;
+  __pyx_t_3.data = NULL;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
@@ -26879,21 +27028,21 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_DistBeam
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 3, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->num_offsets = __pyx_t_3;
+  __pyx_v___pyx_result->num_offsets = __pyx_t_4;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 4, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_4.memview)) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_dsds_float(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __PYX_XCLEAR_MEMVIEW(&__pyx_v___pyx_result->offsets, 0);
-  __pyx_v___pyx_result->offsets = __pyx_t_4;
-  __pyx_t_4.memview = NULL;
-  __pyx_t_4.data = NULL;
+  __pyx_v___pyx_result->offsets = __pyx_t_5;
+  __pyx_t_5.memview = NULL;
+  __pyx_t_5.data = NULL;
 
   /* "(tree fragment)":13
  * cdef __pyx_unpickle_DistBeamRoI__set_state(DistBeamRoI __pyx_result, tuple __pyx_state):
@@ -26905,56 +27054,56 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_DistBeam
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
     __PYX_ERR(1, 13, __pyx_L1_error)
   }
-  __pyx_t_6 = __Pyx_PyTuple_GET_SIZE(__pyx_v___pyx_state); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
-  __pyx_t_7 = (__pyx_t_6 > 5);
-  if (__pyx_t_7) {
+  __pyx_t_7 = __Pyx_PyTuple_GET_SIZE(__pyx_v___pyx_state); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
+  __pyx_t_8 = (__pyx_t_7 > 5);
+  if (__pyx_t_8) {
   } else {
-    __pyx_t_5 = __pyx_t_7;
+    __pyx_t_6 = __pyx_t_8;
     goto __pyx_L4_bool_binop_done;
   }
-  __pyx_t_7 = __Pyx_HasAttr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
-  __pyx_t_5 = __pyx_t_7;
+  __pyx_t_8 = __Pyx_HasAttr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
+  __pyx_t_6 = __pyx_t_8;
   __pyx_L4_bool_binop_done:;
-  if (__pyx_t_5) {
+  if (__pyx_t_6) {
 
     /* "(tree fragment)":14
  *     __pyx_result.beam_factor = __pyx_state[0]; __pyx_result.h_factor = __pyx_state[1]; __pyx_result.min_radius = __pyx_state[2]; __pyx_result.num_offsets = __pyx_state[3]; __pyx_result.offsets = __pyx_state[4]
  *     if len(__pyx_state) > 5 and hasattr(__pyx_result, '__dict__'):
  *         __pyx_result.__dict__.update(__pyx_state[5])             # <<<<<<<<<<<<<<
  */
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 14, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_update); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+    __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_update); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_10);
+    __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     if (unlikely(__pyx_v___pyx_state == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
       __PYX_ERR(1, 14, __pyx_L1_error)
     }
-    __pyx_t_8 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 5, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 14, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_10 = NULL;
-    __pyx_t_3 = 0;
+    __pyx_t_9 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 5, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_9);
+    __pyx_t_11 = NULL;
+    __pyx_t_4 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_9))) {
-      __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_9);
-      if (likely(__pyx_t_10)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9);
-        __Pyx_INCREF(__pyx_t_10);
+    if (likely(PyMethod_Check(__pyx_t_10))) {
+      __pyx_t_11 = PyMethod_GET_SELF(__pyx_t_10);
+      if (likely(__pyx_t_11)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_10);
+        __Pyx_INCREF(__pyx_t_11);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_9, function);
-        __pyx_t_3 = 1;
+        __Pyx_DECREF_SET(__pyx_t_10, function);
+        __pyx_t_4 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[2] = {__pyx_t_10, __pyx_t_8};
-      __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_3, 1+__pyx_t_3);
-      __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      PyObject *__pyx_callargs[2] = {__pyx_t_11, __pyx_t_9};
+      __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
+      __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
+      __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
       if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 14, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
     }
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
@@ -26979,10 +27128,11 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_DistBeam
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
-  __PYX_XCLEAR_MEMVIEW(&__pyx_t_4, 1);
-  __Pyx_XDECREF(__pyx_t_8);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_t_3, 1);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_t_5, 1);
   __Pyx_XDECREF(__pyx_t_9);
   __Pyx_XDECREF(__pyx_t_10);
+  __Pyx_XDECREF(__pyx_t_11);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.__pyx_unpickle_DistBeamRoI__set_state", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
@@ -27141,9 +27291,9 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
   /* "(tree fragment)":4
  *     cdef object __pyx_PickleError
  *     cdef object __pyx_result
- *     if __pyx_checksum not in (0xb92d0e1, 0x6f2239a, 0xfc58dc9):             # <<<<<<<<<<<<<<
+ *     if __pyx_checksum not in (0x4f9bf82, 0xbe85629, 0x222c1ce):             # <<<<<<<<<<<<<<
  *         from pickle import PickleError as __pyx_PickleError
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  */
   __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
@@ -27153,9 +27303,9 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
 
     /* "(tree fragment)":5
  *     cdef object __pyx_result
- *     if __pyx_checksum not in (0xb92d0e1, 0x6f2239a, 0xfc58dc9):
+ *     if __pyx_checksum not in (0x4f9bf82, 0xbe85629, 0x222c1ce):
  *         from pickle import PickleError as __pyx_PickleError             # <<<<<<<<<<<<<<
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  *     __pyx_result = GateToGridMapper.__new__(__pyx_type)
  */
     __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
@@ -27174,9 +27324,9 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
     /* "(tree fragment)":6
- *     if __pyx_checksum not in (0xb92d0e1, 0x6f2239a, 0xfc58dc9):
+ *     if __pyx_checksum not in (0x4f9bf82, 0xbe85629, 0x222c1ce):
  *         from pickle import PickleError as __pyx_PickleError
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum             # <<<<<<<<<<<<<<
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum             # <<<<<<<<<<<<<<
  *     __pyx_result = GateToGridMapper.__new__(__pyx_type)
  *     if __pyx_state is not None:
  */
@@ -27192,15 +27342,15 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
     /* "(tree fragment)":4
  *     cdef object __pyx_PickleError
  *     cdef object __pyx_result
- *     if __pyx_checksum not in (0xb92d0e1, 0x6f2239a, 0xfc58dc9):             # <<<<<<<<<<<<<<
+ *     if __pyx_checksum not in (0x4f9bf82, 0xbe85629, 0x222c1ce):             # <<<<<<<<<<<<<<
  *         from pickle import PickleError as __pyx_PickleError
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  */
   }
 
   /* "(tree fragment)":7
  *         from pickle import PickleError as __pyx_PickleError
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  *     __pyx_result = GateToGridMapper.__new__(__pyx_type)             # <<<<<<<<<<<<<<
  *     if __pyx_state is not None:
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
@@ -27233,7 +27383,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
   __pyx_t_1 = 0;
 
   /* "(tree fragment)":8
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  *     __pyx_result = GateToGridMapper.__new__(__pyx_type)
  *     if __pyx_state is not None:             # <<<<<<<<<<<<<<
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
@@ -27255,7 +27405,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
     /* "(tree fragment)":8
- *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0xb92d0e1, 0x6f2239a, 0xfc58dc9) = (grid_sum, grid_wsum, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
+ *         raise __pyx_PickleError, "Incompatible checksums (0x%x vs (0x4f9bf82, 0xbe85629, 0x222c1ce) = (grid_sum, grid_wsum, min_dist2, nfields, nx, ny, nz, x_start, x_step, y_start, y_step, z_start, z_step))" % __pyx_checksum
  *     __pyx_result = GateToGridMapper.__new__(__pyx_type)
  *     if __pyx_state is not None:             # <<<<<<<<<<<<<<
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
@@ -27268,7 +27418,7 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
  *     return __pyx_result             # <<<<<<<<<<<<<<
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(__pyx_v___pyx_result);
@@ -27300,8 +27450,8 @@ static PyObject *__pyx_pf_5pyart_3map_17_gate_to_grid_map_8__pyx_unpickle_GateTo
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
  *     return __pyx_result
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):             # <<<<<<<<<<<<<<
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):
  */
 
 static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGridMapper__set_state(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *__pyx_v___pyx_result, PyObject *__pyx_v___pyx_state) {
@@ -27309,14 +27459,15 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGr
   __Pyx_RefNannyDeclarations
   PyObject *__pyx_t_1 = NULL;
   __Pyx_memviewslice __pyx_t_2 = { 0, 0, { 0 }, { 0 }, { 0 } };
-  int __pyx_t_3;
-  float __pyx_t_4;
-  int __pyx_t_5;
-  Py_ssize_t __pyx_t_6;
-  int __pyx_t_7;
-  PyObject *__pyx_t_8 = NULL;
+  __Pyx_memviewslice __pyx_t_3 = { 0, 0, { 0 }, { 0 }, { 0 } };
+  int __pyx_t_4;
+  float __pyx_t_5;
+  int __pyx_t_6;
+  Py_ssize_t __pyx_t_7;
+  int __pyx_t_8;
   PyObject *__pyx_t_9 = NULL;
   PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -27325,9 +27476,9 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGr
   /* "(tree fragment)":12
  *     return __pyx_result
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]             # <<<<<<<<<<<<<<
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):
- *         __pyx_result.__dict__.update(__pyx_state[12])
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]             # <<<<<<<<<<<<<<
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):
+ *         __pyx_result.__dict__.update(__pyx_state[13])
  */
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
@@ -27359,159 +27510,171 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGr
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 2, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_to_MemoryviewSlice_dsdsdsds_double(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_3.memview)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->nfields = __pyx_t_3;
+  __PYX_XCLEAR_MEMVIEW(&__pyx_v___pyx_result->min_dist2, 0);
+  __pyx_v___pyx_result->min_dist2 = __pyx_t_3;
+  __pyx_t_3.memview = NULL;
+  __pyx_t_3.data = NULL;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 3, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->nx = __pyx_t_3;
+  __pyx_v___pyx_result->nfields = __pyx_t_4;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 4, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->ny = __pyx_t_3;
+  __pyx_v___pyx_result->nx = __pyx_t_4;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 5, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->nz = __pyx_t_3;
+  __pyx_v___pyx_result->ny = __pyx_t_4;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 6, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->x_start = __pyx_t_4;
+  __pyx_v___pyx_result->nz = __pyx_t_4;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 7, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->x_step = __pyx_t_4;
+  __pyx_v___pyx_result->x_start = __pyx_t_5;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 8, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->y_start = __pyx_t_4;
+  __pyx_v___pyx_result->x_step = __pyx_t_5;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 9, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->y_step = __pyx_t_4;
+  __pyx_v___pyx_result->y_start = __pyx_t_5;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 10, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->z_start = __pyx_t_4;
+  __pyx_v___pyx_result->y_step = __pyx_t_5;
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
     __PYX_ERR(1, 12, __pyx_L1_error)
   }
   __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 11, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_4 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v___pyx_result->z_start = __pyx_t_5;
+  if (unlikely(__pyx_v___pyx_state == Py_None)) {
+    PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
+    __PYX_ERR(1, 12, __pyx_L1_error)
+  }
+  __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 12, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_5 = __pyx_PyFloat_AsFloat(__pyx_t_1); if (unlikely((__pyx_t_5 == (float)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_v___pyx_result->z_step = __pyx_t_4;
+  __pyx_v___pyx_result->z_step = __pyx_t_5;
 
   /* "(tree fragment)":13
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):             # <<<<<<<<<<<<<<
- *         __pyx_result.__dict__.update(__pyx_state[12])
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):             # <<<<<<<<<<<<<<
+ *         __pyx_result.__dict__.update(__pyx_state[13])
  */
   if (unlikely(__pyx_v___pyx_state == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
     __PYX_ERR(1, 13, __pyx_L1_error)
   }
-  __pyx_t_6 = __Pyx_PyTuple_GET_SIZE(__pyx_v___pyx_state); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
-  __pyx_t_7 = (__pyx_t_6 > 12);
-  if (__pyx_t_7) {
+  __pyx_t_7 = __Pyx_PyTuple_GET_SIZE(__pyx_v___pyx_state); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
+  __pyx_t_8 = (__pyx_t_7 > 13);
+  if (__pyx_t_8) {
   } else {
-    __pyx_t_5 = __pyx_t_7;
+    __pyx_t_6 = __pyx_t_8;
     goto __pyx_L4_bool_binop_done;
   }
-  __pyx_t_7 = __Pyx_HasAttr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
-  __pyx_t_5 = __pyx_t_7;
+  __pyx_t_8 = __Pyx_HasAttr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(1, 13, __pyx_L1_error)
+  __pyx_t_6 = __pyx_t_8;
   __pyx_L4_bool_binop_done:;
-  if (__pyx_t_5) {
+  if (__pyx_t_6) {
 
     /* "(tree fragment)":14
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):
- *         __pyx_result.__dict__.update(__pyx_state[12])             # <<<<<<<<<<<<<<
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):
+ *         __pyx_result.__dict__.update(__pyx_state[13])             # <<<<<<<<<<<<<<
  */
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 14, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_update); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v___pyx_result), __pyx_n_s_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+    __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_update); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_10);
+    __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     if (unlikely(__pyx_v___pyx_state == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
       __PYX_ERR(1, 14, __pyx_L1_error)
     }
-    __pyx_t_8 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 12, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 14, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_10 = NULL;
-    __pyx_t_3 = 0;
+    __pyx_t_9 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 13, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 14, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_9);
+    __pyx_t_11 = NULL;
+    __pyx_t_4 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_9))) {
-      __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_9);
-      if (likely(__pyx_t_10)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9);
-        __Pyx_INCREF(__pyx_t_10);
+    if (likely(PyMethod_Check(__pyx_t_10))) {
+      __pyx_t_11 = PyMethod_GET_SELF(__pyx_t_10);
+      if (likely(__pyx_t_11)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_10);
+        __Pyx_INCREF(__pyx_t_11);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_9, function);
-        __pyx_t_3 = 1;
+        __Pyx_DECREF_SET(__pyx_t_10, function);
+        __pyx_t_4 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[2] = {__pyx_t_10, __pyx_t_8};
-      __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_3, 1+__pyx_t_3);
-      __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      PyObject *__pyx_callargs[2] = {__pyx_t_11, __pyx_t_9};
+      __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4);
+      __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
+      __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
       if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 14, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
     }
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
     /* "(tree fragment)":13
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):             # <<<<<<<<<<<<<<
- *         __pyx_result.__dict__.update(__pyx_state[12])
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):             # <<<<<<<<<<<<<<
+ *         __pyx_result.__dict__.update(__pyx_state[13])
  */
   }
 
@@ -27519,8 +27682,8 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGr
  *         __pyx_unpickle_GateToGridMapper__set_state(<GateToGridMapper> __pyx_result, __pyx_state)
  *     return __pyx_result
  * cdef __pyx_unpickle_GateToGridMapper__set_state(GateToGridMapper __pyx_result, tuple __pyx_state):             # <<<<<<<<<<<<<<
- *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.nfields = __pyx_state[2]; __pyx_result.nx = __pyx_state[3]; __pyx_result.ny = __pyx_state[4]; __pyx_result.nz = __pyx_state[5]; __pyx_result.x_start = __pyx_state[6]; __pyx_result.x_step = __pyx_state[7]; __pyx_result.y_start = __pyx_state[8]; __pyx_result.y_step = __pyx_state[9]; __pyx_result.z_start = __pyx_state[10]; __pyx_result.z_step = __pyx_state[11]
- *     if len(__pyx_state) > 12 and hasattr(__pyx_result, '__dict__'):
+ *     __pyx_result.grid_sum = __pyx_state[0]; __pyx_result.grid_wsum = __pyx_state[1]; __pyx_result.min_dist2 = __pyx_state[2]; __pyx_result.nfields = __pyx_state[3]; __pyx_result.nx = __pyx_state[4]; __pyx_result.ny = __pyx_state[5]; __pyx_result.nz = __pyx_state[6]; __pyx_result.x_start = __pyx_state[7]; __pyx_result.x_step = __pyx_state[8]; __pyx_result.y_start = __pyx_state[9]; __pyx_result.y_step = __pyx_state[10]; __pyx_result.z_start = __pyx_state[11]; __pyx_result.z_step = __pyx_state[12]
+ *     if len(__pyx_state) > 13 and hasattr(__pyx_result, '__dict__'):
  */
 
   /* function exit code */
@@ -27529,9 +27692,10 @@ static PyObject *__pyx_f_5pyart_3map_17_gate_to_grid_map___pyx_unpickle_GateToGr
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __PYX_XCLEAR_MEMVIEW(&__pyx_t_2, 1);
-  __Pyx_XDECREF(__pyx_t_8);
+  __PYX_XCLEAR_MEMVIEW(&__pyx_t_3, 1);
   __Pyx_XDECREF(__pyx_t_9);
   __Pyx_XDECREF(__pyx_t_10);
+  __Pyx_XDECREF(__pyx_t_11);
   __Pyx_AddTraceback("pyart.map._gate_to_grid_map.__pyx_unpickle_GateToGridMapper__set_state", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
@@ -27936,6 +28100,8 @@ static PyObject *__pyx_tp_new_5pyart_3map_17_gate_to_grid_map_DistBeamRoI(PyType
   p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_5pyart_3map_17_gate_to_grid_map_RoIFunction*)__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistBeamRoI;
   p->offsets.data = NULL;
   p->offsets.memview = NULL;
+  p->h_factor.data = NULL;
+  p->h_factor.memview = NULL;
   return o;
 }
 
@@ -27950,6 +28116,8 @@ static void __pyx_tp_dealloc_5pyart_3map_17_gate_to_grid_map_DistBeamRoI(PyObjec
   #endif
   __PYX_XCLEAR_MEMVIEW(&p->offsets, 1);
   p->offsets.memview = NULL; p->offsets.data = NULL;
+  __PYX_XCLEAR_MEMVIEW(&p->h_factor, 1);
+  p->h_factor.memview = NULL; p->h_factor.data = NULL;
   __pyx_tp_dealloc_5pyart_3map_17_gate_to_grid_map_RoIFunction(o);
 }
 
@@ -28079,6 +28247,8 @@ static PyObject *__pyx_tp_new_5pyart_3map_17_gate_to_grid_map_GateToGridMapper(P
   p->grid_sum.memview = NULL;
   p->grid_wsum.data = NULL;
   p->grid_wsum.memview = NULL;
+  p->min_dist2.data = NULL;
+  p->min_dist2.memview = NULL;
   return o;
 }
 
@@ -28095,6 +28265,8 @@ static void __pyx_tp_dealloc_5pyart_3map_17_gate_to_grid_map_GateToGridMapper(Py
   p->grid_sum.memview = NULL; p->grid_sum.data = NULL;
   __PYX_XCLEAR_MEMVIEW(&p->grid_wsum, 1);
   p->grid_wsum.memview = NULL; p->grid_wsum.data = NULL;
+  __PYX_XCLEAR_MEMVIEW(&p->min_dist2, 1);
+  p->min_dist2.memview = NULL; p->min_dist2.data = NULL;
   #if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
   (*Py_TYPE(o)->tp_free)(o);
   #else
@@ -29256,6 +29428,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_dict, __pyx_k_dict, sizeof(__pyx_k_dict), 0, 0, 1, 1},
     {&__pyx_n_s_dict_2, __pyx_k_dict_2, sizeof(__pyx_k_dict_2), 0, 0, 1, 1},
     {&__pyx_kp_u_disable, __pyx_k_disable, sizeof(__pyx_k_disable), 0, 1, 0, 0},
+    {&__pyx_n_s_dist_factor, __pyx_k_dist_factor, sizeof(__pyx_k_dist_factor), 0, 0, 1, 1},
     {&__pyx_n_s_dtype_is_object, __pyx_k_dtype_is_object, sizeof(__pyx_k_dtype_is_object), 0, 0, 1, 1},
     {&__pyx_kp_u_enable, __pyx_k_enable, sizeof(__pyx_k_enable), 0, 1, 0, 0},
     {&__pyx_n_s_encode, __pyx_k_encode, sizeof(__pyx_k_encode), 0, 0, 1, 1},
@@ -29309,10 +29482,13 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_ngate, __pyx_k_ngate, sizeof(__pyx_k_ngate), 0, 0, 1, 1},
     {&__pyx_n_s_ngates, __pyx_k_ngates, sizeof(__pyx_k_ngates), 0, 0, 1, 1},
     {&__pyx_kp_s_no_default___reduce___due_to_non, __pyx_k_no_default___reduce___due_to_non, sizeof(__pyx_k_no_default___reduce___due_to_non), 0, 0, 1, 0},
+    {&__pyx_n_s_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 0, 1, 1},
     {&__pyx_n_s_nray, __pyx_k_nray, sizeof(__pyx_k_nray), 0, 0, 1, 1},
     {&__pyx_n_s_nrays, __pyx_k_nrays, sizeof(__pyx_k_nrays), 0, 0, 1, 1},
+    {&__pyx_n_s_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 0, 0, 1, 1},
     {&__pyx_n_s_obj, __pyx_k_obj, sizeof(__pyx_k_obj), 0, 0, 1, 1},
     {&__pyx_n_s_offsets, __pyx_k_offsets, sizeof(__pyx_k_offsets), 0, 0, 1, 1},
+    {&__pyx_n_s_ones, __pyx_k_ones, sizeof(__pyx_k_ones), 0, 0, 1, 1},
     {&__pyx_n_s_pack, __pyx_k_pack, sizeof(__pyx_k_pack), 0, 0, 1, 1},
     {&__pyx_n_s_pickle, __pyx_k_pickle, sizeof(__pyx_k_pickle), 0, 0, 1, 1},
     {&__pyx_n_s_pyart_map__gate_to_grid_map, __pyx_k_pyart_map__gate_to_grid_map, sizeof(__pyx_k_pyart_map__gate_to_grid_map), 0, 0, 1, 1},
@@ -29354,7 +29530,6 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_struct, __pyx_k_struct, sizeof(__pyx_k_struct), 0, 0, 1, 1},
     {&__pyx_n_s_sys, __pyx_k_sys, sizeof(__pyx_k_sys), 0, 0, 1, 1},
     {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
-    {&__pyx_n_s_toa, __pyx_k_toa, sizeof(__pyx_k_toa), 0, 0, 1, 1},
     {&__pyx_kp_s_unable_to_allocate_array_data, __pyx_k_unable_to_allocate_array_data, sizeof(__pyx_k_unable_to_allocate_array_data), 0, 0, 1, 0},
     {&__pyx_kp_s_unable_to_allocate_shape_and_str, __pyx_k_unable_to_allocate_shape_and_str, sizeof(__pyx_k_unable_to_allocate_shape_and_str), 0, 0, 1, 0},
     {&__pyx_n_s_unpack, __pyx_k_unpack, sizeof(__pyx_k_unpack), 0, 0, 1, 1},
@@ -29374,8 +29549,8 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
 }
 /* #### Code section: cached_builtins ### */
 static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(0, 77, __pyx_L1_error)
-  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 92, __pyx_L1_error)
+  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(0, 66, __pyx_L1_error)
+  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 81, __pyx_L1_error)
   __pyx_builtin___import__ = __Pyx_GetBuiltinName(__pyx_n_s_import); if (!__pyx_builtin___import__) __PYX_ERR(1, 100, __pyx_L1_error)
   __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 141, __pyx_L1_error)
   __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 156, __pyx_L1_error)
@@ -29441,7 +29616,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__12 = PyTuple_Pack(3, __pyx_int_185678969, __pyx_int_73048319, __pyx_int_133603171); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(1, 4, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__12);
   __Pyx_GIVEREF(__pyx_tuple__12);
-  __pyx_tuple__13 = PyTuple_Pack(3, __pyx_int_194171105, __pyx_int_116532122, __pyx_int_264605129); if (unlikely(!__pyx_tuple__13)) __PYX_ERR(1, 4, __pyx_L1_error)
+  __pyx_tuple__13 = PyTuple_Pack(3, __pyx_int_83476354, __pyx_int_199775785, __pyx_int_35832270); if (unlikely(!__pyx_tuple__13)) __PYX_ERR(1, 4, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__13);
   __Pyx_GIVEREF(__pyx_tuple__13);
 
@@ -29546,17 +29721,17 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GIVEREF(__pyx_tuple__23);
   __pyx_codeobj__24 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__23, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_Enum, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__24)) __PYX_ERR(1, 1, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":38
+  /* "pyart/map/_gate_to_grid_map.pyx":27
  *     """ A class for storing radius of interest calculations. """
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  *         return 0
  */
-  __pyx_tuple__25 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_z, __pyx_n_s_y, __pyx_n_s_x); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(0, 38, __pyx_L1_error)
+  __pyx_tuple__25 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_z, __pyx_n_s_y, __pyx_n_s_x); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__25);
   __Pyx_GIVEREF(__pyx_tuple__25);
-  __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 38, __pyx_L1_error)
+  __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 27, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 27, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -29579,14 +29754,14 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GIVEREF(__pyx_tuple__29);
   __pyx_codeobj__30 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__30)) __PYX_ERR(1, 16, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":52
+  /* "pyart/map/_gate_to_grid_map.pyx":41
  *         self.constant_roi = constant_roi
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return contstant radius of influence. """
  *         return self.constant_roi
  */
-  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 52, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 52, __pyx_L1_error)
+  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 41, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 41, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -29603,14 +29778,14 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  */
   __pyx_codeobj__33 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__33)) __PYX_ERR(1, 16, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":86
+  /* "pyart/map/_gate_to_grid_map.pyx":75
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  *         cdef float min_roi, roi, z_offset, y_offset, x_offset
  */
-  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 86, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 86, __pyx_L1_error)
+  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 75, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 75, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -29627,14 +29802,14 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  */
   __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(1, 16, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":136
+  /* "pyart/map/_gate_to_grid_map.pyx":126
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  * 
  */
-  __pyx_codeobj__37 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 136, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__37)) __PYX_ERR(0, 136, __pyx_L1_error)
+  __pyx_codeobj__37 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_get_roi, 126, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__37)) __PYX_ERR(0, 126, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -29651,29 +29826,29 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  */
   __pyx_codeobj__39 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__39)) __PYX_ERR(1, 16, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":206
+  /* "pyart/map/_gate_to_grid_map.pyx":201
  *         return
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def find_roi_for_grid(
  */
-  __pyx_tuple__40 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_roi_array, __pyx_n_s_roi_func, __pyx_n_s_ix, __pyx_n_s_iy, __pyx_n_s_iz, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_roi); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_tuple__40 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_roi_array, __pyx_n_s_roi_func, __pyx_n_s_ix, __pyx_n_s_iy, __pyx_n_s_iz, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_roi); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(0, 201, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__40);
   __Pyx_GIVEREF(__pyx_tuple__40);
-  __pyx_codeobj__41 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_find_roi_for_grid, 206, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__41)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_codeobj__41 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_find_roi_for_grid, 201, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__41)) __PYX_ERR(0, 201, __pyx_L1_error)
 
-  /* "pyart/map/_gate_to_grid_map.pyx":234
+  /* "pyart/map/_gate_to_grid_map.pyx":229
  *         return
  * 
  *     @cython.cdivision(True)             # <<<<<<<<<<<<<<
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  */
-  __pyx_tuple__42 = PyTuple_Pack(20, __pyx_n_s_self, __pyx_n_s_ngates, __pyx_n_s_nrays, __pyx_n_s_gate_z, __pyx_n_s_gate_y, __pyx_n_s_gate_x, __pyx_n_s_field_data, __pyx_n_s_field_mask, __pyx_n_s_excluded_gates, __pyx_n_s_toa, __pyx_n_s_roi_func, __pyx_n_s_weighting_function, __pyx_n_s_roi, __pyx_n_s_values, __pyx_n_s_masks, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_nray, __pyx_n_s_ngate); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 234, __pyx_L1_error)
+  __pyx_tuple__42 = PyTuple_Pack(20, __pyx_n_s_self, __pyx_n_s_ngates, __pyx_n_s_nrays, __pyx_n_s_gate_z, __pyx_n_s_gate_y, __pyx_n_s_gate_x, __pyx_n_s_field_data, __pyx_n_s_field_mask, __pyx_n_s_excluded_gates, __pyx_n_s_roi_func, __pyx_n_s_weighting_function, __pyx_n_s_dist_factor, __pyx_n_s_roi, __pyx_n_s_values, __pyx_n_s_masks, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_nray, __pyx_n_s_ngate); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 229, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__42);
   __Pyx_GIVEREF(__pyx_tuple__42);
-  __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(12, 0, 0, 20, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_map_gates_to_grid, 234, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 234, __pyx_L1_error)
+  __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(12, 0, 0, 20, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map__gate_to_grid_map_pyx, __pyx_n_s_map_gates_to_grid, 229, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 229, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -29684,7 +29859,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
 
   /* "(tree fragment)":16
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)
  */
@@ -29710,19 +29885,20 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
 
 static CYTHON_SMALL_CODE int __Pyx_InitConstants(void) {
   if (__Pyx_CreateStringTabAndInitStrings() < 0) __PYX_ERR(0, 1, __pyx_L1_error);
-  __pyx_float_180_ = PyFloat_FromDouble(180.); if (unlikely(!__pyx_float_180_)) __PYX_ERR(0, 1, __pyx_L1_error)
+  __pyx_float_1e30 = PyFloat_FromDouble(1e30); if (unlikely(!__pyx_float_1e30)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) __PYX_ERR(0, 1, __pyx_L1_error)
+  __pyx_int_35832270 = PyInt_FromLong(35832270L); if (unlikely(!__pyx_int_35832270)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_48418759 = PyInt_FromLong(48418759L); if (unlikely(!__pyx_int_48418759)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_73048319 = PyInt_FromLong(73048319L); if (unlikely(!__pyx_int_73048319)) __PYX_ERR(0, 1, __pyx_L1_error)
+  __pyx_int_83476354 = PyInt_FromLong(83476354L); if (unlikely(!__pyx_int_83476354)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_112105877 = PyInt_FromLong(112105877L); if (unlikely(!__pyx_int_112105877)) __PYX_ERR(0, 1, __pyx_L1_error)
-  __pyx_int_116532122 = PyInt_FromLong(116532122L); if (unlikely(!__pyx_int_116532122)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_133603171 = PyInt_FromLong(133603171L); if (unlikely(!__pyx_int_133603171)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_136983863 = PyInt_FromLong(136983863L); if (unlikely(!__pyx_int_136983863)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_184977713 = PyInt_FromLong(184977713L); if (unlikely(!__pyx_int_184977713)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_185678969 = PyInt_FromLong(185678969L); if (unlikely(!__pyx_int_185678969)) __PYX_ERR(0, 1, __pyx_L1_error)
-  __pyx_int_194171105 = PyInt_FromLong(194171105L); if (unlikely(!__pyx_int_194171105)) __PYX_ERR(0, 1, __pyx_L1_error)
+  __pyx_int_199775785 = PyInt_FromLong(199775785L); if (unlikely(!__pyx_int_199775785)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_201360261 = PyInt_FromLong(201360261L); if (unlikely(!__pyx_int_201360261)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_213526028 = PyInt_FromLong(213526028L); if (unlikely(!__pyx_int_213526028)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_222419149 = PyInt_FromLong(222419149L); if (unlikely(!__pyx_int_222419149)) __PYX_ERR(0, 1, __pyx_L1_error)
@@ -29730,7 +29906,6 @@ static CYTHON_SMALL_CODE int __Pyx_InitConstants(void) {
   __pyx_int_228631518 = PyInt_FromLong(228631518L); if (unlikely(!__pyx_int_228631518)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_228825662 = PyInt_FromLong(228825662L); if (unlikely(!__pyx_int_228825662)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_238750788 = PyInt_FromLong(238750788L); if (unlikely(!__pyx_int_238750788)) __PYX_ERR(0, 1, __pyx_L1_error)
-  __pyx_int_264605129 = PyInt_FromLong(264605129L); if (unlikely(!__pyx_int_264605129)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_264671380 = PyInt_FromLong(264671380L); if (unlikely(!__pyx_int_264671380)) __PYX_ERR(0, 1, __pyx_L1_error)
   __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) __PYX_ERR(0, 1, __pyx_L1_error)
   return 0;
@@ -29800,15 +29975,15 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction = &__pyx_vtable_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_RoIFunction.get_roi = (float (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *, float, float, float, int __pyx_skip_dispatch))__pyx_f_5pyart_3map_17_gate_to_grid_map_11RoIFunction_get_roi;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_RoIFunction_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction)) __PYX_ERR(0, 35, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_RoIFunction_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_RoIFunction_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction)) __PYX_ERR(0, 24, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_RoIFunction_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction = &__pyx_type_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction->tp_print = 0;
@@ -29818,24 +29993,24 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RoIFunction, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RoIFunction, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 35, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction) < 0) __PYX_ERR(0, 24, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_ConstantRoI = &__pyx_vtable_5pyart_3map_17_gate_to_grid_map_ConstantRoI;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_ConstantRoI.__pyx_base = *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_ConstantRoI.__pyx_base.get_roi = (float (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *, float, float, float, int __pyx_skip_dispatch))__pyx_f_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_get_roi;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 43, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_ConstantRoI_spec, __pyx_t_1);
   __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI)) __PYX_ERR(0, 43, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_ConstantRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI)) __PYX_ERR(0, 32, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_ConstantRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI = &__pyx_type_5pyart_3map_17_gate_to_grid_map_ConstantRoI;
   #endif
@@ -29843,7 +30018,7 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI->tp_base = __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI->tp_print = 0;
@@ -29855,7 +30030,7 @@ static int __Pyx_modinit_type_init_code(void) {
   #endif
   #if CYTHON_UPDATE_DESCRIPTOR_DOC
   {
-    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 43, __pyx_L1_error)
+    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 32, __pyx_L1_error)
     if (__Pyx_IS_TYPE(wrapper, &PyWrapperDescr_Type)) {
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__.doc = __pyx_doc_5pyart_3map_17_gate_to_grid_map_11ConstantRoI___init__;
@@ -29863,24 +30038,24 @@ static int __Pyx_modinit_type_init_code(void) {
     }
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_ConstantRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_ConstantRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 43, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI) < 0) __PYX_ERR(0, 32, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistRoI = &__pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistRoI;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistRoI.__pyx_base = *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistRoI.__pyx_base.get_roi = (float (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *, float, float, float, int __pyx_skip_dispatch))__pyx_f_5pyart_3map_17_gate_to_grid_map_7DistRoI_get_roi;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 57, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 46, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_DistRoI_spec, __pyx_t_1);
   __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI)) __PYX_ERR(0, 57, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_DistRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI)) __PYX_ERR(0, 46, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_DistRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI = &__pyx_type_5pyart_3map_17_gate_to_grid_map_DistRoI;
   #endif
@@ -29888,7 +30063,7 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI->tp_base = __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI->tp_print = 0;
@@ -29900,7 +30075,7 @@ static int __Pyx_modinit_type_init_code(void) {
   #endif
   #if CYTHON_UPDATE_DESCRIPTOR_DOC
   {
-    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 57, __pyx_L1_error)
+    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 46, __pyx_L1_error)
     if (__Pyx_IS_TYPE(wrapper, &PyWrapperDescr_Type)) {
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__.doc = __pyx_doc_5pyart_3map_17_gate_to_grid_map_7DistRoI___init__;
@@ -29908,24 +30083,24 @@ static int __Pyx_modinit_type_init_code(void) {
     }
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_DistRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_DistRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 57, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI) < 0) __PYX_ERR(0, 46, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistBeamRoI = &__pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistBeamRoI;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistBeamRoI.__pyx_base = *__pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   __pyx_vtable_5pyart_3map_17_gate_to_grid_map_DistBeamRoI.__pyx_base.get_roi = (float (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_RoIFunction *, float, float, float, int __pyx_skip_dispatch))__pyx_f_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_get_roi;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 94, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_DistBeamRoI_spec, __pyx_t_1);
   __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI)) __PYX_ERR(0, 105, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_DistBeamRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI)) __PYX_ERR(0, 94, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_DistBeamRoI_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI = &__pyx_type_5pyart_3map_17_gate_to_grid_map_DistBeamRoI;
   #endif
@@ -29933,7 +30108,7 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI->tp_base = __pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction;
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI->tp_print = 0;
@@ -29945,7 +30120,7 @@ static int __Pyx_modinit_type_init_code(void) {
   #endif
   #if CYTHON_UPDATE_DESCRIPTOR_DOC
   {
-    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 105, __pyx_L1_error)
+    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 94, __pyx_L1_error)
     if (__Pyx_IS_TYPE(wrapper, &PyWrapperDescr_Type)) {
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__.doc = __pyx_doc_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI___init__;
@@ -29953,26 +30128,26 @@ static int __Pyx_modinit_type_init_code(void) {
     }
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_DistBeamRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_DistBeamRoI, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 105, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI) < 0) __PYX_ERR(0, 94, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_GateToGridMapper = &__pyx_vtable_5pyart_3map_17_gate_to_grid_map_GateToGridMapper;
-  __pyx_vtable_5pyart_3map_17_gate_to_grid_map_GateToGridMapper.map_gate = (int (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *, float, float, float, float, __Pyx_memviewslice, __Pyx_memviewslice, int))__pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate;
+  __pyx_vtable_5pyart_3map_17_gate_to_grid_map_GateToGridMapper.map_gate = (int (*)(struct __pyx_obj_5pyart_3map_17_gate_to_grid_map_GateToGridMapper *, float, float, float, float, __Pyx_memviewslice, __Pyx_memviewslice, int, __Pyx_memviewslice))__pyx_f_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_map_gate;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_GateToGridMapper_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper)) __PYX_ERR(0, 157, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_GateToGridMapper_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_17_gate_to_grid_map_GateToGridMapper_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper)) __PYX_ERR(0, 149, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_17_gate_to_grid_map_GateToGridMapper_spec, __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper = &__pyx_type_5pyart_3map_17_gate_to_grid_map_GateToGridMapper;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper->tp_print = 0;
@@ -29984,7 +30159,7 @@ static int __Pyx_modinit_type_init_code(void) {
   #endif
   #if CYTHON_UPDATE_DESCRIPTOR_DOC
   {
-    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 157, __pyx_L1_error)
+    PyObject *wrapper = PyObject_GetAttrString((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, "__init__"); if (unlikely(!wrapper)) __PYX_ERR(0, 149, __pyx_L1_error)
     if (__Pyx_IS_TYPE(wrapper, &PyWrapperDescr_Type)) {
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
       __pyx_wrapperbase_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__.doc = __pyx_doc_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper___init__;
@@ -29992,13 +30167,13 @@ static int __Pyx_modinit_type_init_code(void) {
     }
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_vtabptr_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_GateToGridMapper, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_GateToGridMapper, (PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper) < 0) __PYX_ERR(0, 149, __pyx_L1_error)
   #endif
   __pyx_vtabptr_array = &__pyx_vtable_array;
   __pyx_vtable_array.get_memview = (PyObject *(*)(struct __pyx_array_obj *))__pyx_array_get_memview;
@@ -30193,7 +30368,7 @@ namespace {
   {
       PyModuleDef_HEAD_INIT,
       "_gate_to_grid_map",
-      __pyx_k_pyart_map__gate_to_grid_map_Cyt, /* m_doc */
+      __pyx_k_Cython_classes_and_functions_fo, /* m_doc */
     #if CYTHON_PEP489_MULTI_PHASE_INIT
       0, /* m_size */
     #elif CYTHON_USE_MODULE_STATE
@@ -30360,7 +30535,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec__gate_to_grid_map(PyObject *__pyx_
   Py_INCREF(__pyx_m);
   #else
   #if PY_MAJOR_VERSION < 3
-  __pyx_m = Py_InitModule4("_gate_to_grid_map", __pyx_methods, __pyx_k_pyart_map__gate_to_grid_map_Cyt, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m);
+  __pyx_m = Py_InitModule4("_gate_to_grid_map", __pyx_methods, __pyx_k_Cython_classes_and_functions_fo, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m);
   if (unlikely(!__pyx_m)) __PYX_ERR(0, 1, __pyx_L1_error)
   #elif CYTHON_USE_MODULE_STATE
   __pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
@@ -30969,7 +31144,19 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_pyx_unpickle_Enum, __pyx_t_7) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":26
+  /* "pyart/map/_gate_to_grid_map.pyx":11
+ * from libc.math cimport asin, ceil, cos, exp, floor, sin, sqrt, tan
+ * 
+ * import numpy as np             # <<<<<<<<<<<<<<
+ * 
+ * 
+ */
+  __pyx_t_7 = __Pyx_ImportDottedModule(__pyx_n_s_numpy, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 11, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_7);
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_7) < 0) __PYX_ERR(0, 11, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+
+  /* "pyart/map/_gate_to_grid_map.pyx":15
  * 
  * # constants
  * cdef int BARNES2 = 3             # <<<<<<<<<<<<<<
@@ -30978,7 +31165,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_BARNES2 = 3;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":27
+  /* "pyart/map/_gate_to_grid_map.pyx":16
  * # constants
  * cdef int BARNES2 = 3
  * cdef int NEAREST = 2             # <<<<<<<<<<<<<<
@@ -30987,7 +31174,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_NEAREST = 2;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":28
+  /* "pyart/map/_gate_to_grid_map.pyx":17
  * cdef int BARNES2 = 3
  * cdef int NEAREST = 2
  * cdef int CRESSMAN = 1             # <<<<<<<<<<<<<<
@@ -30996,7 +31183,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_CRESSMAN = 1;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":29
+  /* "pyart/map/_gate_to_grid_map.pyx":18
  * cdef int NEAREST = 2
  * cdef int CRESSMAN = 1
  * cdef int BARNES = 0             # <<<<<<<<<<<<<<
@@ -31005,7 +31192,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_BARNES = 0;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":30
+  /* "pyart/map/_gate_to_grid_map.pyx":19
  * cdef int CRESSMAN = 1
  * cdef int BARNES = 0
  * cdef float PI = 3.141592653589793             # <<<<<<<<<<<<<<
@@ -31014,7 +31201,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_PI = 3.141592653589793;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":31
+  /* "pyart/map/_gate_to_grid_map.pyx":20
  * cdef int BARNES = 0
  * cdef float PI = 3.141592653589793
  * cdef float R = 8494666.66666667   # 4/3 earths radius of 6371 km in meters             # <<<<<<<<<<<<<<
@@ -31023,16 +31210,16 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_17_gate_to_grid_map_R = 8494666.66666667;
 
-  /* "pyart/map/_gate_to_grid_map.pyx":38
+  /* "pyart/map/_gate_to_grid_map.pyx":27
  *     """ A class for storing radius of interest calculations. """
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  *         return 0
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11RoIFunction_1get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_RoIFunction_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__26)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 38, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11RoIFunction_1get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_RoIFunction_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__26)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 38, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction);
 
@@ -31059,16 +31246,16 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_RoIFunction);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":52
+  /* "pyart/map/_gate_to_grid_map.pyx":41
  *         self.constant_roi = constant_roi
  * 
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return contstant radius of influence. """
  *         return self.constant_roi
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_ConstantRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 52, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11ConstantRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_ConstantRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 52, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI);
 
@@ -31095,16 +31282,16 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_ConstantRoI);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":86
+  /* "pyart/map/_gate_to_grid_map.pyx":75
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  *         cdef float min_roi, roi, z_offset, y_offset, x_offset
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_7DistRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_DistRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 86, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_7DistRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_DistRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 75, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 86, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 75, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI);
 
@@ -31131,16 +31318,16 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistRoI);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":136
+  /* "pyart/map/_gate_to_grid_map.pyx":126
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  *     cpdef float get_roi(self, float z, float y, float x):             # <<<<<<<<<<<<<<
  *         """ Return the radius of influence for coordinates in meters. """
  * 
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_DistBeamRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__37)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_11DistBeamRoI_3get_roi, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_DistBeamRoI_get_roi, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__37)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 126, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI, __pyx_n_s_get_roi, __pyx_t_7) < 0) __PYX_ERR(0, 126, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI);
 
@@ -31167,29 +31354,29 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_DistBeamRoI);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":206
+  /* "pyart/map/_gate_to_grid_map.pyx":201
  *         return
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def find_roi_for_grid(
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_3find_roi_for_grid, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_GateToGridMapper_find_roi_for_gr, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__41)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 206, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_3find_roi_for_grid, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_GateToGridMapper_find_roi_for_gr, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__41)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 201, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_n_s_find_roi_for_grid, __pyx_t_7) < 0) __PYX_ERR(0, 206, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_n_s_find_roi_for_grid, __pyx_t_7) < 0) __PYX_ERR(0, 201, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper);
 
-  /* "pyart/map/_gate_to_grid_map.pyx":234
+  /* "pyart/map/_gate_to_grid_map.pyx":229
  *         return
  * 
  *     @cython.cdivision(True)             # <<<<<<<<<<<<<<
  *     @cython.boundscheck(False)
  *     @cython.wraparound(False)
  */
-  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_5map_gates_to_grid, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_GateToGridMapper_map_gates_to_gr, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__43)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 234, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_17_gate_to_grid_map_16GateToGridMapper_5map_gates_to_grid, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_GateToGridMapper_map_gates_to_gr, NULL, __pyx_n_s_pyart_map__gate_to_grid_map, __pyx_d, ((PyObject *)__pyx_codeobj__43)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 229, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_n_s_map_gates_to_grid, __pyx_t_7) < 0) __PYX_ERR(0, 234, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper, __pyx_n_s_map_gates_to_grid, __pyx_t_7) < 0) __PYX_ERR(0, 229, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_17_gate_to_grid_map_GateToGridMapper);
 
@@ -31206,7 +31393,7 @@ if (!__Pyx_RefNanny) {
 
   /* "(tree fragment)":16
  *     else:
- *         return __pyx_unpickle_GateToGridMapper, (type(self), 0xb92d0e1, state)
+ *         return __pyx_unpickle_GateToGridMapper, (type(self), 0x4f9bf82, state)
  * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
  *     __pyx_unpickle_GateToGridMapper__set_state(self, __pyx_state)
  */
@@ -31272,8 +31459,8 @@ if (!__Pyx_RefNanny) {
 
   /* "pyart/map/_gate_to_grid_map.pyx":1
  * """             # <<<<<<<<<<<<<<
- * pyart.map._gate_to_grid_map
- * ===========================
+ * Cython classes and functions for efficient mapping of radar gates to
+ * a uniform grid.
  */
   __pyx_t_7 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -33797,89 +33984,6 @@ static void __Pyx_RaiseBufferIndexError(int axis) {
      "Out of bounds on buffer access (axis %d)", axis);
 }
 
-/* PyFloatBinop */
-#if !CYTHON_COMPILING_IN_PYPY
-static PyObject* __Pyx_PyFloat_TrueDivideObjC(PyObject *op1, PyObject *op2, double floatval, int inplace, int zerodivision_check) {
-    const double b = floatval;
-    double a, result;
-    CYTHON_UNUSED_VAR(inplace);
-    CYTHON_UNUSED_VAR(zerodivision_check);
-    if (likely(PyFloat_CheckExact(op1))) {
-#if CYTHON_COMPILING_IN_LIMITED_API
-        a = __pyx_PyFloat_AsDouble(op1);
-#else
-        a = PyFloat_AS_DOUBLE(op1);
-#endif
-        
-    } else
-    #if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_CheckExact(op1))) {
-        a = (double) PyInt_AS_LONG(op1);
-        
-    } else
-    #endif
-    if (likely(PyLong_CheckExact(op1))) {
-        #if CYTHON_USE_PYLONG_INTERNALS
-        if (__Pyx_PyLong_IsZero(op1)) {
-            a = 0.0;
-            
-        } else if (__Pyx_PyLong_IsCompact(op1)) {
-            a = (double) __Pyx_PyLong_CompactValue(op1);
-        } else {
-            const digit* digits = __Pyx_PyLong_Digits(op1);
-            const Py_ssize_t size = __Pyx_PyLong_SignedDigitCount(op1);
-            switch (size) {
-                case -2:
-                case 2:
-                    if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT && ((8 * sizeof(unsigned long) < 53) || (1 * PyLong_SHIFT < 53))) {
-                        a = (double) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                        if ((8 * sizeof(unsigned long) < 53) || (2 * PyLong_SHIFT < 53) || (a < (double) ((PY_LONG_LONG)1 << 53))) {
-                            if (size == -2)
-                                a = -a;
-                            break;
-                        }
-                    }
-                    CYTHON_FALLTHROUGH;
-                case -3:
-                case 3:
-                    if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT && ((8 * sizeof(unsigned long) < 53) || (2 * PyLong_SHIFT < 53))) {
-                        a = (double) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                        if ((8 * sizeof(unsigned long) < 53) || (3 * PyLong_SHIFT < 53) || (a < (double) ((PY_LONG_LONG)1 << 53))) {
-                            if (size == -3)
-                                a = -a;
-                            break;
-                        }
-                    }
-                    CYTHON_FALLTHROUGH;
-                case -4:
-                case 4:
-                    if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT && ((8 * sizeof(unsigned long) < 53) || (3 * PyLong_SHIFT < 53))) {
-                        a = (double) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                        if ((8 * sizeof(unsigned long) < 53) || (4 * PyLong_SHIFT < 53) || (a < (double) ((PY_LONG_LONG)1 << 53))) {
-                            if (size == -4)
-                                a = -a;
-                            break;
-                        }
-                    }
-                    CYTHON_FALLTHROUGH;
-                default:
-        #endif
-                    a = PyLong_AsDouble(op1);
-                    if (unlikely(a == -1.0 && PyErr_Occurred())) return NULL;
-        #if CYTHON_USE_PYLONG_INTERNALS
-            }
-        }
-        #endif
-    } else {
-        return (inplace ? PyNumber_InPlaceTrueDivide : PyNumber_TrueDivide)(op1, op2);
-    }
-        PyFPE_START_PROTECT("divide", return NULL)
-        result = a / b;
-        PyFPE_END_PROTECT(result)
-        return PyFloat_FromDouble(result);
-}
-#endif
-
 /* PyObject_GenericGetAttrNoDict */
 #if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
 static PyObject *__Pyx_RaiseGenericGetAttributeError(PyTypeObject *tp, PyObject *attr_name) {
@@ -36877,6 +36981,29 @@ static int __Pyx_ValidateAndInit_memviewslice(
     return result;
 }
 
+/* ObjectToMemviewSlice */
+  static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_dc_float(PyObject *obj, int writable_flag) {
+    __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } };
+    __Pyx_BufFmt_StackElem stack[1];
+    int axes_specs[] = { (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_CONTIG) };
+    int retcode;
+    if (obj == Py_None) {
+        result.memview = (struct __pyx_memoryview_obj *) Py_None;
+        return result;
+    }
+    retcode = __Pyx_ValidateAndInit_memviewslice(axes_specs, __Pyx_IS_C_CONTIG,
+                                                 (PyBUF_C_CONTIGUOUS | PyBUF_FORMAT) | writable_flag, 1,
+                                                 &__Pyx_TypeInfo_float, stack,
+                                                 &result, obj);
+    if (unlikely(retcode == -1))
+        goto __pyx_fail;
+    return result;
+__pyx_fail:
+    result.memview = NULL;
+    result.data = NULL;
+    return result;
+}
+
 /* ObjectToMemviewSlice */
   static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_d_d_dc_float(PyObject *obj, int writable_flag) {
     __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } };
@@ -36900,6 +37027,41 @@ static int __Pyx_ValidateAndInit_memviewslice(
     return result;
 }
 
+/* MemviewDtypeToObject */
+  static CYTHON_INLINE PyObject *__pyx_memview_get_double(const char *itemp) {
+    return (PyObject *) PyFloat_FromDouble(*(double *) itemp);
+}
+static CYTHON_INLINE int __pyx_memview_set_double(const char *itemp, PyObject *obj) {
+    double value = __pyx_PyFloat_AsDouble(obj);
+    if (unlikely((value == (double)-1) && PyErr_Occurred()))
+        return 0;
+    *(double *) itemp = value;
+    return 1;
+}
+
+/* ObjectToMemviewSlice */
+  static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_dsdsdsds_double(PyObject *obj, int writable_flag) {
+    __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } };
+    __Pyx_BufFmt_StackElem stack[1];
+    int axes_specs[] = { (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_STRIDED), (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_STRIDED), (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_STRIDED), (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_STRIDED) };
+    int retcode;
+    if (obj == Py_None) {
+        result.memview = (struct __pyx_memoryview_obj *) Py_None;
+        return result;
+    }
+    retcode = __Pyx_ValidateAndInit_memviewslice(axes_specs, 0,
+                                                 PyBUF_RECORDS_RO | writable_flag, 4,
+                                                 &__Pyx_TypeInfo_double, stack,
+                                                 &result, obj);
+    if (unlikely(retcode == -1))
+        goto __pyx_fail;
+    return result;
+__pyx_fail:
+    result.memview = NULL;
+    result.data = NULL;
+    return result;
+}
+
 /* ObjectToMemviewSlice */
   static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_d_dc_float(PyObject *obj, int writable_flag) {
     __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } };
diff --git a/pyart/map/_gate_to_grid_map.pyx b/pyart/map/_gate_to_grid_map.pyx
index 765d0a46b..79925991d 100644
--- a/pyart/map/_gate_to_grid_map.pyx
+++ b/pyart/map/_gate_to_grid_map.pyx
@@ -1,26 +1,15 @@
 """
-pyart.map._gate_to_grid_map
-===========================
-
 Cython classes and functions for efficient mapping of radar gates to
 a uniform grid.
 
-.. autosummary::
-    :toctree: generated/
-    :template: dev_template.rst
-
-    GateToGridMapper
-    RoIFunction
-    ConstantRoI
-    DistRoI
-    DistBeamRoI
-
 """
 
-from libc.math cimport sqrt, exp, ceil, floor, sin, cos, tan, asin
+cimport cython
 from cython.view cimport array as cvarray
+from libc.math cimport asin, ceil, cos, exp, floor, sin, sqrt, tan
+
+import numpy as np
 
-cimport cython
 
 # constants
 cdef int BARNES2 = 3
@@ -107,11 +96,12 @@ cdef class DistBeamRoI(RoIFunction):
     Radius of influence which expands with distance from multiple radars.
     """
 
-    cdef float h_factor, min_radius, beam_factor
+    cdef float min_radius, beam_factor
     cdef int num_offsets
     cdef float[:, :] offsets
+    cdef float[::1] h_factor
 
-    def __init__(self, h_factor, nb, bsp, min_radius, offsets):
+    def __init__(self, float[::1] h_factor, float nb, float bsp, float min_radius, offsets):
         """ initalize. """
         cdef int i
         self.h_factor = h_factor
@@ -144,9 +134,11 @@ cdef class DistBeamRoI(RoIFunction):
             z_offset = self.offsets[i, 0]
             y_offset = self.offsets[i, 1]
             x_offset = self.offsets[i, 2]
-            roi = (self.h_factor * ((z - z_offset) / 20.0) +
-                   sqrt((y - y_offset)**2 + (x - x_offset)**2) *
-                   self.beam_factor)
+            roi = (sqrt((self.h_factor[0] * (z - z_offset))**2 +
+                        (self.h_factor[1] * (y - y_offset))**2 +
+                        (self.h_factor[2] * (x - x_offset))**2) *
+                   self.beam_factor
+            )
             if roi < self.min_radius:
                 roi = self.min_radius
             if roi < min_roi:
@@ -178,6 +170,8 @@ cdef class GateToGridMapper:
     cdef int nx, ny, nz, nfields
     cdef float[:, :, :, ::1] grid_sum
     cdef float[:, :, :, ::1] grid_wsum
+    cdef double[:, :, :, :] min_dist2
+
 
     def __init__(self, tuple grid_shape, tuple grid_starts, tuple grid_steps,
                  float[:, :, :, ::1] grid_sum, float[:, :, :, ::1] grid_wsum):
@@ -201,6 +195,7 @@ cdef class GateToGridMapper:
         self.nfields = grid_sum.shape[3]
         self.grid_sum = grid_sum
         self.grid_wsum = grid_wsum
+        self.min_dist2 = 1e30*np.ones((nz, ny, nx, self.nfields))
         return
 
     @cython.boundscheck(False)
@@ -235,12 +230,13 @@ cdef class GateToGridMapper:
     @cython.boundscheck(False)
     @cython.wraparound(False)
     def map_gates_to_grid(
-            self, 
+            self,
             int ngates, int nrays,
-            float[:, ::1] gate_z, float[:, ::1] gate_y, float[:, ::1] gate_x, 
+            float[:, ::1] gate_z, float[:, ::1] gate_y, float[:, ::1] gate_x,
             float[:, :, ::1] field_data,
             char[:, :, ::1] field_mask, char[:, ::1] excluded_gates,
-            float toa, RoIFunction roi_func, int weighting_function):
+            RoIFunction roi_func, int weighting_function,
+            float[::1] dist_factor):
         """
         Map radar gates unto the regular grid.
 
@@ -272,6 +268,13 @@ cdef class GateToGridMapper:
             Function to use for weighting gates based upon distance.
             0 for Barnes, 1 for Cressman, 2 for Nearest and 3 for Barnes 2
             neighbor weighting.
+        dist_factor: 3-element float32 array
+            Scaling factors for squared z,y,x difference in distance calculation.
+            For example:
+            A value of (0.0, 1.0, 1.0)  combined with an h_factor=(0.0, 1.0, 1.0)
+            (if calling DistBeamRoI) or z_factor=0.0 (if calling DistRoI) results in
+            the exclusion of the z dimension in gridding weighting and could
+            serve as a potential solution for gridding a single PPI sweep.
 
         """
 
@@ -294,7 +297,8 @@ cdef class GateToGridMapper:
                 values = field_data[nray, ngate]
                 masks = field_mask[nray, ngate]
 
-                self.map_gate(x, y, z, roi, values, masks, weighting_function)
+                self.map_gate(x, y, z, roi, values, masks, weighting_function,
+                              dist_factor)
 
     @cython.initializedcheck(False)
     @cython.cdivision(True)
@@ -302,10 +306,10 @@ cdef class GateToGridMapper:
     @cython.wraparound(False)
     cdef int map_gate(self, float x, float y, float z, float roi,
                       float[:] values, char[:] masks,
-                      int weighting_function):
+                      int weighting_function, float[:] dist_factor):
         """ Map a single gate to the grid. """
 
-        cdef float xg, yg, zg, dist, weight, roi2, dist2, min_dist2
+        cdef float xg, yg, zg, weight, roi2, dist2, min_dist2
         cdef int x_min, x_max, y_min, y_max, z_min, z_max
         cdef int xi, yi, zi, x_argmin, y_argmin, z_argmin
 
@@ -336,10 +340,9 @@ cdef class GateToGridMapper:
             return 0
 
         roi2 = roi * roi
-        
+
         if weighting_function == NEAREST:
             # Get the xi, yi, zi of desired weight
-            min_dist2 = 1e30
             x_argmin = -1
             y_argmin = -1
             z_argmin = -1
@@ -349,23 +352,23 @@ cdef class GateToGridMapper:
                         xg = self.x_step * xi
                         yg = self.y_step * yi
                         zg = self.z_step * zi
-                        dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
-                        if dist2 < min_dist2:
-                            min_dist2 = dist2
-                            x_argmin = xi
-                            y_argmin = yi
-                            z_argmin = zi
-            
-            for xi in range(x_min, x_max+1):
-                for yi in range(y_min, y_max+1):
-                    for zi in range(z_min, z_max+1):
-                        if (xi == x_argmin and 
-                            yi == y_argmin and 
-                            zi == z_argmin):
-                            for i in range(self.nfields):
-                                self.grid_wsum[zi, yi, xi, i] += 1
-                                self.grid_sum[zi, yi, xi, i] += values[i]
-
+                        dist2 = (dist_factor[2] * (xg - x)**2 +
+                                 dist_factor[1] * (yg - y)**2 +
+                                 dist_factor[0] * (zg - z)**2)
+                        if dist2 >= roi2:
+                            continue
+                        for i in range(self.nfields):
+                            if dist2 < self.min_dist2[zi, yi, xi, i]:
+                                self.min_dist2[zi, yi, xi, i] = dist2
+                                x_argmin = xi
+                                y_argmin = yi
+                                z_argmin = zi
+                                if masks[i]:
+                                    self.grid_wsum[zi, yi, xi, i] = 0
+                                    self.grid_sum[zi, yi, xi, i] = 0
+                                else:
+                                    self.grid_wsum[z_argmin, y_argmin, x_argmin, i] = 1
+                                    self.grid_sum[z_argmin, y_argmin, x_argmin, i] = values[i]
         else:
             for xi in range(x_min, x_max+1):
                 for yi in range(y_min, y_max+1):
@@ -373,7 +376,9 @@ cdef class GateToGridMapper:
                         xg = self.x_step * xi
                         yg = self.y_step * yi
                         zg = self.z_step * zi
-                        dist2 = (xg-x)*(xg-x) + (yg-y)*(yg-y) + (zg-z)*(zg-z)
+                        dist2 = (dist_factor[2] * (xg-x)*(xg-x) +
+                                 dist_factor[1] * (yg-y)*(yg-y) +
+                                 dist_factor[0] * (zg-z)*(zg-z))
 
                         if dist2 > roi2:
                             continue
diff --git a/pyart/map/_load_nn_field_data.c b/pyart/map/_load_nn_field_data.c
index 0eb45e1d8..48f5b2e44 100644
--- a/pyart/map/_load_nn_field_data.c
+++ b/pyart/map/_load_nn_field_data.c
@@ -10,7 +10,7 @@
             ]
         ],
         "include_dirs": [
-            "/store/msrad/utils/anaconda3-wolfensb/envs/pyart_new/lib/python3.12/site-packages/numpy/_core/include"
+            "/tmp/pip-build-env-rq7_nglo/overlay/lib/python3.12/site-packages/numpy/_core/include"
         ],
         "name": "pyart.map._load_nn_field_data",
         "sources": [
diff --git a/pyart/map/ckdtree.c b/pyart/map/ckdtree.c
index 7e1f5d4f4..4e079d47b 100644
--- a/pyart/map/ckdtree.c
+++ b/pyart/map/ckdtree.c
@@ -10,14 +10,14 @@
             ]
         ],
         "depends": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/arrayscalars.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarrayobject.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ndarraytypes.h",
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include/numpy/ufuncobject.h"
         ],
         "include_dirs": [
-            "/tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/_core/include"
+            "/tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/_core/include"
         ],
         "libraries": [
             "m"
@@ -1251,6 +1251,7 @@ static CYTHON_INLINE float __PYX_NAN() {
 #define __PYX_HAVE_API__pyart__map__ckdtree
 /* Early includes */
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 
     /* Using NumPy API declarations from "numpy/__init__.cython-30.pxd" */
@@ -1260,7 +1261,6 @@ static CYTHON_INLINE float __PYX_NAN() {
 #include "numpy/ndarraytypes.h"
 #include "numpy/arrayscalars.h"
 #include "numpy/ufuncobject.h"
-#include <stdlib.h>
 #include "limits.h"
 #ifdef _OPENMP
 #include <omp.h>
@@ -1580,7 +1580,7 @@ typedef struct {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1589,7 +1589,7 @@ typedef struct {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1598,7 +1598,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1607,7 +1607,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1616,7 +1616,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1625,7 +1625,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1634,7 +1634,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1643,7 +1643,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1652,7 +1652,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1661,7 +1661,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1670,7 +1670,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
  * ctypedef double complex complex128_t
  * 
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1679,7 +1679,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
  * 
  * ctypedef npy_longlong   longlong_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1688,7 +1688,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1697,7 +1697,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1706,7 +1706,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1715,7 +1715,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1724,7 +1724,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1779,7 +1779,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker;
 struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker;
 struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
  * 
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil             # <<<<<<<<<<<<<<
@@ -1788,7 +1788,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree;
  */
 typedef int (*__pyx_t_5numpy_NpyIter_IterNextFunc)(NpyIter *);
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil
  * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil             # <<<<<<<<<<<<<<
@@ -1804,7 +1804,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_innernode;
 struct __pyx_t_5pyart_3map_7ckdtree_leafnode;
 struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo;
 
-/* "pyart/map/ckdtree.pyx":124
+/* "pyart/map/ckdtree.pyx":125
  * # Priority queue
  * # ==============
  * cdef union heapcontents:    # FIXME: Unions are not always portable, verify this             # <<<<<<<<<<<<<<
@@ -1816,7 +1816,7 @@ union __pyx_t_5pyart_3map_7ckdtree_heapcontents {
   char *ptrdata;
 };
 
-/* "pyart/map/ckdtree.pyx":128
+/* "pyart/map/ckdtree.pyx":129
  *     char* ptrdata
  * 
  * cdef struct heapitem:             # <<<<<<<<<<<<<<
@@ -1828,7 +1828,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_heapitem {
   union __pyx_t_5pyart_3map_7ckdtree_heapcontents contents;
 };
 
-/* "pyart/map/ckdtree.pyx":448
+/* "pyart/map/ckdtree.pyx":449
  * # dist_tracker.pop()
  * 
  * cdef struct RR_stack_item:             # <<<<<<<<<<<<<<
@@ -1844,7 +1844,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item {
   __pyx_t_5numpy_float64_t max_distance;
 };
 
-/* "pyart/map/ckdtree.pyx":631
+/* "pyart/map/ckdtree.pyx":632
  * # dist_tracker.pop()
  * 
  * cdef struct RP_stack_item:             # <<<<<<<<<<<<<<
@@ -1859,7 +1859,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item {
   __pyx_t_5numpy_float64_t max_distance;
 };
 
-/* "pyart/map/ckdtree.pyx":767
+/* "pyart/map/ckdtree.pyx":768
  * # Tree structure
  * # ==============
  * cdef struct innernode:             # <<<<<<<<<<<<<<
@@ -1874,7 +1874,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_innernode {
   struct __pyx_t_5pyart_3map_7ckdtree_innernode *greater;
 };
 
-/* "pyart/map/ckdtree.pyx":774
+/* "pyart/map/ckdtree.pyx":775
  *     innernode* greater
  * 
  * cdef struct leafnode:             # <<<<<<<<<<<<<<
@@ -1888,7 +1888,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_leafnode {
   __pyx_t_5numpy_intp_t end_idx;
 };
 
-/* "pyart/map/ckdtree.pyx":784
+/* "pyart/map/ckdtree.pyx":785
  * # malloc sizeof(nodeinfo)+self.m*sizeof(np.float64_t) bytes.
  * 
  * cdef struct nodeinfo:             # <<<<<<<<<<<<<<
@@ -1900,7 +1900,7 @@ struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo {
   __pyx_t_5numpy_float64_t side_distances[0];
 };
 
-/* "pyart/map/ckdtree.pyx":132
+/* "pyart/map/ckdtree.pyx":133
  *     heapcontents contents
  * 
  * cdef class heap(object):             # <<<<<<<<<<<<<<
@@ -1916,7 +1916,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_heap {
 };
 
 
-/* "pyart/map/ckdtree.pyx":237
+/* "pyart/map/ckdtree.pyx":238
  * 
  * # Utility for building a coo matrix incrementally
  * cdef class coo_entries:             # <<<<<<<<<<<<<<
@@ -1937,7 +1937,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_coo_entries {
 };
 
 
-/* "pyart/map/ckdtree.pyx":326
+/* "pyart/map/ckdtree.pyx":327
  * # ===================
  * 
  * cdef class Rectangle:             # <<<<<<<<<<<<<<
@@ -1954,7 +1954,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle {
 };
 
 
-/* "pyart/map/ckdtree.pyx":457
+/* "pyart/map/ckdtree.pyx":458
  * cdef np.intp_t GREATER = 2
  * 
  * cdef class RectRectDistanceTracker(object):             # <<<<<<<<<<<<<<
@@ -1977,7 +1977,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker {
 };
 
 
-/* "pyart/map/ckdtree.pyx":636
+/* "pyart/map/ckdtree.pyx":637
  *     np.float64_t min_distance, max_distance
  * 
  * cdef class PointRectDistanceTracker(object):             # <<<<<<<<<<<<<<
@@ -2000,7 +2000,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker {
 };
 
 
-/* "pyart/map/ckdtree.pyx":791
+/* "pyart/map/ckdtree.pyx":792
  * # Main class
  * # ==========
  * cdef class cKDTree:             # <<<<<<<<<<<<<<
@@ -2026,7 +2026,7 @@ struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree {
 
 
 
-/* "pyart/map/ckdtree.pyx":132
+/* "pyart/map/ckdtree.pyx":133
  *     heapcontents contents
  * 
  * cdef class heap(object):             # <<<<<<<<<<<<<<
@@ -2046,7 +2046,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
 static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_obj_5pyart_3map_7ckdtree_heap *, struct __pyx_t_5pyart_3map_7ckdtree_heapitem);
 
 
-/* "pyart/map/ckdtree.pyx":237
+/* "pyart/map/ckdtree.pyx":238
  * 
  * # Utility for building a coo matrix incrementally
  * cdef class coo_entries:             # <<<<<<<<<<<<<<
@@ -2060,7 +2060,7 @@ struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries {
 static struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries *__pyx_vtabptr_5pyart_3map_7ckdtree_coo_entries;
 
 
-/* "pyart/map/ckdtree.pyx":457
+/* "pyart/map/ckdtree.pyx":458
  * cdef np.intp_t GREATER = 2
  * 
  * cdef class RectRectDistanceTracker(object):             # <<<<<<<<<<<<<<
@@ -2083,7 +2083,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
 static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *);
 
 
-/* "pyart/map/ckdtree.pyx":636
+/* "pyart/map/ckdtree.pyx":637
  *     np.float64_t min_distance, max_distance
  * 
  * cdef class PointRectDistanceTracker(object):             # <<<<<<<<<<<<<<
@@ -2107,7 +2107,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
 static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop(struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker *);
 
 
-/* "pyart/map/ckdtree.pyx":791
+/* "pyart/map/ckdtree.pyx":792
  * # Main class
  * # ==========
  * cdef class cKDTree:             # <<<<<<<<<<<<<<
@@ -3188,8 +3188,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
 static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_traverse(struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *__pyx_v_other, __pyx_t_5numpy_intp_t __pyx_v_n_queries, __pyx_t_5numpy_float64_t *__pyx_v_r, __pyx_t_5numpy_intp_t *__pyx_v_results, __pyx_t_5numpy_intp_t *__pyx_v_idx, struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_v_node2, struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *__pyx_v_tracker); /* proto*/
 static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matrix_traverse(struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *__pyx_v_other, struct __pyx_obj_5pyart_3map_7ckdtree_coo_entries *__pyx_v_results, struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_v_node2, struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *__pyx_v_tracker); /* proto*/
 
+/* Module declarations from "cython" */
+
 /* Module declarations from "libc.string" */
 
+/* Module declarations from "libc.stdlib" */
+
 /* Module declarations from "libc.stdio" */
 
 /* Module declarations from "__builtin__" */
@@ -3206,10 +3210,6 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
 
 /* Module declarations from "numpy" */
 
-/* Module declarations from "libc.stdlib" */
-
-/* Module declarations from "cython" */
-
 /* Module declarations from "pyart.map.ckdtree" */
 static __pyx_t_5numpy_float64_t __pyx_v_5pyart_3map_7ckdtree_infinity;
 static __pyx_t_5numpy_intp_t __pyx_v_5pyart_3map_7ckdtree_LESS;
@@ -3379,7 +3379,7 @@ static const char __pyx_k_leafsize_must_be_at_least_1[] = "leafsize must be at l
 static const char __pyx_k_coo_entries___setstate_cython[] = "coo_entries.__setstate_cython__";
 static const char __pyx_k_cKDTree_sparse_distance_matrix[] = "cKDTree.sparse_distance_matrix";
 static const char __pyx_k_Copyright_c_2001_2002_Enthought[] = "\nCopyright (c) 2001, 2002 Enthought, Inc.\nAll rights reserved.\n\nCopyright (c) 2003-2012 SciPy Developers.\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n  a. Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n  b. Redistributions in binary form must reproduce the above copyright\n     notice, this list of conditions and the following disclaimer in the\n     documentation and/or other materials provided with the distribution.\n  c. Neither the name of Enthought nor the names of the SciPy Developers\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE.\n\n";
-static const char __pyx_k_query_ball_point_self_x_r_p_eps[] = "query_ball_point(self, x, r, p, eps)\n        \n        Find all points within distance r of point(s) x.\n\n        Parameters\n        ----------\n        x : array_like, shape tuple + (self.m,)\n            The point or points to search for neighbors of.\n        r : positive float\n            The radius of points to return.\n        p : float, optional\n            Which Minkowski p-norm to use.  Should be in the range [1, inf].\n        eps : nonnegative float, optional\n            Approximate search. Branches of the tree are not explored if their\n            nearest points are further than ``r / (1 + eps)``, and branches are\n            added in bulk if their furthest points are nearer than\n            ``r * (1 + eps)``.\n\n        Returns\n        -------\n        results : list or array of lists\n            If `x` is a single point, returns a list of the indices of the\n            neighbors of `x`. If `x` is an array of points, returns an object\n            array of shape tuple containing lists of neighbors.\n\n        Notes\n        -----\n        If you have many points whose neighbors you want to find, you may save\n        substantial amounts of time by putting them in a cKDTree and using\n        query_ball_tree.\n\n        Examples\n        --------\n        >>> from scipy import spatial\n        >>> x, y = np.mgrid[0:4, 0:4]\n        >>> points = zip(x.ravel(), y.ravel())\n        >>> tree = spatial.cKDTree(points)\n        >>> tree.query_ball_point([2, 0], 1)\n        [4, 8, 9, 12]\n\n        ";
+static const char __pyx_k_query_ball_point_self_x_r_p_eps[] = "query_ball_point(self, x, r, p, eps)\n\n        Find all points within distance r of point(s) x.\n\n        Parameters\n        ----------\n        x : array_like, shape tuple + (self.m,)\n            The point or points to search for neighbors of.\n        r : positive float\n            The radius of points to return.\n        p : float, optional\n            Which Minkowski p-norm to use.  Should be in the range [1, inf].\n        eps : nonnegative float, optional\n            Approximate search. Branches of the tree are not explored if their\n            nearest points are further than ``r / (1 + eps)``, and branches are\n            added in bulk if their furthest points are nearer than\n            ``r * (1 + eps)``.\n\n        Returns\n        -------\n        results : list or array of lists\n            If `x` is a single point, returns a list of the indices of the\n            neighbors of `x`. If `x` is an array of points, returns an object\n            array of shape tuple containing lists of neighbors.\n\n        Notes\n        -----\n        If you have many points whose neighbors you want to find, you may save\n        substantial amounts of time by putting them in a cKDTree and using\n        query_ball_tree.\n\n        Examples\n        --------\n        >>> from scipy import spatial\n        >>> x, y = np.mgrid[0:4, 0:4]\n        >>> points = zip(x.ravel(), y.ravel())\n        >>> tree = spatial.cKDTree(points)\n        >>> tree.query_ball_point([2, 0], 1)\n        [4, 8, 9, 12]\n\n        ";
 static const char __pyx_k_r_must_be_either_a_single_value[] = "r must be either a single value or a one-dimensional array of values";
 static const char __pyx_k_Only_p_norms_with_1_p_infinity_p[] = "Only p-norms with 1<=p<=infinity permitted";
 static const char __pyx_k_PointRectDistanceTracker___reduc[] = "PointRectDistanceTracker.__reduce_cython__";
@@ -3387,7 +3387,7 @@ static const char __pyx_k_PointRectDistanceTracker___setst[] = "PointRectDistanc
 static const char __pyx_k_RectRectDistanceTracker___reduce[] = "RectRectDistanceTracker.__reduce_cython__";
 static const char __pyx_k_RectRectDistanceTracker___setsta[] = "RectRectDistanceTracker.__setstate_cython__";
 static const char __pyx_k_Trees_passed_to_query_ball_trees[] = "Trees passed to query_ball_trees have different dimensionality";
-static const char __pyx_k_cKDTree_query_ball_point_line_13[] = "cKDTree.query_ball_point (line 1383)";
+static const char __pyx_k_cKDTree_query_ball_point_line_13[] = "cKDTree.query_ball_point (line 1384)";
 static const char __pyx_k_numpy__core_multiarray_failed_to[] = "numpy._core.multiarray failed to import";
 static const char __pyx_k_numpy__core_umath_failed_to_impo[] = "numpy._core.umath failed to import";
 static const char __pyx_k_rect1_and_rect2_have_different_d[] = "rect1 and rect2 have different dimensions";
@@ -3474,6 +3474,10 @@ typedef struct {
   #endif
   #if CYTHON_USE_MODULE_STATE
   #endif
+  #if CYTHON_USE_MODULE_STATE
+  #endif
+  #if CYTHON_USE_MODULE_STATE
+  #endif
   PyTypeObject *__pyx_ptype_7cpython_4type_type;
   #if CYTHON_USE_MODULE_STATE
   #endif
@@ -3501,10 +3505,6 @@ typedef struct {
   PyTypeObject *__pyx_ptype_5numpy_character;
   PyTypeObject *__pyx_ptype_5numpy_ufunc;
   #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
   PyObject *__pyx_type_5pyart_3map_7ckdtree_heap;
   PyObject *__pyx_type_5pyart_3map_7ckdtree_coo_entries;
   PyObject *__pyx_type_5pyart_3map_7ckdtree_Rectangle;
@@ -4285,6 +4285,10 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #endif
 #if CYTHON_USE_MODULE_STATE
 #endif
+#if CYTHON_USE_MODULE_STATE
+#endif
+#if CYTHON_USE_MODULE_STATE
+#endif
 #define __pyx_ptype_7cpython_4type_type __pyx_mstate_global->__pyx_ptype_7cpython_4type_type
 #if CYTHON_USE_MODULE_STATE
 #endif
@@ -4312,10 +4316,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_ptype_5numpy_character __pyx_mstate_global->__pyx_ptype_5numpy_character
 #define __pyx_ptype_5numpy_ufunc __pyx_mstate_global->__pyx_ptype_5numpy_ufunc
 #if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
 #define __pyx_type_5pyart_3map_7ckdtree_heap __pyx_mstate_global->__pyx_type_5pyart_3map_7ckdtree_heap
 #define __pyx_type_5pyart_3map_7ckdtree_coo_entries __pyx_mstate_global->__pyx_type_5pyart_3map_7ckdtree_coo_entries
 #define __pyx_type_5pyart_3map_7ckdtree_Rectangle __pyx_mstate_global->__pyx_type_5pyart_3map_7ckdtree_Rectangle
@@ -4536,7 +4536,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_codeobj__45 __pyx_mstate_global->__pyx_codeobj__45
 /* #### Code section: module_code ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4547,7 +4547,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:
  *             return PyDataType_ELSIZE(self)             # <<<<<<<<<<<<<<
@@ -4557,7 +4557,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   __pyx_r = PyDataType_ELSIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4570,7 +4570,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4581,7 +4581,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:
  *             return PyDataType_ALIGNMENT(self)             # <<<<<<<<<<<<<<
@@ -4591,7 +4591,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4604,7 +4604,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -4618,7 +4618,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("fields", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
  *         @property
  *         cdef inline object fields(self):
  *             return <object>PyDataType_FIELDS(self)             # <<<<<<<<<<<<<<
@@ -4631,7 +4631,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   __pyx_r = ((PyObject *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -4646,7 +4646,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -4660,7 +4660,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("names", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
  *         @property
  *         cdef inline tuple names(self):
  *             return <tuple>PyDataType_NAMES(self)             # <<<<<<<<<<<<<<
@@ -4673,7 +4673,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   __pyx_r = ((PyObject*)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -4688,7 +4688,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4699,7 +4699,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
 static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) {
   PyArray_ArrayDescr *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:
  *             return PyDataType_SUBARRAY(self)             # <<<<<<<<<<<<<<
@@ -4709,7 +4709,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   __pyx_r = PyDataType_SUBARRAY(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4722,7 +4722,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4733,7 +4733,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
 static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) {
   npy_uint64 __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
  *         cdef inline npy_uint64 flags(self) noexcept nogil:
  *             """The data types flags."""
  *             return PyDataType_FLAGS(self)             # <<<<<<<<<<<<<<
@@ -4743,7 +4743,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   __pyx_r = PyDataType_FLAGS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4756,7 +4756,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4767,7 +4767,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
  *         cdef inline int numiter(self) noexcept nogil:
  *             """The number of arrays that need to be broadcast to the same shape."""
  *             return PyArray_MultiIter_NUMITER(self)             # <<<<<<<<<<<<<<
@@ -4777,7 +4777,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4790,7 +4790,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4801,7 +4801,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
  *         cdef inline npy_intp size(self) noexcept nogil:
  *             """The total broadcasted size."""
  *             return PyArray_MultiIter_SIZE(self)             # <<<<<<<<<<<<<<
@@ -4811,7 +4811,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4824,7 +4824,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4835,7 +4835,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
  *         cdef inline npy_intp index(self) noexcept nogil:
  *             """The current (1-d) index into the broadcasted result."""
  *             return PyArray_MultiIter_INDEX(self)             # <<<<<<<<<<<<<<
@@ -4845,7 +4845,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4858,7 +4858,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4869,7 +4869,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
  *         cdef inline int nd(self) noexcept nogil:
  *             """The number of dimensions in the broadcasted result."""
  *             return PyArray_MultiIter_NDIM(self)             # <<<<<<<<<<<<<<
@@ -4879,7 +4879,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4892,7 +4892,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4903,7 +4903,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:
  *             """The shape of the broadcasted result."""
  *             return PyArray_MultiIter_DIMS(self)             # <<<<<<<<<<<<<<
@@ -4913,7 +4913,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4926,7 +4926,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4937,7 +4937,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
 static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) {
   void **__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
  *             """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
  *             On return, the iterators are adjusted for broadcasting."""
  *             return PyArray_MultiIter_ITERS(self)             # <<<<<<<<<<<<<<
@@ -4947,7 +4947,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4960,7 +4960,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4971,7 +4971,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -4981,7 +4981,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4994,7 +4994,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5008,7 +5008,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -5021,7 +5021,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5036,7 +5036,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5047,7 +5047,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -5057,7 +5057,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5070,7 +5070,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5081,7 +5081,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -5091,7 +5091,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5104,7 +5104,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5115,7 +5115,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -5125,7 +5125,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5138,7 +5138,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5149,7 +5149,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -5159,7 +5159,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5172,7 +5172,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5183,7 +5183,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -5193,7 +5193,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5206,7 +5206,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5223,7 +5223,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -5237,7 +5237,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5256,7 +5256,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5273,7 +5273,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -5287,7 +5287,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5306,7 +5306,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5323,7 +5323,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -5337,7 +5337,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5356,7 +5356,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -5373,7 +5373,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -5387,7 +5387,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -5406,7 +5406,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -5423,7 +5423,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -5437,7 +5437,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -5456,7 +5456,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -5471,7 +5471,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   PyObject *__pyx_t_2;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5481,7 +5481,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -5494,7 +5494,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_t_2);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5503,7 +5503,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -5517,7 +5517,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -5532,7 +5532,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -5546,7 +5546,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -5555,7 +5555,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -5564,7 +5564,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 1012, __pyx_L1_error)
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -5579,7 +5579,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5594,7 +5594,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -5603,7 +5603,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5613,7 +5613,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -5624,7 +5624,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5633,7 +5633,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -5645,7 +5645,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5660,7 +5660,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -5684,7 +5684,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5700,7 +5700,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -5709,7 +5709,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1024, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5723,7 +5723,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -5738,7 +5738,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -5753,7 +5753,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5769,7 +5769,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -5792,7 +5792,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -5816,7 +5816,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5832,7 +5832,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -5841,7 +5841,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1030, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5855,7 +5855,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -5870,7 +5870,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -5885,7 +5885,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5901,7 +5901,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -5924,7 +5924,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -5948,7 +5948,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5964,7 +5964,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -5973,7 +5973,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1036, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5987,7 +5987,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6002,7 +6002,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -6017,7 +6017,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6033,7 +6033,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -6056,7 +6056,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -6067,7 +6067,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -6077,7 +6077,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -6090,7 +6090,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -6101,7 +6101,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -6111,7 +6111,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -6124,7 +6124,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6135,7 +6135,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6145,7 +6145,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6158,7 +6158,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6169,7 +6169,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6179,7 +6179,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6192,7 +6192,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6203,7 +6203,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -6213,7 +6213,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -6226,7 +6226,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":77
+/* "pyart/map/ckdtree.pyx":78
  * # test is optimized away.
  * 
  * cdef inline int set_add_pair(set results,             # <<<<<<<<<<<<<<
@@ -6247,7 +6247,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set_add_pair", 1);
 
-  /* "pyart/map/ckdtree.pyx":81
+  /* "pyart/map/ckdtree.pyx":82
  *                              np.intp_t j) except -1:
  * 
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6257,7 +6257,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
   __pyx_t_1 = ((sizeof(long)) < (sizeof(__pyx_t_5numpy_intp_t)));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":83
+    /* "pyart/map/ckdtree.pyx":84
  *     if sizeof(long) < sizeof(np.intp_t):
  *         # Win 64
  *         results.add((int(i), int(j)))             # <<<<<<<<<<<<<<
@@ -6266,30 +6266,30 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
  */
     if (unlikely(__pyx_v_results == Py_None)) {
       PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-      __PYX_ERR(0, 83, __pyx_L1_error)
+      __PYX_ERR(0, 84, __pyx_L1_error)
     }
-    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_GIVEREF(__pyx_t_3);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 83, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 84, __pyx_L1_error);
     __Pyx_GIVEREF(__pyx_t_4);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 83, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 84, __pyx_L1_error);
     __pyx_t_3 = 0;
     __pyx_t_4 = 0;
-    __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 83, __pyx_L1_error)
+    __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 84, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":81
+    /* "pyart/map/ckdtree.pyx":82
  *                              np.intp_t j) except -1:
  * 
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6299,7 +6299,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":86
+  /* "pyart/map/ckdtree.pyx":87
  *     else:
  *         # Other platforms
  *         results.add((i, j))             # <<<<<<<<<<<<<<
@@ -6309,26 +6309,26 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
   /*else*/ {
     if (unlikely(__pyx_v_results == Py_None)) {
       PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-      __PYX_ERR(0, 86, __pyx_L1_error)
+      __PYX_ERR(0, 87, __pyx_L1_error)
     }
-    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 87, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 86, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 87, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 86, __pyx_L1_error)
+    __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 87, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_GIVEREF(__pyx_t_2);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2)) __PYX_ERR(0, 87, __pyx_L1_error);
     __Pyx_GIVEREF(__pyx_t_4);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4)) __PYX_ERR(0, 86, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4)) __PYX_ERR(0, 87, __pyx_L1_error);
     __pyx_t_2 = 0;
     __pyx_t_4 = 0;
-    __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 86, __pyx_L1_error)
+    __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 87, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":87
+  /* "pyart/map/ckdtree.pyx":88
  *         # Other platforms
  *         results.add((i, j))
  *     return 0             # <<<<<<<<<<<<<<
@@ -6338,7 +6338,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":77
+  /* "pyart/map/ckdtree.pyx":78
  * # test is optimized away.
  * 
  * cdef inline int set_add_pair(set results,             # <<<<<<<<<<<<<<
@@ -6358,7 +6358,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_pair(PyObject *__p
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":90
+/* "pyart/map/ckdtree.pyx":91
  * 
  * 
  * cdef inline int set_add_ordered_pair(set results,             # <<<<<<<<<<<<<<
@@ -6379,7 +6379,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set_add_ordered_pair", 1);
 
-  /* "pyart/map/ckdtree.pyx":94
+  /* "pyart/map/ckdtree.pyx":95
  *                                      np.intp_t j) except -1:
  * 
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6389,7 +6389,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
   __pyx_t_1 = ((sizeof(long)) < (sizeof(__pyx_t_5numpy_intp_t)));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":96
+    /* "pyart/map/ckdtree.pyx":97
  *     if sizeof(long) < sizeof(np.intp_t):
  *         # Win 64
  *         if i < j:             # <<<<<<<<<<<<<<
@@ -6399,7 +6399,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
     __pyx_t_1 = (__pyx_v_i < __pyx_v_j);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":97
+      /* "pyart/map/ckdtree.pyx":98
  *         # Win 64
  *         if i < j:
  *             results.add((int(i), int(j)))             # <<<<<<<<<<<<<<
@@ -6408,30 +6408,30 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
  */
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-        __PYX_ERR(0, 97, __pyx_L1_error)
+        __PYX_ERR(0, 98, __pyx_L1_error)
       }
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_GIVEREF(__pyx_t_3);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 98, __pyx_L1_error);
       __Pyx_GIVEREF(__pyx_t_4);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error);
       __pyx_t_3 = 0;
       __pyx_t_4 = 0;
-      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 97, __pyx_L1_error)
+      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 98, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "pyart/map/ckdtree.pyx":96
+      /* "pyart/map/ckdtree.pyx":97
  *     if sizeof(long) < sizeof(np.intp_t):
  *         # Win 64
  *         if i < j:             # <<<<<<<<<<<<<<
@@ -6441,7 +6441,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":99
+    /* "pyart/map/ckdtree.pyx":100
  *             results.add((int(i), int(j)))
  *         else:
  *             results.add((int(j), int(i)))             # <<<<<<<<<<<<<<
@@ -6451,32 +6451,32 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
     /*else*/ {
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-        __PYX_ERR(0, 99, __pyx_L1_error)
+        __PYX_ERR(0, 100, __pyx_L1_error)
       }
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_GIVEREF(__pyx_t_4);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 99, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 100, __pyx_L1_error);
       __Pyx_GIVEREF(__pyx_t_3);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3)) __PYX_ERR(0, 99, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error);
       __pyx_t_4 = 0;
       __pyx_t_3 = 0;
-      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 99, __pyx_L1_error)
+      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 100, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":94
+    /* "pyart/map/ckdtree.pyx":95
  *                                      np.intp_t j) except -1:
  * 
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6486,7 +6486,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":102
+  /* "pyart/map/ckdtree.pyx":103
  *     else:
  *         # Other platforms
  *         if i < j:             # <<<<<<<<<<<<<<
@@ -6497,7 +6497,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
     __pyx_t_1 = (__pyx_v_i < __pyx_v_j);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":103
+      /* "pyart/map/ckdtree.pyx":104
  *         # Other platforms
  *         if i < j:
  *             results.add((i, j))             # <<<<<<<<<<<<<<
@@ -6506,24 +6506,24 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
  */
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-        __PYX_ERR(0, 103, __pyx_L1_error)
+        __PYX_ERR(0, 104, __pyx_L1_error)
       }
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 103, __pyx_L1_error)
+      __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 104, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_GIVEREF(__pyx_t_2);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error);
       __Pyx_GIVEREF(__pyx_t_3);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error);
       __pyx_t_2 = 0;
       __pyx_t_3 = 0;
-      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_4); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 103, __pyx_L1_error)
+      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_4); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 104, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-      /* "pyart/map/ckdtree.pyx":102
+      /* "pyart/map/ckdtree.pyx":103
  *     else:
  *         # Other platforms
  *         if i < j:             # <<<<<<<<<<<<<<
@@ -6533,7 +6533,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
       goto __pyx_L5;
     }
 
-    /* "pyart/map/ckdtree.pyx":105
+    /* "pyart/map/ckdtree.pyx":106
  *             results.add((i, j))
  *         else:
  *             results.add((j, i))             # <<<<<<<<<<<<<<
@@ -6543,28 +6543,28 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
     /*else*/ {
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add");
-        __PYX_ERR(0, 105, __pyx_L1_error)
+        __PYX_ERR(0, 106, __pyx_L1_error)
       }
-      __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 105, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 106, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
+      __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_GIVEREF(__pyx_t_4);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 105, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 106, __pyx_L1_error);
       __Pyx_GIVEREF(__pyx_t_3);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error);
       __pyx_t_4 = 0;
       __pyx_t_3 = 0;
-      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 105, __pyx_L1_error)
+      __pyx_t_5 = PySet_Add(__pyx_v_results, __pyx_t_2); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 106, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
     __pyx_L5:;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":106
+  /* "pyart/map/ckdtree.pyx":107
  *         else:
  *             results.add((j, i))
  *     return 0             # <<<<<<<<<<<<<<
@@ -6574,7 +6574,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":90
+  /* "pyart/map/ckdtree.pyx":91
  * 
  * 
  * cdef inline int set_add_ordered_pair(set results,             # <<<<<<<<<<<<<<
@@ -6594,7 +6594,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(PyObj
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":108
+/* "pyart/map/ckdtree.pyx":109
  *     return 0
  * 
  * cdef inline int list_append(list results, np.intp_t i) except -1:             # <<<<<<<<<<<<<<
@@ -6614,7 +6614,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("list_append", 1);
 
-  /* "pyart/map/ckdtree.pyx":109
+  /* "pyart/map/ckdtree.pyx":110
  * 
  * cdef inline int list_append(list results, np.intp_t i) except -1:
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6624,7 +6624,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
   __pyx_t_1 = ((sizeof(long)) < (sizeof(__pyx_t_5numpy_intp_t)));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":111
+    /* "pyart/map/ckdtree.pyx":112
  *     if sizeof(long) < sizeof(np.intp_t):
  *         # Win 64
  *         if i <= <np.intp_t>LONG_MAX:  # CHECK COMPARISON DIRECTION             # <<<<<<<<<<<<<<
@@ -6634,7 +6634,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
     __pyx_t_1 = (__pyx_v_i <= ((__pyx_t_5numpy_intp_t)LONG_MAX));
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":112
+      /* "pyart/map/ckdtree.pyx":113
  *         # Win 64
  *         if i <= <np.intp_t>LONG_MAX:  # CHECK COMPARISON DIRECTION
  *             results.append(int(i))             # <<<<<<<<<<<<<<
@@ -6643,17 +6643,17 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
  */
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "append");
-        __PYX_ERR(0, 112, __pyx_L1_error)
+        __PYX_ERR(0, 113, __pyx_L1_error)
       }
-      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 113, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 112, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 113, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "pyart/map/ckdtree.pyx":111
+      /* "pyart/map/ckdtree.pyx":112
  *     if sizeof(long) < sizeof(np.intp_t):
  *         # Win 64
  *         if i <= <np.intp_t>LONG_MAX:  # CHECK COMPARISON DIRECTION             # <<<<<<<<<<<<<<
@@ -6663,7 +6663,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":114
+    /* "pyart/map/ckdtree.pyx":115
  *             results.append(int(i))
  *         else:
  *             results.append(i)             # <<<<<<<<<<<<<<
@@ -6673,16 +6673,16 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
     /*else*/ {
       if (unlikely(__pyx_v_results == Py_None)) {
         PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "append");
-        __PYX_ERR(0, 114, __pyx_L1_error)
+        __PYX_ERR(0, 115, __pyx_L1_error)
       }
-      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 114, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 115, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":109
+    /* "pyart/map/ckdtree.pyx":110
  * 
  * cdef inline int list_append(list results, np.intp_t i) except -1:
  *     if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -6692,7 +6692,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":117
+  /* "pyart/map/ckdtree.pyx":118
  *     else:
  *         # Other platforms
  *         results.append(i)             # <<<<<<<<<<<<<<
@@ -6702,16 +6702,16 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
   /*else*/ {
     if (unlikely(__pyx_v_results == Py_None)) {
       PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "append");
-      __PYX_ERR(0, 117, __pyx_L1_error)
+      __PYX_ERR(0, 118, __pyx_L1_error)
     }
-    __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 117, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyList_Append(__pyx_v_results, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 118, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":118
+  /* "pyart/map/ckdtree.pyx":119
  *         # Other platforms
  *         results.append(i)
  *     return 0             # <<<<<<<<<<<<<<
@@ -6721,7 +6721,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":108
+  /* "pyart/map/ckdtree.pyx":109
  *     return 0
  * 
  * cdef inline int list_append(list results, np.intp_t i) except -1:             # <<<<<<<<<<<<<<
@@ -6740,7 +6740,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_list_append(PyObject *__py
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":137
+/* "pyart/map/ckdtree.pyx":138
  *     cdef np.intp_t space
  * 
  *     def __init__(heap self, np.intp_t initial_size):             # <<<<<<<<<<<<<<
@@ -6784,23 +6784,23 @@ static int __pyx_pw_5pyart_3map_7ckdtree_4heap_1__init__(PyObject *__pyx_v_self,
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 137, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 137, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 138, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
     } else {
       values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
     }
-    __pyx_v_initial_size = __Pyx_PyInt_As_npy_intp(values[0]); if (unlikely((__pyx_v_initial_size == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 137, __pyx_L3_error)
+    __pyx_v_initial_size = __Pyx_PyInt_As_npy_intp(values[0]); if (unlikely((__pyx_v_initial_size == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 137, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 138, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -6835,7 +6835,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":139
+  /* "pyart/map/ckdtree.pyx":140
  *     def __init__(heap self, np.intp_t initial_size):
  *         cdef void *tmp
  *         self.space = initial_size             # <<<<<<<<<<<<<<
@@ -6844,7 +6844,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   __pyx_v_self->space = __pyx_v_initial_size;
 
-  /* "pyart/map/ckdtree.pyx":140
+  /* "pyart/map/ckdtree.pyx":141
  *         cdef void *tmp
  *         self.space = initial_size
  *         self.heap = <heapitem*> NULL             # <<<<<<<<<<<<<<
@@ -6853,7 +6853,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   __pyx_v_self->heap = ((struct __pyx_t_5pyart_3map_7ckdtree_heapitem *)NULL);
 
-  /* "pyart/map/ckdtree.pyx":141
+  /* "pyart/map/ckdtree.pyx":142
  *         self.space = initial_size
  *         self.heap = <heapitem*> NULL
  *         tmp = stdlib.malloc(sizeof(heapitem)*self.space)             # <<<<<<<<<<<<<<
@@ -6862,7 +6862,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   __pyx_v_tmp = malloc(((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_heapitem)) * __pyx_v_self->space));
 
-  /* "pyart/map/ckdtree.pyx":142
+  /* "pyart/map/ckdtree.pyx":143
  *         self.heap = <heapitem*> NULL
  *         tmp = stdlib.malloc(sizeof(heapitem)*self.space)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -6872,16 +6872,16 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":143
+    /* "pyart/map/ckdtree.pyx":144
  *         tmp = stdlib.malloc(sizeof(heapitem)*self.space)
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.heap = <heapitem*> tmp
  *         self.n = 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 143, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 144, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":142
+    /* "pyart/map/ckdtree.pyx":143
  *         self.heap = <heapitem*> NULL
  *         tmp = stdlib.malloc(sizeof(heapitem)*self.space)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -6890,7 +6890,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":144
+  /* "pyart/map/ckdtree.pyx":145
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.heap = <heapitem*> tmp             # <<<<<<<<<<<<<<
@@ -6899,7 +6899,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   __pyx_v_self->heap = ((struct __pyx_t_5pyart_3map_7ckdtree_heapitem *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":145
+  /* "pyart/map/ckdtree.pyx":146
  *             raise MemoryError
  *         self.heap = <heapitem*> tmp
  *         self.n = 0             # <<<<<<<<<<<<<<
@@ -6908,7 +6908,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
  */
   __pyx_v_self->n = 0;
 
-  /* "pyart/map/ckdtree.pyx":137
+  /* "pyart/map/ckdtree.pyx":138
  *     cdef np.intp_t space
  * 
  *     def __init__(heap self, np.intp_t initial_size):             # <<<<<<<<<<<<<<
@@ -6926,7 +6926,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_4heap___init__(struct __pyx_obj_5pyart_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":147
+/* "pyart/map/ckdtree.pyx":148
  *         self.n = 0
  * 
  *     def __dealloc__(heap self):             # <<<<<<<<<<<<<<
@@ -6950,7 +6950,7 @@ static void __pyx_pw_5pyart_3map_7ckdtree_4heap_3__dealloc__(PyObject *__pyx_v_s
 static void __pyx_pf_5pyart_3map_7ckdtree_4heap_2__dealloc__(struct __pyx_obj_5pyart_3map_7ckdtree_heap *__pyx_v_self) {
   int __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":148
+  /* "pyart/map/ckdtree.pyx":149
  * 
  *     def __dealloc__(heap self):
  *         if self.heap != <heapitem*> NULL:             # <<<<<<<<<<<<<<
@@ -6960,7 +6960,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_4heap_2__dealloc__(struct __pyx_obj_5p
   __pyx_t_1 = (__pyx_v_self->heap != ((struct __pyx_t_5pyart_3map_7ckdtree_heapitem *)NULL));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":149
+    /* "pyart/map/ckdtree.pyx":150
  *     def __dealloc__(heap self):
  *         if self.heap != <heapitem*> NULL:
  *             stdlib.free(self.heap)             # <<<<<<<<<<<<<<
@@ -6969,7 +6969,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_4heap_2__dealloc__(struct __pyx_obj_5p
  */
     free(__pyx_v_self->heap);
 
-    /* "pyart/map/ckdtree.pyx":148
+    /* "pyart/map/ckdtree.pyx":149
  * 
  *     def __dealloc__(heap self):
  *         if self.heap != <heapitem*> NULL:             # <<<<<<<<<<<<<<
@@ -6978,7 +6978,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_4heap_2__dealloc__(struct __pyx_obj_5p
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":147
+  /* "pyart/map/ckdtree.pyx":148
  *         self.n = 0
  * 
  *     def __dealloc__(heap self):             # <<<<<<<<<<<<<<
@@ -6989,7 +6989,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_4heap_2__dealloc__(struct __pyx_obj_5p
   /* function exit code */
 }
 
-/* "pyart/map/ckdtree.pyx":151
+/* "pyart/map/ckdtree.pyx":152
  *             stdlib.free(self.heap)
  * 
  *     cdef inline int _resize(heap self, np.intp_t new_space) except -1:             # <<<<<<<<<<<<<<
@@ -7012,7 +7012,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_resize", 1);
 
-  /* "pyart/map/ckdtree.pyx":153
+  /* "pyart/map/ckdtree.pyx":154
  *     cdef inline int _resize(heap self, np.intp_t new_space) except -1:
  *         cdef void *tmp
  *         if new_space < self.n:             # <<<<<<<<<<<<<<
@@ -7022,14 +7022,14 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
   __pyx_t_1 = (__pyx_v_new_space < __pyx_v_self->n);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":154
+    /* "pyart/map/ckdtree.pyx":155
  *         cdef void *tmp
  *         if new_space < self.n:
  *             raise ValueError("Heap containing %d items cannot be resized to %d" % (int(self.n), int(new_space)))             # <<<<<<<<<<<<<<
  *         self.space = new_space
  *         tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))
  */
-    __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = 0;
     __pyx_t_4 = 127;
@@ -7037,12 +7037,12 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
     __pyx_t_3 += 16;
     __Pyx_GIVEREF(__pyx_kp_u_Heap_containing);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_u_Heap_containing);
-    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __pyx_t_5 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_6), __pyx_n_u_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_6), __pyx_n_u_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __pyx_t_4 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_5) > __pyx_t_4) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_5) : __pyx_t_4;
@@ -7054,12 +7054,12 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
     __pyx_t_3 += 28;
     __Pyx_GIVEREF(__pyx_kp_u_items_cannot_be_resized_to);
     PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_kp_u_items_cannot_be_resized_to);
-    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_new_space); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_new_space); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __pyx_t_5 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_6), __pyx_n_u_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_6), __pyx_n_u_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __pyx_t_4 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_5) > __pyx_t_4) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_5) : __pyx_t_4;
@@ -7067,17 +7067,17 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
     __Pyx_GIVEREF(__pyx_t_5);
     PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_t_5);
     __pyx_t_5 = 0;
-    __pyx_t_5 = __Pyx_PyUnicode_Join(__pyx_t_2, 4, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyUnicode_Join(__pyx_t_2, 4, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 154, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 155, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 154, __pyx_L1_error)
+    __PYX_ERR(0, 155, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":153
+    /* "pyart/map/ckdtree.pyx":154
  *     cdef inline int _resize(heap self, np.intp_t new_space) except -1:
  *         cdef void *tmp
  *         if new_space < self.n:             # <<<<<<<<<<<<<<
@@ -7086,7 +7086,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":155
+  /* "pyart/map/ckdtree.pyx":156
  *         if new_space < self.n:
  *             raise ValueError("Heap containing %d items cannot be resized to %d" % (int(self.n), int(new_space)))
  *         self.space = new_space             # <<<<<<<<<<<<<<
@@ -7095,7 +7095,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
  */
   __pyx_v_self->space = __pyx_v_new_space;
 
-  /* "pyart/map/ckdtree.pyx":156
+  /* "pyart/map/ckdtree.pyx":157
  *             raise ValueError("Heap containing %d items cannot be resized to %d" % (int(self.n), int(new_space)))
  *         self.space = new_space
  *         tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))             # <<<<<<<<<<<<<<
@@ -7104,7 +7104,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
  */
   __pyx_v_tmp = realloc(((void *)__pyx_v_self->heap), (__pyx_v_new_space * (sizeof(struct __pyx_t_5pyart_3map_7ckdtree_heapitem))));
 
-  /* "pyart/map/ckdtree.pyx":157
+  /* "pyart/map/ckdtree.pyx":158
  *         self.space = new_space
  *         tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -7114,16 +7114,16 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":158
+    /* "pyart/map/ckdtree.pyx":159
  *         tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.heap = <heapitem*> tmp
  *         return 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 158, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 159, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":157
+    /* "pyart/map/ckdtree.pyx":158
  *         self.space = new_space
  *         tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -7132,7 +7132,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":159
+  /* "pyart/map/ckdtree.pyx":160
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.heap = <heapitem*> tmp             # <<<<<<<<<<<<<<
@@ -7141,7 +7141,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
  */
   __pyx_v_self->heap = ((struct __pyx_t_5pyart_3map_7ckdtree_heapitem *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":160
+  /* "pyart/map/ckdtree.pyx":161
  *             raise MemoryError
  *         self.heap = <heapitem*> tmp
  *         return 0             # <<<<<<<<<<<<<<
@@ -7151,7 +7151,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":151
+  /* "pyart/map/ckdtree.pyx":152
  *             stdlib.free(self.heap)
  * 
  *     cdef inline int _resize(heap self, np.intp_t new_space) except -1:             # <<<<<<<<<<<<<<
@@ -7171,7 +7171,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap__resize(struct __pyx
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":163
+/* "pyart/map/ckdtree.pyx":164
  * 
  *     @cython.cdivision(True)
  *     cdef inline int push(heap self, heapitem item) except -1:             # <<<<<<<<<<<<<<
@@ -7190,7 +7190,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":167
+  /* "pyart/map/ckdtree.pyx":168
  *         cdef heapitem t
  * 
  *         self.n += 1             # <<<<<<<<<<<<<<
@@ -7199,7 +7199,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
   __pyx_v_self->n = (__pyx_v_self->n + 1);
 
-  /* "pyart/map/ckdtree.pyx":168
+  /* "pyart/map/ckdtree.pyx":169
  * 
  *         self.n += 1
  *         if self.n > self.space:             # <<<<<<<<<<<<<<
@@ -7209,16 +7209,16 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
   __pyx_t_1 = (__pyx_v_self->n > __pyx_v_self->space);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":169
+    /* "pyart/map/ckdtree.pyx":170
  *         self.n += 1
  *         if self.n > self.space:
  *             self._resize(2 * self.space + 1)             # <<<<<<<<<<<<<<
  * 
  *         i = self.n - 1
  */
-    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_4heap__resize(__pyx_v_self, ((2 * __pyx_v_self->space) + 1)); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 169, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_4heap__resize(__pyx_v_self, ((2 * __pyx_v_self->space) + 1)); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 170, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":168
+    /* "pyart/map/ckdtree.pyx":169
  * 
  *         self.n += 1
  *         if self.n > self.space:             # <<<<<<<<<<<<<<
@@ -7227,7 +7227,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":171
+  /* "pyart/map/ckdtree.pyx":172
  *             self._resize(2 * self.space + 1)
  * 
  *         i = self.n - 1             # <<<<<<<<<<<<<<
@@ -7236,7 +7236,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
   __pyx_v_i = (__pyx_v_self->n - 1);
 
-  /* "pyart/map/ckdtree.pyx":172
+  /* "pyart/map/ckdtree.pyx":173
  * 
  *         i = self.n - 1
  *         self.heap[i] = item             # <<<<<<<<<<<<<<
@@ -7245,7 +7245,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
   (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_item;
 
-  /* "pyart/map/ckdtree.pyx":174
+  /* "pyart/map/ckdtree.pyx":175
  *         self.heap[i] = item
  * 
  *         while i > 0 and self.heap[i].priority < self.heap[(i - 1) // 2].priority:             # <<<<<<<<<<<<<<
@@ -7264,7 +7264,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
     __pyx_L6_bool_binop_done:;
     if (!__pyx_t_1) break;
 
-    /* "pyart/map/ckdtree.pyx":175
+    /* "pyart/map/ckdtree.pyx":176
  * 
  *         while i > 0 and self.heap[i].priority < self.heap[(i - 1) // 2].priority:
  *             t = self.heap[(i - 1) // 2]             # <<<<<<<<<<<<<<
@@ -7273,7 +7273,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
     __pyx_v_t = (__pyx_v_self->heap[((__pyx_v_i - 1) / 2)]);
 
-    /* "pyart/map/ckdtree.pyx":176
+    /* "pyart/map/ckdtree.pyx":177
  *         while i > 0 and self.heap[i].priority < self.heap[(i - 1) // 2].priority:
  *             t = self.heap[(i - 1) // 2]
  *             self.heap[(i - 1) // 2] = self.heap[i]             # <<<<<<<<<<<<<<
@@ -7282,7 +7282,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
     (__pyx_v_self->heap[((__pyx_v_i - 1) / 2)]) = (__pyx_v_self->heap[__pyx_v_i]);
 
-    /* "pyart/map/ckdtree.pyx":177
+    /* "pyart/map/ckdtree.pyx":178
  *             t = self.heap[(i - 1) // 2]
  *             self.heap[(i - 1) // 2] = self.heap[i]
  *             self.heap[i] = t             # <<<<<<<<<<<<<<
@@ -7291,7 +7291,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
  */
     (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_t;
 
-    /* "pyart/map/ckdtree.pyx":178
+    /* "pyart/map/ckdtree.pyx":179
  *             self.heap[(i - 1) // 2] = self.heap[i]
  *             self.heap[i] = t
  *             i = (i - 1) // 2             # <<<<<<<<<<<<<<
@@ -7301,7 +7301,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
     __pyx_v_i = ((__pyx_v_i - 1) / 2);
   }
 
-  /* "pyart/map/ckdtree.pyx":179
+  /* "pyart/map/ckdtree.pyx":180
  *             self.heap[i] = t
  *             i = (i - 1) // 2
  *         return 0             # <<<<<<<<<<<<<<
@@ -7311,7 +7311,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":163
+  /* "pyart/map/ckdtree.pyx":164
  * 
  *     @cython.cdivision(True)
  *     cdef inline int push(heap self, heapitem item) except -1:             # <<<<<<<<<<<<<<
@@ -7327,7 +7327,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":182
+/* "pyart/map/ckdtree.pyx":183
  * 
  * 
  *     cdef heapitem peek(heap self):             # <<<<<<<<<<<<<<
@@ -7338,7 +7338,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_4heap_push(struct __pyx_ob
 static struct __pyx_t_5pyart_3map_7ckdtree_heapitem __pyx_f_5pyart_3map_7ckdtree_4heap_peek(struct __pyx_obj_5pyart_3map_7ckdtree_heap *__pyx_v_self) {
   struct __pyx_t_5pyart_3map_7ckdtree_heapitem __pyx_r;
 
-  /* "pyart/map/ckdtree.pyx":183
+  /* "pyart/map/ckdtree.pyx":184
  * 
  *     cdef heapitem peek(heap self):
  *         return self.heap[0]             # <<<<<<<<<<<<<<
@@ -7348,7 +7348,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_heapitem __pyx_f_5pyart_3map_7ckdtree
   __pyx_r = (__pyx_v_self->heap[0]);
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":182
+  /* "pyart/map/ckdtree.pyx":183
  * 
  * 
  *     cdef heapitem peek(heap self):             # <<<<<<<<<<<<<<
@@ -7361,7 +7361,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_heapitem __pyx_f_5pyart_3map_7ckdtree
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":187
+/* "pyart/map/ckdtree.pyx":188
  * 
  *     @cython.cdivision(True)
  *     cdef int remove(heap self) except -1:             # <<<<<<<<<<<<<<
@@ -7379,7 +7379,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
   int __pyx_t_1;
   int __pyx_t_2;
 
-  /* "pyart/map/ckdtree.pyx":191
+  /* "pyart/map/ckdtree.pyx":192
  *         cdef np.intp_t i, j, k, l
  * 
  *         self.heap[0] = self.heap[self.n-1]             # <<<<<<<<<<<<<<
@@ -7388,7 +7388,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   (__pyx_v_self->heap[0]) = (__pyx_v_self->heap[(__pyx_v_self->n - 1)]);
 
-  /* "pyart/map/ckdtree.pyx":192
+  /* "pyart/map/ckdtree.pyx":193
  * 
  *         self.heap[0] = self.heap[self.n-1]
  *         self.n -= 1             # <<<<<<<<<<<<<<
@@ -7397,7 +7397,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   __pyx_v_self->n = (__pyx_v_self->n - 1);
 
-  /* "pyart/map/ckdtree.pyx":197
+  /* "pyart/map/ckdtree.pyx":198
  *         #if self.n < self.space//4 and self.space>40: #FIXME: magic number
  *         #    self._resize(self.space // 2 + 1)
  *         i=0             # <<<<<<<<<<<<<<
@@ -7406,7 +7406,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   __pyx_v_i = 0;
 
-  /* "pyart/map/ckdtree.pyx":198
+  /* "pyart/map/ckdtree.pyx":199
  *         #    self._resize(self.space // 2 + 1)
  *         i=0
  *         j=1             # <<<<<<<<<<<<<<
@@ -7415,7 +7415,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   __pyx_v_j = 1;
 
-  /* "pyart/map/ckdtree.pyx":199
+  /* "pyart/map/ckdtree.pyx":200
  *         i=0
  *         j=1
  *         k=2             # <<<<<<<<<<<<<<
@@ -7424,7 +7424,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   __pyx_v_k = 2;
 
-  /* "pyart/map/ckdtree.pyx":200
+  /* "pyart/map/ckdtree.pyx":201
  *         j=1
  *         k=2
  *         while ((j<self.n and             # <<<<<<<<<<<<<<
@@ -7433,7 +7433,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
   while (1) {
 
-    /* "pyart/map/ckdtree.pyx":201
+    /* "pyart/map/ckdtree.pyx":202
  *         k=2
  *         while ((j<self.n and
  *                     self.heap[i].priority > self.heap[j].priority or             # <<<<<<<<<<<<<<
@@ -7453,7 +7453,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
     }
     __pyx_L6_next_or:;
 
-    /* "pyart/map/ckdtree.pyx":202
+    /* "pyart/map/ckdtree.pyx":203
  *         while ((j<self.n and
  *                     self.heap[i].priority > self.heap[j].priority or
  *                 k<self.n and             # <<<<<<<<<<<<<<
@@ -7467,7 +7467,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
       goto __pyx_L5_bool_binop_done;
     }
 
-    /* "pyart/map/ckdtree.pyx":203
+    /* "pyart/map/ckdtree.pyx":204
  *                     self.heap[i].priority > self.heap[j].priority or
  *                 k<self.n and
  *                     self.heap[i].priority > self.heap[k].priority)):             # <<<<<<<<<<<<<<
@@ -7479,7 +7479,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
     __pyx_L5_bool_binop_done:;
     if (!__pyx_t_1) break;
 
-    /* "pyart/map/ckdtree.pyx":204
+    /* "pyart/map/ckdtree.pyx":205
  *                 k<self.n and
  *                     self.heap[i].priority > self.heap[k].priority)):
  *             if k<self.n and self.heap[j].priority>self.heap[k].priority:             # <<<<<<<<<<<<<<
@@ -7497,7 +7497,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
     __pyx_L10_bool_binop_done:;
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":205
+      /* "pyart/map/ckdtree.pyx":206
  *                     self.heap[i].priority > self.heap[k].priority)):
  *             if k<self.n and self.heap[j].priority>self.heap[k].priority:
  *                 l = k             # <<<<<<<<<<<<<<
@@ -7506,7 +7506,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
       __pyx_v_l = __pyx_v_k;
 
-      /* "pyart/map/ckdtree.pyx":204
+      /* "pyart/map/ckdtree.pyx":205
  *                 k<self.n and
  *                     self.heap[i].priority > self.heap[k].priority)):
  *             if k<self.n and self.heap[j].priority>self.heap[k].priority:             # <<<<<<<<<<<<<<
@@ -7516,7 +7516,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
       goto __pyx_L9;
     }
 
-    /* "pyart/map/ckdtree.pyx":207
+    /* "pyart/map/ckdtree.pyx":208
  *                 l = k
  *             else:
  *                 l = j             # <<<<<<<<<<<<<<
@@ -7528,7 +7528,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
     }
     __pyx_L9:;
 
-    /* "pyart/map/ckdtree.pyx":208
+    /* "pyart/map/ckdtree.pyx":209
  *             else:
  *                 l = j
  *             t = self.heap[l]             # <<<<<<<<<<<<<<
@@ -7537,7 +7537,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
     __pyx_v_t = (__pyx_v_self->heap[__pyx_v_l]);
 
-    /* "pyart/map/ckdtree.pyx":209
+    /* "pyart/map/ckdtree.pyx":210
  *                 l = j
  *             t = self.heap[l]
  *             self.heap[l] = self.heap[i]             # <<<<<<<<<<<<<<
@@ -7546,7 +7546,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
     (__pyx_v_self->heap[__pyx_v_l]) = (__pyx_v_self->heap[__pyx_v_i]);
 
-    /* "pyart/map/ckdtree.pyx":210
+    /* "pyart/map/ckdtree.pyx":211
  *             t = self.heap[l]
  *             self.heap[l] = self.heap[i]
  *             self.heap[i] = t             # <<<<<<<<<<<<<<
@@ -7555,7 +7555,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
     (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_t;
 
-    /* "pyart/map/ckdtree.pyx":211
+    /* "pyart/map/ckdtree.pyx":212
  *             self.heap[l] = self.heap[i]
  *             self.heap[i] = t
  *             i = l             # <<<<<<<<<<<<<<
@@ -7564,7 +7564,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
     __pyx_v_i = __pyx_v_l;
 
-    /* "pyart/map/ckdtree.pyx":212
+    /* "pyart/map/ckdtree.pyx":213
  *             self.heap[i] = t
  *             i = l
  *             j = 2*i+1             # <<<<<<<<<<<<<<
@@ -7573,7 +7573,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
  */
     __pyx_v_j = ((2 * __pyx_v_i) + 1);
 
-    /* "pyart/map/ckdtree.pyx":213
+    /* "pyart/map/ckdtree.pyx":214
  *             i = l
  *             j = 2*i+1
  *             k = 2*i+2             # <<<<<<<<<<<<<<
@@ -7583,7 +7583,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
     __pyx_v_k = ((2 * __pyx_v_i) + 2);
   }
 
-  /* "pyart/map/ckdtree.pyx":214
+  /* "pyart/map/ckdtree.pyx":215
  *             j = 2*i+1
  *             k = 2*i+2
  *         return 0             # <<<<<<<<<<<<<<
@@ -7593,7 +7593,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":187
+  /* "pyart/map/ckdtree.pyx":188
  * 
  *     @cython.cdivision(True)
  *     cdef int remove(heap self) except -1:             # <<<<<<<<<<<<<<
@@ -7606,7 +7606,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_remove(struct __pyx_obj_5pyart_3ma
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":216
+/* "pyart/map/ckdtree.pyx":217
  *         return 0
  * 
  *     cdef int pop(heap self, heapitem *it) except -1:             # <<<<<<<<<<<<<<
@@ -7622,26 +7622,26 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_pop(struct __pyx_obj_5pyart_3map_7
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":217
+  /* "pyart/map/ckdtree.pyx":218
  * 
  *     cdef int pop(heap self, heapitem *it) except -1:
  *         it[0] = self.peek()             # <<<<<<<<<<<<<<
  *         self.remove()
  *         return 0
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_self->__pyx_vtab)->peek(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 217, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_self->__pyx_vtab)->peek(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 218, __pyx_L1_error)
   (__pyx_v_it[0]) = __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":218
+  /* "pyart/map/ckdtree.pyx":219
  *     cdef int pop(heap self, heapitem *it) except -1:
  *         it[0] = self.peek()
  *         self.remove()             # <<<<<<<<<<<<<<
  *         return 0
  * 
  */
-  __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_self->__pyx_vtab)->remove(__pyx_v_self); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 218, __pyx_L1_error)
+  __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_self->__pyx_vtab)->remove(__pyx_v_self); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 219, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":219
+  /* "pyart/map/ckdtree.pyx":220
  *         it[0] = self.peek()
  *         self.remove()
  *         return 0             # <<<<<<<<<<<<<<
@@ -7651,7 +7651,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_4heap_pop(struct __pyx_obj_5pyart_3map_7
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":216
+  /* "pyart/map/ckdtree.pyx":217
  *         return 0
  * 
  *     cdef int pop(heap self, heapitem *it) except -1:             # <<<<<<<<<<<<<<
@@ -7881,7 +7881,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_4heap_6__setstate_cython__(CYTHON
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":224
+/* "pyart/map/ckdtree.pyx":225
  * # Utility functions
  * # =================
  * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):             # <<<<<<<<<<<<<<
@@ -7893,7 +7893,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
   __pyx_t_5numpy_float64_t __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":225
+  /* "pyart/map/ckdtree.pyx":226
  * # =================
  * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):
  *     if x>y:             # <<<<<<<<<<<<<<
@@ -7903,7 +7903,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
   __pyx_t_1 = (__pyx_v_x > __pyx_v_y);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":226
+    /* "pyart/map/ckdtree.pyx":227
  * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):
  *     if x>y:
  *         return x             # <<<<<<<<<<<<<<
@@ -7913,7 +7913,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
     __pyx_r = __pyx_v_x;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":225
+    /* "pyart/map/ckdtree.pyx":226
  * # =================
  * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):
  *     if x>y:             # <<<<<<<<<<<<<<
@@ -7922,7 +7922,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":228
+  /* "pyart/map/ckdtree.pyx":229
  *         return x
  *     else:
  *         return y             # <<<<<<<<<<<<<<
@@ -7934,7 +7934,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
     goto __pyx_L0;
   }
 
-  /* "pyart/map/ckdtree.pyx":224
+  /* "pyart/map/ckdtree.pyx":225
  * # Utility functions
  * # =================
  * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):             # <<<<<<<<<<<<<<
@@ -7947,7 +7947,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dmax(
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":230
+/* "pyart/map/ckdtree.pyx":231
  *         return y
  * 
  * cdef inline np.float64_t dabs(np.float64_t x):             # <<<<<<<<<<<<<<
@@ -7959,7 +7959,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
   __pyx_t_5numpy_float64_t __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":231
+  /* "pyart/map/ckdtree.pyx":232
  * 
  * cdef inline np.float64_t dabs(np.float64_t x):
  *     if x>0:             # <<<<<<<<<<<<<<
@@ -7969,7 +7969,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
   __pyx_t_1 = (__pyx_v_x > 0.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":232
+    /* "pyart/map/ckdtree.pyx":233
  * cdef inline np.float64_t dabs(np.float64_t x):
  *     if x>0:
  *         return x             # <<<<<<<<<<<<<<
@@ -7979,7 +7979,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
     __pyx_r = __pyx_v_x;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":231
+    /* "pyart/map/ckdtree.pyx":232
  * 
  * cdef inline np.float64_t dabs(np.float64_t x):
  *     if x>0:             # <<<<<<<<<<<<<<
@@ -7988,7 +7988,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":234
+  /* "pyart/map/ckdtree.pyx":235
  *         return x
  *     else:
  *         return -x             # <<<<<<<<<<<<<<
@@ -8000,7 +8000,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
     goto __pyx_L0;
   }
 
-  /* "pyart/map/ckdtree.pyx":230
+  /* "pyart/map/ckdtree.pyx":231
  *         return y
  * 
  * cdef inline np.float64_t dabs(np.float64_t x):             # <<<<<<<<<<<<<<
@@ -8013,7 +8013,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_dabs(
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":246
+/* "pyart/map/ckdtree.pyx":247
  *         np.float64_t *v_data
  * 
  *     def __init__(self):             # <<<<<<<<<<<<<<
@@ -8058,7 +8058,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/ckdtree.pyx":247
+  /* "pyart/map/ckdtree.pyx":248
  * 
  *     def __init__(self):
  *         self.n = 0             # <<<<<<<<<<<<<<
@@ -8067,7 +8067,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
  */
   __pyx_v_self->n = 0;
 
-  /* "pyart/map/ckdtree.pyx":248
+  /* "pyart/map/ckdtree.pyx":249
  *     def __init__(self):
  *         self.n = 0
  *         self.n_max = 10             # <<<<<<<<<<<<<<
@@ -8076,127 +8076,127 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
  */
   __pyx_v_self->n_max = 10;
 
-  /* "pyart/map/ckdtree.pyx":249
+  /* "pyart/map/ckdtree.pyx":250
  *         self.n = 0
  *         self.n_max = 10
  *         self.i = np.empty(self.n_max, dtype=np.intp)             # <<<<<<<<<<<<<<
  *         self.j = np.empty(self.n_max, dtype=np.intp)
  *         self.v = np.empty(self.n_max, dtype=np.float64)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error);
   __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_intp); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_intp); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 249, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 249, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 249, __pyx_L1_error)
+  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 250, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_5);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->i);
   __Pyx_DECREF((PyObject *)__pyx_v_self->i);
   __pyx_v_self->i = ((PyArrayObject *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":250
+  /* "pyart/map/ckdtree.pyx":251
  *         self.n_max = 10
  *         self.i = np.empty(self.n_max, dtype=np.intp)
  *         self.j = np.empty(self.n_max, dtype=np.intp)             # <<<<<<<<<<<<<<
  *         self.v = np.empty(self.n_max, dtype=np.float64)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error);
   __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_intp); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_intp); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 250, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 250, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 250, __pyx_L1_error)
+  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 251, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_4);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->j);
   __Pyx_DECREF((PyObject *)__pyx_v_self->j);
   __pyx_v_self->j = ((PyArrayObject *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":251
+  /* "pyart/map/ckdtree.pyx":252
  *         self.i = np.empty(self.n_max, dtype=np.intp)
  *         self.j = np.empty(self.n_max, dtype=np.intp)
  *         self.v = np.empty(self.n_max, dtype=np.float64)             # <<<<<<<<<<<<<<
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 252, __pyx_L1_error);
   __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 251, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 251, __pyx_L1_error)
+  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 252, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->v);
   __Pyx_DECREF((PyObject *)__pyx_v_self->v);
   __pyx_v_self->v = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":252
+  /* "pyart/map/ckdtree.pyx":253
  *         self.j = np.empty(self.n_max, dtype=np.intp)
  *         self.v = np.empty(self.n_max, dtype=np.float64)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)             # <<<<<<<<<<<<<<
@@ -8208,7 +8208,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
   __pyx_v_self->i_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":253
+  /* "pyart/map/ckdtree.pyx":254
  *         self.v = np.empty(self.n_max, dtype=np.float64)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)             # <<<<<<<<<<<<<<
@@ -8220,7 +8220,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
   __pyx_v_self->j_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":254
+  /* "pyart/map/ckdtree.pyx":255
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)             # <<<<<<<<<<<<<<
@@ -8232,7 +8232,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
   __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":246
+  /* "pyart/map/ckdtree.pyx":247
  *         np.float64_t *v_data
  * 
  *     def __init__(self):             # <<<<<<<<<<<<<<
@@ -8256,7 +8256,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_11coo_entries___init__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":256
+/* "pyart/map/ckdtree.pyx":257
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  * 
  *     cdef void add(coo_entries self, np.intp_t i, np.intp_t j, np.float64_t v):             # <<<<<<<<<<<<<<
@@ -8279,7 +8279,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("add", 1);
 
-  /* "pyart/map/ckdtree.pyx":258
+  /* "pyart/map/ckdtree.pyx":259
  *     cdef void add(coo_entries self, np.intp_t i, np.intp_t j, np.float64_t v):
  *         cdef np.intp_t k
  *         if self.n == self.n_max:             # <<<<<<<<<<<<<<
@@ -8289,7 +8289,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
   __pyx_t_1 = (__pyx_v_self->n == __pyx_v_self->n_max);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":259
+    /* "pyart/map/ckdtree.pyx":260
  *         cdef np.intp_t k
  *         if self.n == self.n_max:
  *             self.n_max *= 2             # <<<<<<<<<<<<<<
@@ -8298,16 +8298,16 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
     __pyx_v_self->n_max = (__pyx_v_self->n_max * 2);
 
-    /* "pyart/map/ckdtree.pyx":260
+    /* "pyart/map/ckdtree.pyx":261
  *         if self.n == self.n_max:
  *             self.n_max *= 2
  *             self.i.resize(self.n_max)             # <<<<<<<<<<<<<<
  *             self.j.resize(self.n_max)
  *             self.v.resize(self.n_max)
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->i), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 260, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->i), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 261, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 260, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 261, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = NULL;
     __pyx_t_6 = 0;
@@ -8328,22 +8328,22 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
       __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 260, __pyx_L1_error)
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 261, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":261
+    /* "pyart/map/ckdtree.pyx":262
  *             self.n_max *= 2
  *             self.i.resize(self.n_max)
  *             self.j.resize(self.n_max)             # <<<<<<<<<<<<<<
  *             self.v.resize(self.n_max)
  *             self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->j), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 261, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->j), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 262, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 261, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 262, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = NULL;
     __pyx_t_6 = 0;
@@ -8364,22 +8364,22 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
       __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 261, __pyx_L1_error)
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 262, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":262
+    /* "pyart/map/ckdtree.pyx":263
  *             self.i.resize(self.n_max)
  *             self.j.resize(self.n_max)
  *             self.v.resize(self.n_max)             # <<<<<<<<<<<<<<
  *             self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *             self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->v), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 262, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->v), __pyx_n_s_resize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 263, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 262, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 263, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = NULL;
     __pyx_t_6 = 0;
@@ -8400,13 +8400,13 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
       __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 262, __pyx_L1_error)
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 263, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":263
+    /* "pyart/map/ckdtree.pyx":264
  *             self.j.resize(self.n_max)
  *             self.v.resize(self.n_max)
  *             self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)             # <<<<<<<<<<<<<<
@@ -8418,7 +8418,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
     __pyx_v_self->i_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":264
+    /* "pyart/map/ckdtree.pyx":265
  *             self.v.resize(self.n_max)
  *             self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *             self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)             # <<<<<<<<<<<<<<
@@ -8430,7 +8430,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
     __pyx_v_self->j_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":265
+    /* "pyart/map/ckdtree.pyx":266
  *             self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *             self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  *             self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)             # <<<<<<<<<<<<<<
@@ -8442,7 +8442,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
     __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":258
+    /* "pyart/map/ckdtree.pyx":259
  *     cdef void add(coo_entries self, np.intp_t i, np.intp_t j, np.float64_t v):
  *         cdef np.intp_t k
  *         if self.n == self.n_max:             # <<<<<<<<<<<<<<
@@ -8451,7 +8451,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":266
+  /* "pyart/map/ckdtree.pyx":267
  *             self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  *             self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  *         k = self.n             # <<<<<<<<<<<<<<
@@ -8461,7 +8461,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
   __pyx_t_7 = __pyx_v_self->n;
   __pyx_v_k = __pyx_t_7;
 
-  /* "pyart/map/ckdtree.pyx":267
+  /* "pyart/map/ckdtree.pyx":268
  *             self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  *         k = self.n
  *         self.i_data[k] = i             # <<<<<<<<<<<<<<
@@ -8470,7 +8470,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
   (__pyx_v_self->i_data[__pyx_v_k]) = __pyx_v_i;
 
-  /* "pyart/map/ckdtree.pyx":268
+  /* "pyart/map/ckdtree.pyx":269
  *         k = self.n
  *         self.i_data[k] = i
  *         self.j_data[k] = j             # <<<<<<<<<<<<<<
@@ -8479,7 +8479,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
   (__pyx_v_self->j_data[__pyx_v_k]) = __pyx_v_j;
 
-  /* "pyart/map/ckdtree.pyx":269
+  /* "pyart/map/ckdtree.pyx":270
  *         self.i_data[k] = i
  *         self.j_data[k] = j
  *         self.v_data[k] = v             # <<<<<<<<<<<<<<
@@ -8488,7 +8488,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
   (__pyx_v_self->v_data[__pyx_v_k]) = __pyx_v_v;
 
-  /* "pyart/map/ckdtree.pyx":270
+  /* "pyart/map/ckdtree.pyx":271
  *         self.j_data[k] = j
  *         self.v_data[k] = v
  *         self.n += 1             # <<<<<<<<<<<<<<
@@ -8497,7 +8497,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
  */
   __pyx_v_self->n = (__pyx_v_self->n + 1);
 
-  /* "pyart/map/ckdtree.pyx":256
+  /* "pyart/map/ckdtree.pyx":257
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  * 
  *     cdef void add(coo_entries self, np.intp_t i, np.intp_t j, np.float64_t v):             # <<<<<<<<<<<<<<
@@ -8517,7 +8517,7 @@ static void __pyx_f_5pyart_3map_7ckdtree_11coo_entries_add(struct __pyx_obj_5pya
   __Pyx_RefNannyFinishContext();
 }
 
-/* "pyart/map/ckdtree.pyx":272
+/* "pyart/map/ckdtree.pyx":273
  *         self.n += 1
  * 
  *     def to_matrix(coo_entries self, shape=None):             # <<<<<<<<<<<<<<
@@ -8578,12 +8578,12 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_shape);
           if (value) { values[0] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 272, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 273, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "to_matrix") < 0)) __PYX_ERR(0, 272, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "to_matrix") < 0)) __PYX_ERR(0, 273, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -8597,7 +8597,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("to_matrix", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 272, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("to_matrix", 0, 0, 1, __pyx_nargs); __PYX_ERR(0, 273, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -8638,16 +8638,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("to_matrix", 1);
 
-  /* "pyart/map/ckdtree.pyx":274
+  /* "pyart/map/ckdtree.pyx":275
  *     def to_matrix(coo_entries self, shape=None):
  *         # Shrink arrays to size
  *         self.i.resize(self.n)             # <<<<<<<<<<<<<<
  *         self.j.resize(self.n)
  *         self.v.resize(self.n)
  */
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->i), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 274, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->i), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 275, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 274, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 275, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_t_4 = NULL;
   __pyx_t_5 = 0;
@@ -8668,22 +8668,22 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 274, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 275, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":275
+  /* "pyart/map/ckdtree.pyx":276
  *         # Shrink arrays to size
  *         self.i.resize(self.n)
  *         self.j.resize(self.n)             # <<<<<<<<<<<<<<
  *         self.v.resize(self.n)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  */
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->j), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 275, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->j), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 276, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 275, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 276, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_t_4 = NULL;
   __pyx_t_5 = 0;
@@ -8704,22 +8704,22 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 275, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 276, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":276
+  /* "pyart/map/ckdtree.pyx":277
  *         self.i.resize(self.n)
  *         self.j.resize(self.n)
  *         self.v.resize(self.n)             # <<<<<<<<<<<<<<
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  */
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->v), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 276, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self->v), __pyx_n_s_resize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 277, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 276, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 277, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_t_4 = NULL;
   __pyx_t_5 = 0;
@@ -8740,13 +8740,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 276, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 277, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":277
+  /* "pyart/map/ckdtree.pyx":278
  *         self.j.resize(self.n)
  *         self.v.resize(self.n)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)             # <<<<<<<<<<<<<<
@@ -8758,7 +8758,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   __pyx_v_self->i_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":278
+  /* "pyart/map/ckdtree.pyx":279
  *         self.v.resize(self.n)
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)             # <<<<<<<<<<<<<<
@@ -8770,7 +8770,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   __pyx_v_self->j_data = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":279
+  /* "pyart/map/ckdtree.pyx":280
  *         self.i_data = <np.intp_t *>np.PyArray_DATA(self.i)
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)             # <<<<<<<<<<<<<<
@@ -8782,7 +8782,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":280
+  /* "pyart/map/ckdtree.pyx":281
  *         self.j_data = <np.intp_t *>np.PyArray_DATA(self.j)
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  *         self.n_max = self.n             # <<<<<<<<<<<<<<
@@ -8792,7 +8792,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   __pyx_t_6 = __pyx_v_self->n;
   __pyx_v_self->n_max = __pyx_t_6;
 
-  /* "pyart/map/ckdtree.pyx":281
+  /* "pyart/map/ckdtree.pyx":282
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  *         self.n_max = self.n
  *         return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),             # <<<<<<<<<<<<<<
@@ -8800,55 +8800,55 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
  * 
  */
   __Pyx_XDECREF(__pyx_r);
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_scipy); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_scipy); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_sparse); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_sparse); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_coo_matrix); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_coo_matrix); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_self->i);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->i);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->i))) __PYX_ERR(0, 281, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->i))) __PYX_ERR(0, 282, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->j);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->j);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->j))) __PYX_ERR(0, 281, __pyx_L1_error);
-  __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 281, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->j))) __PYX_ERR(0, 282, __pyx_L1_error);
+  __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_INCREF((PyObject *)__pyx_v_self->v);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->v);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_self->v))) __PYX_ERR(0, 281, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_self->v))) __PYX_ERR(0, 282, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2)) __PYX_ERR(0, 281, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2)) __PYX_ERR(0, 282, __pyx_L1_error);
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 281, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 282, __pyx_L1_error);
   __pyx_t_3 = 0;
 
-  /* "pyart/map/ckdtree.pyx":282
+  /* "pyart/map/ckdtree.pyx":283
  *         self.n_max = self.n
  *         return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),
  *                                        shape=shape)             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 282, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 283, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_shape, __pyx_v_shape) < 0) __PYX_ERR(0, 282, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_shape, __pyx_v_shape) < 0) __PYX_ERR(0, 283, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":281
+  /* "pyart/map/ckdtree.pyx":282
  *         self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)
  *         self.n_max = self.n
  *         return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),             # <<<<<<<<<<<<<<
  *                                        shape=shape)
  * 
  */
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 281, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 282, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -8857,7 +8857,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_2to_matrix(struct _
   __pyx_t_4 = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":272
+  /* "pyart/map/ckdtree.pyx":273
  *         self.n += 1
  * 
  *     def to_matrix(coo_entries self, shape=None):             # <<<<<<<<<<<<<<
@@ -9093,7 +9093,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_11coo_entries_6__setstate_cython_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":287
+/* "pyart/map/ckdtree.pyx":288
  * # Measuring distances
  * # ===================
  * cdef inline np.float64_t _distance_p(np.float64_t *x, np.float64_t *y,             # <<<<<<<<<<<<<<
@@ -9116,7 +9116,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":298
+  /* "pyart/map/ckdtree.pyx":299
  *     cdef np.intp_t i
  *     cdef np.float64_t r, z
  *     r = 0             # <<<<<<<<<<<<<<
@@ -9125,7 +9125,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
  */
   __pyx_v_r = 0.0;
 
-  /* "pyart/map/ckdtree.pyx":299
+  /* "pyart/map/ckdtree.pyx":300
  *     cdef np.float64_t r, z
  *     r = 0
  *     if p==2:             # <<<<<<<<<<<<<<
@@ -9135,7 +9135,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   __pyx_t_1 = (__pyx_v_p == 2.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":300
+    /* "pyart/map/ckdtree.pyx":301
  *     r = 0
  *     if p==2:
  *         for i in range(k):             # <<<<<<<<<<<<<<
@@ -9147,7 +9147,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":301
+      /* "pyart/map/ckdtree.pyx":302
  *     if p==2:
  *         for i in range(k):
  *             z = x[i] - y[i]             # <<<<<<<<<<<<<<
@@ -9156,7 +9156,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
  */
       __pyx_v_z = ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]));
 
-      /* "pyart/map/ckdtree.pyx":302
+      /* "pyart/map/ckdtree.pyx":303
  *         for i in range(k):
  *             z = x[i] - y[i]
  *             r += z*z             # <<<<<<<<<<<<<<
@@ -9165,7 +9165,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
  */
       __pyx_v_r = (__pyx_v_r + (__pyx_v_z * __pyx_v_z));
 
-      /* "pyart/map/ckdtree.pyx":303
+      /* "pyart/map/ckdtree.pyx":304
  *             z = x[i] - y[i]
  *             r += z*z
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9175,7 +9175,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":304
+        /* "pyart/map/ckdtree.pyx":305
  *             r += z*z
  *             if r>upperbound:
  *                 return r             # <<<<<<<<<<<<<<
@@ -9185,7 +9185,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
         __pyx_r = __pyx_v_r;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":303
+        /* "pyart/map/ckdtree.pyx":304
  *             z = x[i] - y[i]
  *             r += z*z
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9195,7 +9195,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":299
+    /* "pyart/map/ckdtree.pyx":300
  *     cdef np.float64_t r, z
  *     r = 0
  *     if p==2:             # <<<<<<<<<<<<<<
@@ -9205,7 +9205,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":305
+  /* "pyart/map/ckdtree.pyx":306
  *             if r>upperbound:
  *                 return r
  *     elif p==infinity:             # <<<<<<<<<<<<<<
@@ -9215,7 +9215,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   __pyx_t_1 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":306
+    /* "pyart/map/ckdtree.pyx":307
  *                 return r
  *     elif p==infinity:
  *         for i in range(k):             # <<<<<<<<<<<<<<
@@ -9227,18 +9227,18 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":307
+      /* "pyart/map/ckdtree.pyx":308
  *     elif p==infinity:
  *         for i in range(k):
  *             r = dmax(r,dabs(x[i]-y[i]))             # <<<<<<<<<<<<<<
  *             if r>upperbound:
  *                 return r
  */
-      __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 307, __pyx_L1_error)
-      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_r, __pyx_t_5); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 307, __pyx_L1_error)
+      __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L1_error)
+      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_r, __pyx_t_5); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L1_error)
       __pyx_v_r = __pyx_t_6;
 
-      /* "pyart/map/ckdtree.pyx":308
+      /* "pyart/map/ckdtree.pyx":309
  *         for i in range(k):
  *             r = dmax(r,dabs(x[i]-y[i]))
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9248,7 +9248,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":309
+        /* "pyart/map/ckdtree.pyx":310
  *             r = dmax(r,dabs(x[i]-y[i]))
  *             if r>upperbound:
  *                 return r             # <<<<<<<<<<<<<<
@@ -9258,7 +9258,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
         __pyx_r = __pyx_v_r;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":308
+        /* "pyart/map/ckdtree.pyx":309
  *         for i in range(k):
  *             r = dmax(r,dabs(x[i]-y[i]))
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9268,7 +9268,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":305
+    /* "pyart/map/ckdtree.pyx":306
  *             if r>upperbound:
  *                 return r
  *     elif p==infinity:             # <<<<<<<<<<<<<<
@@ -9278,7 +9278,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":310
+  /* "pyart/map/ckdtree.pyx":311
  *             if r>upperbound:
  *                 return r
  *     elif p==1:             # <<<<<<<<<<<<<<
@@ -9288,7 +9288,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   __pyx_t_1 = (__pyx_v_p == 1.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":311
+    /* "pyart/map/ckdtree.pyx":312
  *                 return r
  *     elif p==1:
  *         for i in range(k):             # <<<<<<<<<<<<<<
@@ -9300,17 +9300,17 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":312
+      /* "pyart/map/ckdtree.pyx":313
  *     elif p==1:
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])             # <<<<<<<<<<<<<<
  *             if r>upperbound:
  *                 return r
  */
-      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 312, __pyx_L1_error)
+      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 313, __pyx_L1_error)
       __pyx_v_r = (__pyx_v_r + __pyx_t_6);
 
-      /* "pyart/map/ckdtree.pyx":313
+      /* "pyart/map/ckdtree.pyx":314
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9320,7 +9320,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":314
+        /* "pyart/map/ckdtree.pyx":315
  *             r += dabs(x[i]-y[i])
  *             if r>upperbound:
  *                 return r             # <<<<<<<<<<<<<<
@@ -9330,7 +9330,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
         __pyx_r = __pyx_v_r;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":313
+        /* "pyart/map/ckdtree.pyx":314
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9340,7 +9340,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":310
+    /* "pyart/map/ckdtree.pyx":311
  *             if r>upperbound:
  *                 return r
  *     elif p==1:             # <<<<<<<<<<<<<<
@@ -9350,7 +9350,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":316
+  /* "pyart/map/ckdtree.pyx":317
  *                 return r
  *     else:
  *         for i in range(k):             # <<<<<<<<<<<<<<
@@ -9363,17 +9363,17 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
     for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":317
+      /* "pyart/map/ckdtree.pyx":318
  *     else:
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])**p             # <<<<<<<<<<<<<<
  *             if r>upperbound:
  *                 return r
  */
-      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 317, __pyx_L1_error)
+      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 318, __pyx_L1_error)
       __pyx_v_r = (__pyx_v_r + pow(__pyx_t_6, __pyx_v_p));
 
-      /* "pyart/map/ckdtree.pyx":318
+      /* "pyart/map/ckdtree.pyx":319
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])**p
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9383,7 +9383,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
       __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":319
+        /* "pyart/map/ckdtree.pyx":320
  *             r += dabs(x[i]-y[i])**p
  *             if r>upperbound:
  *                 return r             # <<<<<<<<<<<<<<
@@ -9393,7 +9393,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
         __pyx_r = __pyx_v_r;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":318
+        /* "pyart/map/ckdtree.pyx":319
  *         for i in range(k):
  *             r += dabs(x[i]-y[i])**p
  *             if r>upperbound:             # <<<<<<<<<<<<<<
@@ -9405,7 +9405,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":320
+  /* "pyart/map/ckdtree.pyx":321
  *             if r>upperbound:
  *                 return r
  *     return r             # <<<<<<<<<<<<<<
@@ -9415,7 +9415,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   __pyx_r = __pyx_v_r;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":287
+  /* "pyart/map/ckdtree.pyx":288
  * # Measuring distances
  * # ===================
  * cdef inline np.float64_t _distance_p(np.float64_t *x, np.float64_t *y,             # <<<<<<<<<<<<<<
@@ -9431,7 +9431,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree__dist
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":332
+/* "pyart/map/ckdtree.pyx":333
  *     cdef np.ndarray mins_arr, maxes_arr
  * 
  *     def __init__(self, mins_arr, maxes_arr):             # <<<<<<<<<<<<<<
@@ -9478,7 +9478,7 @@ static int __pyx_pw_5pyart_3map_7ckdtree_9Rectangle_1__init__(PyObject *__pyx_v_
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 332, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 333, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -9486,14 +9486,14 @@ static int __pyx_pw_5pyart_3map_7ckdtree_9Rectangle_1__init__(PyObject *__pyx_v_
           (void)__Pyx_Arg_NewRef_VARARGS(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 332, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 333, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, 1); __PYX_ERR(0, 332, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, 1); __PYX_ERR(0, 333, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 332, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 333, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 2)) {
       goto __pyx_L5_argtuple_error;
@@ -9506,7 +9506,7 @@ static int __pyx_pw_5pyart_3map_7ckdtree_9Rectangle_1__init__(PyObject *__pyx_v_
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 332, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 333, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -9546,85 +9546,85 @@ static int __pyx_pf_5pyart_3map_7ckdtree_9Rectangle___init__(struct __pyx_obj_5p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/ckdtree.pyx":334
+  /* "pyart/map/ckdtree.pyx":335
  *     def __init__(self, mins_arr, maxes_arr):
  *         # Copy array data
  *         self.mins_arr = np.array(mins_arr, dtype=np.float64, order='C')             # <<<<<<<<<<<<<<
  *         self.maxes_arr = np.array(maxes_arr, dtype=np.float64, order='C')
  *         self.mins = <np.float64_t*>np.PyArray_DATA(self.mins_arr)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 334, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 334, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 334, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_v_mins_arr);
   __Pyx_GIVEREF(__pyx_v_mins_arr);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_mins_arr)) __PYX_ERR(0, 334, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 334, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_mins_arr)) __PYX_ERR(0, 335, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 334, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 334, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 334, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_u_C) < 0) __PYX_ERR(0, 334, __pyx_L1_error)
-  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 334, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_u_C) < 0) __PYX_ERR(0, 335, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 334, __pyx_L1_error)
+  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 335, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_5);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->mins_arr);
   __Pyx_DECREF((PyObject *)__pyx_v_self->mins_arr);
   __pyx_v_self->mins_arr = ((PyArrayObject *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":335
+  /* "pyart/map/ckdtree.pyx":336
  *         # Copy array data
  *         self.mins_arr = np.array(mins_arr, dtype=np.float64, order='C')
  *         self.maxes_arr = np.array(maxes_arr, dtype=np.float64, order='C')             # <<<<<<<<<<<<<<
  *         self.mins = <np.float64_t*>np.PyArray_DATA(self.mins_arr)
  *         self.maxes = <np.float64_t*>np.PyArray_DATA(self.maxes_arr)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 335, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 335, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 335, __pyx_L1_error)
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_INCREF(__pyx_v_maxes_arr);
   __Pyx_GIVEREF(__pyx_v_maxes_arr);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_maxes_arr)) __PYX_ERR(0, 335, __pyx_L1_error);
-  __pyx_t_1 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 335, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_maxes_arr)) __PYX_ERR(0, 336, __pyx_L1_error);
+  __pyx_t_1 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 335, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 335, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 335, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_u_C) < 0) __PYX_ERR(0, 335, __pyx_L1_error)
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 335, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_u_C) < 0) __PYX_ERR(0, 336, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 335, __pyx_L1_error)
+  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 336, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_4);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->maxes_arr);
   __Pyx_DECREF((PyObject *)__pyx_v_self->maxes_arr);
   __pyx_v_self->maxes_arr = ((PyArrayObject *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":336
+  /* "pyart/map/ckdtree.pyx":337
  *         self.mins_arr = np.array(mins_arr, dtype=np.float64, order='C')
  *         self.maxes_arr = np.array(maxes_arr, dtype=np.float64, order='C')
  *         self.mins = <np.float64_t*>np.PyArray_DATA(self.mins_arr)             # <<<<<<<<<<<<<<
@@ -9636,7 +9636,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_9Rectangle___init__(struct __pyx_obj_5p
   __pyx_v_self->mins = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_4)));
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":337
+  /* "pyart/map/ckdtree.pyx":338
  *         self.maxes_arr = np.array(maxes_arr, dtype=np.float64, order='C')
  *         self.mins = <np.float64_t*>np.PyArray_DATA(self.mins_arr)
  *         self.maxes = <np.float64_t*>np.PyArray_DATA(self.maxes_arr)             # <<<<<<<<<<<<<<
@@ -9648,7 +9648,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_9Rectangle___init__(struct __pyx_obj_5p
   __pyx_v_self->maxes = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_4)));
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":338
+  /* "pyart/map/ckdtree.pyx":339
  *         self.mins = <np.float64_t*>np.PyArray_DATA(self.mins_arr)
  *         self.maxes = <np.float64_t*>np.PyArray_DATA(self.maxes_arr)
  *         self.m = self.mins_arr.shape[0]             # <<<<<<<<<<<<<<
@@ -9660,7 +9660,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_9Rectangle___init__(struct __pyx_obj_5p
   __pyx_v_self->m = (__pyx_f_5numpy_7ndarray_5shape_shape(((PyArrayObject *)__pyx_t_4))[0]);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":332
+  /* "pyart/map/ckdtree.pyx":333
  *     cdef np.ndarray mins_arr, maxes_arr
  * 
  *     def __init__(self, mins_arr, maxes_arr):             # <<<<<<<<<<<<<<
@@ -9898,7 +9898,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_9Rectangle_4__setstate_cython__(C
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":342
+/* "pyart/map/ckdtree.pyx":343
  * # 1-d pieces
  * # These should only be used if p != infinity
  * cdef inline np.float64_t min_dist_point_interval_p(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -9914,19 +9914,19 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":349
+  /* "pyart/map/ckdtree.pyx":350
  *     a point in the hyperrectangle.
  *     """
  *     return dmax(0, dmax(rect.mins[k] - x[k], x[k] - rect.maxes[k])) ** p             # <<<<<<<<<<<<<<
  * 
  * cdef inline np.float64_t max_dist_point_interval_p(np.float64_t* x,
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->mins[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect->maxes[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 349, __pyx_L1_error)
-  __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_dmax(0.0, __pyx_t_1); if (unlikely(__pyx_t_2 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 349, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->mins[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect->maxes[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 350, __pyx_L1_error)
+  __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_dmax(0.0, __pyx_t_1); if (unlikely(__pyx_t_2 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 350, __pyx_L1_error)
   __pyx_r = pow(__pyx_t_2, __pyx_v_p);
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":342
+  /* "pyart/map/ckdtree.pyx":343
  * # 1-d pieces
  * # These should only be used if p != infinity
  * cdef inline np.float64_t min_dist_point_interval_p(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -9942,7 +9942,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":351
+/* "pyart/map/ckdtree.pyx":352
  *     return dmax(0, dmax(rect.mins[k] - x[k], x[k] - rect.maxes[k])) ** p
  * 
  * cdef inline np.float64_t max_dist_point_interval_p(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -9957,18 +9957,18 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":358
+  /* "pyart/map/ckdtree.pyx":359
  *     a point in the hyperrectangle.
  *     """
  *     return dmax(rect.maxes[k] - x[k], x[k] - rect.mins[k]) ** p             # <<<<<<<<<<<<<<
  * 
  * cdef inline np.float64_t min_dist_interval_interval_p(Rectangle rect1,
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->maxes[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect->mins[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 358, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->maxes[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect->mins[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 359, __pyx_L1_error)
   __pyx_r = pow(__pyx_t_1, __pyx_v_p);
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":351
+  /* "pyart/map/ckdtree.pyx":352
  *     return dmax(0, dmax(rect.mins[k] - x[k], x[k] - rect.maxes[k])) ** p
  * 
  * cdef inline np.float64_t max_dist_point_interval_p(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -9984,7 +9984,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":360
+/* "pyart/map/ckdtree.pyx":361
  *     return dmax(rect.maxes[k] - x[k], x[k] - rect.mins[k]) ** p
  * 
  * cdef inline np.float64_t min_dist_interval_interval_p(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10000,17 +10000,17 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":367
+  /* "pyart/map/ckdtree.pyx":368
  *     two hyperrectangles.
  *     """
  *     return dmax(0, dmax(rect1.mins[k] - rect2.maxes[k],             # <<<<<<<<<<<<<<
  *                         rect2.mins[k] - rect1.maxes[k])) ** p
  * 
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->mins[__pyx_v_k]) - (__pyx_v_rect2->maxes[__pyx_v_k])), ((__pyx_v_rect2->mins[__pyx_v_k]) - (__pyx_v_rect1->maxes[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 367, __pyx_L1_error)
-  __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_dmax(0.0, __pyx_t_1); if (unlikely(__pyx_t_2 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 367, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->mins[__pyx_v_k]) - (__pyx_v_rect2->maxes[__pyx_v_k])), ((__pyx_v_rect2->mins[__pyx_v_k]) - (__pyx_v_rect1->maxes[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 368, __pyx_L1_error)
+  __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_dmax(0.0, __pyx_t_1); if (unlikely(__pyx_t_2 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 368, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":368
+  /* "pyart/map/ckdtree.pyx":369
  *     """
  *     return dmax(0, dmax(rect1.mins[k] - rect2.maxes[k],
  *                         rect2.mins[k] - rect1.maxes[k])) ** p             # <<<<<<<<<<<<<<
@@ -10020,7 +10020,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   __pyx_r = pow(__pyx_t_2, __pyx_v_p);
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":360
+  /* "pyart/map/ckdtree.pyx":361
  *     return dmax(rect.maxes[k] - x[k], x[k] - rect.mins[k]) ** p
  * 
  * cdef inline np.float64_t min_dist_interval_interval_p(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10036,7 +10036,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":370
+/* "pyart/map/ckdtree.pyx":371
  *                         rect2.mins[k] - rect1.maxes[k])) ** p
  * 
  * cdef inline np.float64_t max_dist_interval_interval_p(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10051,18 +10051,18 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":377
+  /* "pyart/map/ckdtree.pyx":378
  *     two hyperrectangles.
  *     """
  *     return dmax(rect1.maxes[k] - rect2.mins[k], rect2.maxes[k] - rect1.mins[k]) ** p             # <<<<<<<<<<<<<<
  * 
  * # Interval arithmetic in m-D
  */
-  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->maxes[__pyx_v_k]) - (__pyx_v_rect2->mins[__pyx_v_k])), ((__pyx_v_rect2->maxes[__pyx_v_k]) - (__pyx_v_rect1->mins[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 377, __pyx_L1_error)
+  __pyx_t_1 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->maxes[__pyx_v_k]) - (__pyx_v_rect2->mins[__pyx_v_k])), ((__pyx_v_rect2->maxes[__pyx_v_k]) - (__pyx_v_rect1->mins[__pyx_v_k]))); if (unlikely(__pyx_t_1 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 378, __pyx_L1_error)
   __pyx_r = pow(__pyx_t_1, __pyx_v_p);
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":370
+  /* "pyart/map/ckdtree.pyx":371
  *                         rect2.mins[k] - rect1.maxes[k])) ** p
  * 
  * cdef inline np.float64_t max_dist_interval_interval_p(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10078,7 +10078,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":383
+/* "pyart/map/ckdtree.pyx":384
  * 
  * # These should be used only for p == infinity
  * cdef inline np.float64_t min_dist_point_rect_p_inf(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -10099,7 +10099,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":387
+  /* "pyart/map/ckdtree.pyx":388
  *     """Compute the minimum distance between x and the given hyperrectangle."""
  *     cdef np.intp_t i
  *     cdef np.float64_t min_dist = 0.             # <<<<<<<<<<<<<<
@@ -10108,7 +10108,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
  */
   __pyx_v_min_dist = 0.;
 
-  /* "pyart/map/ckdtree.pyx":388
+  /* "pyart/map/ckdtree.pyx":389
  *     cdef np.intp_t i
  *     cdef np.float64_t min_dist = 0.
  *     for i in range(rect.m):             # <<<<<<<<<<<<<<
@@ -10120,19 +10120,19 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":389
+    /* "pyart/map/ckdtree.pyx":390
  *     cdef np.float64_t min_dist = 0.
  *     for i in range(rect.m):
  *         min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i]))             # <<<<<<<<<<<<<<
  *     return min_dist
  * 
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect->maxes[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 389, __pyx_L1_error)
-    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 389, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect->maxes[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 390, __pyx_L1_error)
+    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 390, __pyx_L1_error)
     __pyx_v_min_dist = __pyx_t_5;
   }
 
-  /* "pyart/map/ckdtree.pyx":390
+  /* "pyart/map/ckdtree.pyx":391
  *     for i in range(rect.m):
  *         min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i]))
  *     return min_dist             # <<<<<<<<<<<<<<
@@ -10142,7 +10142,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   __pyx_r = __pyx_v_min_dist;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":383
+  /* "pyart/map/ckdtree.pyx":384
  * 
  * # These should be used only for p == infinity
  * cdef inline np.float64_t min_dist_point_rect_p_inf(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -10158,7 +10158,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":392
+/* "pyart/map/ckdtree.pyx":393
  *     return min_dist
  * 
  * cdef inline np.float64_t max_dist_point_rect_p_inf(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -10179,7 +10179,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":396
+  /* "pyart/map/ckdtree.pyx":397
  *     """Compute the maximum distance between x and the given hyperrectangle."""
  *     cdef np.intp_t i
  *     cdef np.float64_t max_dist = 0.             # <<<<<<<<<<<<<<
@@ -10188,7 +10188,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
  */
   __pyx_v_max_dist = 0.;
 
-  /* "pyart/map/ckdtree.pyx":397
+  /* "pyart/map/ckdtree.pyx":398
  *     cdef np.intp_t i
  *     cdef np.float64_t max_dist = 0.
  *     for i in range(rect.m):             # <<<<<<<<<<<<<<
@@ -10200,19 +10200,19 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":398
+    /* "pyart/map/ckdtree.pyx":399
  *     cdef np.float64_t max_dist = 0.
  *     for i in range(rect.m):
  *         max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i]))             # <<<<<<<<<<<<<<
  *     return max_dist
  * 
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->maxes[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect->mins[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 398, __pyx_L1_error)
-    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_max_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 398, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect->maxes[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect->mins[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 399, __pyx_L1_error)
+    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_max_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 399, __pyx_L1_error)
     __pyx_v_max_dist = __pyx_t_5;
   }
 
-  /* "pyart/map/ckdtree.pyx":399
+  /* "pyart/map/ckdtree.pyx":400
  *     for i in range(rect.m):
  *         max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i]))
  *     return max_dist             # <<<<<<<<<<<<<<
@@ -10222,7 +10222,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   __pyx_r = __pyx_v_max_dist;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":392
+  /* "pyart/map/ckdtree.pyx":393
  *     return min_dist
  * 
  * cdef inline np.float64_t max_dist_point_rect_p_inf(np.float64_t* x,             # <<<<<<<<<<<<<<
@@ -10238,7 +10238,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":401
+/* "pyart/map/ckdtree.pyx":402
  *     return max_dist
  * 
  * cdef inline np.float64_t min_dist_rect_rect_p_inf(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10259,7 +10259,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":405
+  /* "pyart/map/ckdtree.pyx":406
  *     """Compute the minimum distance between points in two hyperrectangles."""
  *     cdef np.intp_t i
  *     cdef np.float64_t min_dist = 0.             # <<<<<<<<<<<<<<
@@ -10268,7 +10268,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
  */
   __pyx_v_min_dist = 0.;
 
-  /* "pyart/map/ckdtree.pyx":406
+  /* "pyart/map/ckdtree.pyx":407
  *     cdef np.intp_t i
  *     cdef np.float64_t min_dist = 0.
  *     for i in range(rect1.m):             # <<<<<<<<<<<<<<
@@ -10280,19 +10280,19 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":407
+    /* "pyart/map/ckdtree.pyx":408
  *     cdef np.float64_t min_dist = 0.
  *     for i in range(rect1.m):
  *         min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],             # <<<<<<<<<<<<<<
  *                                        rect2.mins[i] - rect1.maxes[i]))
  *     return min_dist
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->mins[__pyx_v_i]) - (__pyx_v_rect2->maxes[__pyx_v_i])), ((__pyx_v_rect2->mins[__pyx_v_i]) - (__pyx_v_rect1->maxes[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 407, __pyx_L1_error)
-    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 407, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->mins[__pyx_v_i]) - (__pyx_v_rect2->maxes[__pyx_v_i])), ((__pyx_v_rect2->mins[__pyx_v_i]) - (__pyx_v_rect1->maxes[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 408, __pyx_L1_error)
+    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 408, __pyx_L1_error)
     __pyx_v_min_dist = __pyx_t_5;
   }
 
-  /* "pyart/map/ckdtree.pyx":409
+  /* "pyart/map/ckdtree.pyx":410
  *         min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],
  *                                        rect2.mins[i] - rect1.maxes[i]))
  *     return min_dist             # <<<<<<<<<<<<<<
@@ -10302,7 +10302,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   __pyx_r = __pyx_v_min_dist;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":401
+  /* "pyart/map/ckdtree.pyx":402
  *     return max_dist
  * 
  * cdef inline np.float64_t min_dist_rect_rect_p_inf(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10318,7 +10318,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_min_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":411
+/* "pyart/map/ckdtree.pyx":412
  *     return min_dist
  * 
  * cdef inline np.float64_t max_dist_rect_rect_p_inf(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10339,7 +10339,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":415
+  /* "pyart/map/ckdtree.pyx":416
  *     """Compute the maximum distance between points in two hyperrectangles."""
  *     cdef np.intp_t i
  *     cdef np.float64_t max_dist = 0.             # <<<<<<<<<<<<<<
@@ -10348,7 +10348,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
  */
   __pyx_v_max_dist = 0.;
 
-  /* "pyart/map/ckdtree.pyx":416
+  /* "pyart/map/ckdtree.pyx":417
  *     cdef np.intp_t i
  *     cdef np.float64_t max_dist = 0.
  *     for i in range(rect1.m):             # <<<<<<<<<<<<<<
@@ -10360,19 +10360,19 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":417
+    /* "pyart/map/ckdtree.pyx":418
  *     cdef np.float64_t max_dist = 0.
  *     for i in range(rect1.m):
  *         max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],             # <<<<<<<<<<<<<<
  *                                        rect2.maxes[i] - rect1.mins[i]))
  *     return max_dist
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->maxes[__pyx_v_i]) - (__pyx_v_rect2->mins[__pyx_v_i])), ((__pyx_v_rect2->maxes[__pyx_v_i]) - (__pyx_v_rect1->mins[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 417, __pyx_L1_error)
-    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_max_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 417, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_dmax(((__pyx_v_rect1->maxes[__pyx_v_i]) - (__pyx_v_rect2->mins[__pyx_v_i])), ((__pyx_v_rect2->maxes[__pyx_v_i]) - (__pyx_v_rect1->mins[__pyx_v_i]))); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 418, __pyx_L1_error)
+    __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_max_dist, __pyx_t_4); if (unlikely(__pyx_t_5 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 418, __pyx_L1_error)
     __pyx_v_max_dist = __pyx_t_5;
   }
 
-  /* "pyart/map/ckdtree.pyx":419
+  /* "pyart/map/ckdtree.pyx":420
  *         max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],
  *                                        rect2.maxes[i] - rect1.mins[i]))
  *     return max_dist             # <<<<<<<<<<<<<<
@@ -10382,7 +10382,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   __pyx_r = __pyx_v_max_dist;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":411
+  /* "pyart/map/ckdtree.pyx":412
  *     return min_dist
  * 
  * cdef inline np.float64_t max_dist_rect_rect_p_inf(Rectangle rect1,             # <<<<<<<<<<<<<<
@@ -10398,7 +10398,7 @@ static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5pyart_3map_7ckdtree_max_d
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":466
+/* "pyart/map/ckdtree.pyx":467
  * 
  *     # Stack handling
  *     cdef int _init_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -10414,7 +10414,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":468
+  /* "pyart/map/ckdtree.pyx":469
  *     cdef int _init_stack(self) except -1:
  *         cdef void *tmp
  *         self.stack_max_size = 10             # <<<<<<<<<<<<<<
@@ -10423,7 +10423,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
  */
   __pyx_v_self->stack_max_size = 10;
 
-  /* "pyart/map/ckdtree.pyx":469
+  /* "pyart/map/ckdtree.pyx":470
  *         cdef void *tmp
  *         self.stack_max_size = 10
  *         tmp = stdlib.malloc(sizeof(RR_stack_item) *             # <<<<<<<<<<<<<<
@@ -10432,7 +10432,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
  */
   __pyx_v_tmp = malloc(((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item)) * __pyx_v_self->stack_max_size));
 
-  /* "pyart/map/ckdtree.pyx":471
+  /* "pyart/map/ckdtree.pyx":472
  *         tmp = stdlib.malloc(sizeof(RR_stack_item) *
  *                             self.stack_max_size)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -10442,16 +10442,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":472
+    /* "pyart/map/ckdtree.pyx":473
  *                             self.stack_max_size)
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.stack = <RR_stack_item*> tmp
  *         self.stack_size = 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 472, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 473, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":471
+    /* "pyart/map/ckdtree.pyx":472
  *         tmp = stdlib.malloc(sizeof(RR_stack_item) *
  *                             self.stack_max_size)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -10460,7 +10460,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":473
+  /* "pyart/map/ckdtree.pyx":474
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.stack = <RR_stack_item*> tmp             # <<<<<<<<<<<<<<
@@ -10469,7 +10469,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
  */
   __pyx_v_self->stack = ((struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":474
+  /* "pyart/map/ckdtree.pyx":475
  *             raise MemoryError
  *         self.stack = <RR_stack_item*> tmp
  *         self.stack_size = 0             # <<<<<<<<<<<<<<
@@ -10478,7 +10478,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
  */
   __pyx_v_self->stack_size = 0;
 
-  /* "pyart/map/ckdtree.pyx":475
+  /* "pyart/map/ckdtree.pyx":476
  *         self.stack = <RR_stack_item*> tmp
  *         self.stack_size = 0
  *         return 0             # <<<<<<<<<<<<<<
@@ -10488,7 +10488,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":466
+  /* "pyart/map/ckdtree.pyx":467
  * 
  *     # Stack handling
  *     cdef int _init_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -10504,7 +10504,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack(st
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":477
+/* "pyart/map/ckdtree.pyx":478
  *         return 0
  * 
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:             # <<<<<<<<<<<<<<
@@ -10520,7 +10520,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":479
+  /* "pyart/map/ckdtree.pyx":480
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:
  *         cdef void *tmp
  *         self.stack_max_size = new_max_size             # <<<<<<<<<<<<<<
@@ -10529,7 +10529,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
  */
   __pyx_v_self->stack_max_size = __pyx_v_new_max_size;
 
-  /* "pyart/map/ckdtree.pyx":480
+  /* "pyart/map/ckdtree.pyx":481
  *         cdef void *tmp
  *         self.stack_max_size = new_max_size
  *         tmp = stdlib.realloc(<RR_stack_item*> self.stack,             # <<<<<<<<<<<<<<
@@ -10538,7 +10538,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
  */
   __pyx_v_tmp = realloc(((struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item *)__pyx_v_self->stack), (__pyx_v_new_max_size * (sizeof(struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item))));
 
-  /* "pyart/map/ckdtree.pyx":482
+  /* "pyart/map/ckdtree.pyx":483
  *         tmp = stdlib.realloc(<RR_stack_item*> self.stack,
  *                              new_max_size * sizeof(RR_stack_item))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -10548,16 +10548,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":483
+    /* "pyart/map/ckdtree.pyx":484
  *                              new_max_size * sizeof(RR_stack_item))
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.stack = <RR_stack_item*> tmp
  *         return 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 483, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 484, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":482
+    /* "pyart/map/ckdtree.pyx":483
  *         tmp = stdlib.realloc(<RR_stack_item*> self.stack,
  *                              new_max_size * sizeof(RR_stack_item))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -10566,7 +10566,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":484
+  /* "pyart/map/ckdtree.pyx":485
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.stack = <RR_stack_item*> tmp             # <<<<<<<<<<<<<<
@@ -10575,7 +10575,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
  */
   __pyx_v_self->stack = ((struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":485
+  /* "pyart/map/ckdtree.pyx":486
  *             raise MemoryError
  *         self.stack = <RR_stack_item*> tmp
  *         return 0             # <<<<<<<<<<<<<<
@@ -10585,7 +10585,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":477
+  /* "pyart/map/ckdtree.pyx":478
  *         return 0
  * 
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:             # <<<<<<<<<<<<<<
@@ -10601,7 +10601,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__resize_stack(
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":487
+/* "pyart/map/ckdtree.pyx":488
  *         return 0
  * 
  *     cdef int _free_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -10613,7 +10613,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
   int __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":488
+  /* "pyart/map/ckdtree.pyx":489
  * 
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RR_stack_item*> NULL:             # <<<<<<<<<<<<<<
@@ -10623,7 +10623,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
   __pyx_t_1 = (__pyx_v_self->stack != ((struct __pyx_t_5pyart_3map_7ckdtree_RR_stack_item *)NULL));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":489
+    /* "pyart/map/ckdtree.pyx":490
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RR_stack_item*> NULL:
  *             stdlib.free(self.stack)             # <<<<<<<<<<<<<<
@@ -10632,7 +10632,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
  */
     free(__pyx_v_self->stack);
 
-    /* "pyart/map/ckdtree.pyx":488
+    /* "pyart/map/ckdtree.pyx":489
  * 
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RR_stack_item*> NULL:             # <<<<<<<<<<<<<<
@@ -10641,7 +10641,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":490
+  /* "pyart/map/ckdtree.pyx":491
  *         if self.stack != <RR_stack_item*> NULL:
  *             stdlib.free(self.stack)
  *         return 0             # <<<<<<<<<<<<<<
@@ -10651,7 +10651,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":487
+  /* "pyart/map/ckdtree.pyx":488
  *         return 0
  * 
  *     cdef int _free_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -10664,7 +10664,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__free_stack(st
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":493
+/* "pyart/map/ckdtree.pyx":494
  * 
  * 
  *     def __init__(self, Rectangle rect1, Rectangle rect2,             # <<<<<<<<<<<<<<
@@ -10720,7 +10720,7 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -10728,9 +10728,9 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
           (void)__Pyx_Arg_NewRef_VARARGS(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 493, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 1); __PYX_ERR(0, 494, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
@@ -10738,9 +10738,9 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
           (void)__Pyx_Arg_NewRef_VARARGS(values[2]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 493, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 2); __PYX_ERR(0, 494, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
@@ -10748,9 +10748,9 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
           (void)__Pyx_Arg_NewRef_VARARGS(values[3]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 493, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 3); __PYX_ERR(0, 494, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  4:
@@ -10758,14 +10758,14 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
           (void)__Pyx_Arg_NewRef_VARARGS(values[4]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 493, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, 4); __PYX_ERR(0, 494, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 493, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 494, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 5)) {
       goto __pyx_L5_argtuple_error;
@@ -10778,13 +10778,13 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
     }
     __pyx_v_rect1 = ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)values[0]);
     __pyx_v_rect2 = ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)values[1]);
-    __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
-    __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
-    __pyx_v_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_upper_bound == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 494, __pyx_L3_error)
+    __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 495, __pyx_L3_error)
+    __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 495, __pyx_L3_error)
+    __pyx_v_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_upper_bound == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 495, __pyx_L3_error)
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 493, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, __pyx_nargs); __PYX_ERR(0, 494, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -10798,8 +10798,8 @@ static int __pyx_pw_5pyart_3map_7ckdtree_23RectRectDistanceTracker_1__init__(PyO
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_rect1), __pyx_ptype_5pyart_3map_7ckdtree_Rectangle, 1, "rect1", 0))) __PYX_ERR(0, 493, __pyx_L1_error)
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_rect2), __pyx_ptype_5pyart_3map_7ckdtree_Rectangle, 1, "rect2", 0))) __PYX_ERR(0, 493, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_rect1), __pyx_ptype_5pyart_3map_7ckdtree_Rectangle, 1, "rect1", 0))) __PYX_ERR(0, 494, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_rect2), __pyx_ptype_5pyart_3map_7ckdtree_Rectangle, 1, "rect2", 0))) __PYX_ERR(0, 494, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(((struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self), __pyx_v_rect1, __pyx_v_rect2, __pyx_v_p, __pyx_v_eps, __pyx_v_upper_bound);
 
   /* function exit code */
@@ -10835,7 +10835,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/ckdtree.pyx":496
+  /* "pyart/map/ckdtree.pyx":497
  *                  np.float64_t p, np.float64_t eps, np.float64_t upper_bound):
  * 
  *         if rect1.m != rect2.m:             # <<<<<<<<<<<<<<
@@ -10845,20 +10845,20 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __pyx_t_1 = (__pyx_v_rect1->m != __pyx_v_rect2->m);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":497
+    /* "pyart/map/ckdtree.pyx":498
  * 
  *         if rect1.m != rect2.m:
  *             raise ValueError("rect1 and rect2 have different dimensions")             # <<<<<<<<<<<<<<
  * 
  *         self.rect1 = rect1
  */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 497, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 498, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 497, __pyx_L1_error)
+    __PYX_ERR(0, 498, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":496
+    /* "pyart/map/ckdtree.pyx":497
  *                  np.float64_t p, np.float64_t eps, np.float64_t upper_bound):
  * 
  *         if rect1.m != rect2.m:             # <<<<<<<<<<<<<<
@@ -10867,7 +10867,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":499
+  /* "pyart/map/ckdtree.pyx":500
  *             raise ValueError("rect1 and rect2 have different dimensions")
  * 
  *         self.rect1 = rect1             # <<<<<<<<<<<<<<
@@ -10880,7 +10880,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __Pyx_DECREF((PyObject *)__pyx_v_self->rect1);
   __pyx_v_self->rect1 = __pyx_v_rect1;
 
-  /* "pyart/map/ckdtree.pyx":500
+  /* "pyart/map/ckdtree.pyx":501
  * 
  *         self.rect1 = rect1
  *         self.rect2 = rect2             # <<<<<<<<<<<<<<
@@ -10893,7 +10893,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __Pyx_DECREF((PyObject *)__pyx_v_self->rect2);
   __pyx_v_self->rect2 = __pyx_v_rect2;
 
-  /* "pyart/map/ckdtree.pyx":501
+  /* "pyart/map/ckdtree.pyx":502
  *         self.rect1 = rect1
  *         self.rect2 = rect2
  *         self.p = p             # <<<<<<<<<<<<<<
@@ -10902,7 +10902,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
  */
   __pyx_v_self->p = __pyx_v_p;
 
-  /* "pyart/map/ckdtree.pyx":504
+  /* "pyart/map/ckdtree.pyx":505
  * 
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:             # <<<<<<<<<<<<<<
@@ -10920,7 +10920,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __pyx_L5_bool_binop_done:;
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":505
+    /* "pyart/map/ckdtree.pyx":506
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:
  *             self.upper_bound = upper_bound ** p             # <<<<<<<<<<<<<<
@@ -10929,7 +10929,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
  */
     __pyx_v_self->upper_bound = pow(__pyx_v_upper_bound, __pyx_v_p);
 
-    /* "pyart/map/ckdtree.pyx":504
+    /* "pyart/map/ckdtree.pyx":505
  * 
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:             # <<<<<<<<<<<<<<
@@ -10939,7 +10939,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     goto __pyx_L4;
   }
 
-  /* "pyart/map/ckdtree.pyx":507
+  /* "pyart/map/ckdtree.pyx":508
  *             self.upper_bound = upper_bound ** p
  *         else:
  *             self.upper_bound = upper_bound             # <<<<<<<<<<<<<<
@@ -10951,7 +10951,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   }
   __pyx_L4:;
 
-  /* "pyart/map/ckdtree.pyx":510
+  /* "pyart/map/ckdtree.pyx":511
  * 
  *         # fiddle approximation factor
  *         if eps == 0:             # <<<<<<<<<<<<<<
@@ -10961,7 +10961,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __pyx_t_1 = (__pyx_v_eps == 0.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":511
+    /* "pyart/map/ckdtree.pyx":512
  *         # fiddle approximation factor
  *         if eps == 0:
  *             self.epsfac = 1             # <<<<<<<<<<<<<<
@@ -10970,7 +10970,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
  */
     __pyx_v_self->epsfac = 1.0;
 
-    /* "pyart/map/ckdtree.pyx":510
+    /* "pyart/map/ckdtree.pyx":511
  * 
  *         # fiddle approximation factor
  *         if eps == 0:             # <<<<<<<<<<<<<<
@@ -10980,7 +10980,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     goto __pyx_L7;
   }
 
-  /* "pyart/map/ckdtree.pyx":512
+  /* "pyart/map/ckdtree.pyx":513
  *         if eps == 0:
  *             self.epsfac = 1
  *         elif p == infinity:             # <<<<<<<<<<<<<<
@@ -10990,7 +10990,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __pyx_t_1 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":513
+    /* "pyart/map/ckdtree.pyx":514
  *             self.epsfac = 1
  *         elif p == infinity:
  *             self.epsfac = 1 / (1 + eps)             # <<<<<<<<<<<<<<
@@ -11000,11 +11000,11 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     __pyx_t_4 = (1.0 + __pyx_v_eps);
     if (unlikely(__pyx_t_4 == 0)) {
       PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-      __PYX_ERR(0, 513, __pyx_L1_error)
+      __PYX_ERR(0, 514, __pyx_L1_error)
     }
     __pyx_v_self->epsfac = (1.0 / __pyx_t_4);
 
-    /* "pyart/map/ckdtree.pyx":512
+    /* "pyart/map/ckdtree.pyx":513
  *         if eps == 0:
  *             self.epsfac = 1
  *         elif p == infinity:             # <<<<<<<<<<<<<<
@@ -11014,7 +11014,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     goto __pyx_L7;
   }
 
-  /* "pyart/map/ckdtree.pyx":515
+  /* "pyart/map/ckdtree.pyx":516
  *             self.epsfac = 1 / (1 + eps)
  *         else:
  *             self.epsfac = 1 / (1 + eps) ** p             # <<<<<<<<<<<<<<
@@ -11025,22 +11025,22 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     __pyx_t_4 = pow((1.0 + __pyx_v_eps), __pyx_v_p);
     if (unlikely(__pyx_t_4 == 0)) {
       PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-      __PYX_ERR(0, 515, __pyx_L1_error)
+      __PYX_ERR(0, 516, __pyx_L1_error)
     }
     __pyx_v_self->epsfac = (1.0 / __pyx_t_4);
   }
   __pyx_L7:;
 
-  /* "pyart/map/ckdtree.pyx":517
+  /* "pyart/map/ckdtree.pyx":518
  *             self.epsfac = 1 / (1 + eps) ** p
  * 
  *         self._init_stack()             # <<<<<<<<<<<<<<
  * 
  *         # Compute initial min and max distances
  */
-  __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_init_stack(__pyx_v_self); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 517, __pyx_L1_error)
+  __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_init_stack(__pyx_v_self); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 518, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":520
+  /* "pyart/map/ckdtree.pyx":521
  * 
  *         # Compute initial min and max distances
  *         if self.p == infinity:             # <<<<<<<<<<<<<<
@@ -11050,27 +11050,27 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   __pyx_t_1 = (__pyx_v_self->p == __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":521
+    /* "pyart/map/ckdtree.pyx":522
  *         # Compute initial min and max distances
  *         if self.p == infinity:
  *             self.min_distance = min_dist_rect_rect_p_inf(rect1, rect2)             # <<<<<<<<<<<<<<
  *             self.max_distance = max_dist_rect_rect_p_inf(rect1, rect2)
  *         else:
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 521, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 522, __pyx_L1_error)
     __pyx_v_self->min_distance = __pyx_t_4;
 
-    /* "pyart/map/ckdtree.pyx":522
+    /* "pyart/map/ckdtree.pyx":523
  *         if self.p == infinity:
  *             self.min_distance = min_dist_rect_rect_p_inf(rect1, rect2)
  *             self.max_distance = max_dist_rect_rect_p_inf(rect1, rect2)             # <<<<<<<<<<<<<<
  *         else:
  *             self.min_distance = 0.
  */
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 522, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 523, __pyx_L1_error)
     __pyx_v_self->max_distance = __pyx_t_4;
 
-    /* "pyart/map/ckdtree.pyx":520
+    /* "pyart/map/ckdtree.pyx":521
  * 
  *         # Compute initial min and max distances
  *         if self.p == infinity:             # <<<<<<<<<<<<<<
@@ -11080,7 +11080,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
     goto __pyx_L8;
   }
 
-  /* "pyart/map/ckdtree.pyx":524
+  /* "pyart/map/ckdtree.pyx":525
  *             self.max_distance = max_dist_rect_rect_p_inf(rect1, rect2)
  *         else:
  *             self.min_distance = 0.             # <<<<<<<<<<<<<<
@@ -11090,7 +11090,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   /*else*/ {
     __pyx_v_self->min_distance = 0.;
 
-    /* "pyart/map/ckdtree.pyx":525
+    /* "pyart/map/ckdtree.pyx":526
  *         else:
  *             self.min_distance = 0.
  *             self.max_distance = 0.             # <<<<<<<<<<<<<<
@@ -11099,16 +11099,16 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
  */
     __pyx_v_self->max_distance = 0.;
 
-    /* "pyart/map/ckdtree.pyx":526
+    /* "pyart/map/ckdtree.pyx":527
  *             self.min_distance = 0.
  *             self.max_distance = 0.
  *             for i in range(rect1.m):             # <<<<<<<<<<<<<<
  *                 self.min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)
  *                 self.max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)
  */
-    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_rect1->m); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 526, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_rect1->m); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 527, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 526, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 527, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (likely(PyList_CheckExact(__pyx_t_6)) || PyTuple_CheckExact(__pyx_t_6)) {
@@ -11116,9 +11116,9 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
       __pyx_t_7 = 0;
       __pyx_t_8 = NULL;
     } else {
-      __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 526, __pyx_L1_error)
+      __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 527, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 526, __pyx_L1_error)
+      __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 527, __pyx_L1_error)
     }
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     for (;;) {
@@ -11127,28 +11127,28 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
           {
             Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_2);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 526, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 527, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_6 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 526, __pyx_L1_error)
+          __pyx_t_6 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 527, __pyx_L1_error)
           #else
-          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 526, __pyx_L1_error)
+          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 527, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_6);
           #endif
         } else {
           {
             Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_2);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 526, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 527, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 526, __pyx_L1_error)
+          __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 527, __pyx_L1_error)
           #else
-          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 526, __pyx_L1_error)
+          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 527, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_6);
           #endif
         }
@@ -11158,7 +11158,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
           PyObject* exc_type = PyErr_Occurred();
           if (exc_type) {
             if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-            else __PYX_ERR(0, 526, __pyx_L1_error)
+            else __PYX_ERR(0, 527, __pyx_L1_error)
           }
           break;
         }
@@ -11167,29 +11167,29 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
       __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_6);
       __pyx_t_6 = 0;
 
-      /* "pyart/map/ckdtree.pyx":527
+      /* "pyart/map/ckdtree.pyx":528
  *             self.max_distance = 0.
  *             for i in range(rect1.m):
  *                 self.min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)             # <<<<<<<<<<<<<<
  *                 self.max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)
  * 
  */
-      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 527, __pyx_L1_error)
-      __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 527, __pyx_L1_error)
+      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 528, __pyx_L1_error)
+      __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 528, __pyx_L1_error)
       __pyx_v_self->min_distance = (__pyx_v_self->min_distance + __pyx_t_4);
 
-      /* "pyart/map/ckdtree.pyx":528
+      /* "pyart/map/ckdtree.pyx":529
  *             for i in range(rect1.m):
  *                 self.min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)
  *                 self.max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)             # <<<<<<<<<<<<<<
  * 
  *     def __dealloc__(self):
  */
-      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 528, __pyx_L1_error)
-      __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 528, __pyx_L1_error)
+      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 529, __pyx_L1_error)
+      __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 529, __pyx_L1_error)
       __pyx_v_self->max_distance = (__pyx_v_self->max_distance + __pyx_t_4);
 
-      /* "pyart/map/ckdtree.pyx":526
+      /* "pyart/map/ckdtree.pyx":527
  *             self.min_distance = 0.
  *             self.max_distance = 0.
  *             for i in range(rect1.m):             # <<<<<<<<<<<<<<
@@ -11201,7 +11201,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   }
   __pyx_L8:;
 
-  /* "pyart/map/ckdtree.pyx":493
+  /* "pyart/map/ckdtree.pyx":494
  * 
  * 
  *     def __init__(self, Rectangle rect1, Rectangle rect2,             # <<<<<<<<<<<<<<
@@ -11223,7 +11223,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker___init__(stru
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":530
+/* "pyart/map/ckdtree.pyx":531
  *                 self.max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -11250,16 +11250,16 @@ static void __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker_2__dealloc__
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":531
+  /* "pyart/map/ckdtree.pyx":532
  * 
  *     def __dealloc__(self):
  *         self._free_stack()             # <<<<<<<<<<<<<<
  * 
  *     cdef int push(self, np.intp_t which, np.intp_t direction,
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_free_stack(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 531, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_free_stack(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 532, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":530
+  /* "pyart/map/ckdtree.pyx":531
  *                 self.max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -11274,7 +11274,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker_2__dealloc__
   __pyx_L0:;
 }
 
-/* "pyart/map/ckdtree.pyx":533
+/* "pyart/map/ckdtree.pyx":534
  *         self._free_stack()
  * 
  *     cdef int push(self, np.intp_t which, np.intp_t direction,             # <<<<<<<<<<<<<<
@@ -11297,7 +11297,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("push", 1);
 
-  /* "pyart/map/ckdtree.pyx":538
+  /* "pyart/map/ckdtree.pyx":539
  * 
  *         cdef Rectangle rect
  *         if which == 1:             # <<<<<<<<<<<<<<
@@ -11307,7 +11307,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_1 = (__pyx_v_which == 1);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":539
+    /* "pyart/map/ckdtree.pyx":540
  *         cdef Rectangle rect
  *         if which == 1:
  *             rect = self.rect1             # <<<<<<<<<<<<<<
@@ -11319,7 +11319,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __pyx_v_rect = ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":538
+    /* "pyart/map/ckdtree.pyx":539
  * 
  *         cdef Rectangle rect
  *         if which == 1:             # <<<<<<<<<<<<<<
@@ -11329,7 +11329,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":541
+  /* "pyart/map/ckdtree.pyx":542
  *             rect = self.rect1
  *         else:
  *             rect = self.rect2             # <<<<<<<<<<<<<<
@@ -11344,7 +11344,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":544
+  /* "pyart/map/ckdtree.pyx":545
  * 
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:             # <<<<<<<<<<<<<<
@@ -11354,16 +11354,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_1 = (__pyx_v_self->stack_size == __pyx_v_self->stack_max_size);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":545
+    /* "pyart/map/ckdtree.pyx":546
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:
  *             self._resize_stack(self.stack_max_size * 2)             # <<<<<<<<<<<<<<
  * 
  *         cdef RR_stack_item *item = &self.stack[self.stack_size]
  */
-    __pyx_t_3 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_resize_stack(__pyx_v_self, (__pyx_v_self->stack_max_size * 2)); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 545, __pyx_L1_error)
+    __pyx_t_3 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_resize_stack(__pyx_v_self, (__pyx_v_self->stack_max_size * 2)); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 546, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":544
+    /* "pyart/map/ckdtree.pyx":545
  * 
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:             # <<<<<<<<<<<<<<
@@ -11372,7 +11372,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":547
+  /* "pyart/map/ckdtree.pyx":548
  *             self._resize_stack(self.stack_max_size * 2)
  * 
  *         cdef RR_stack_item *item = &self.stack[self.stack_size]             # <<<<<<<<<<<<<<
@@ -11381,7 +11381,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_item = (&(__pyx_v_self->stack[__pyx_v_self->stack_size]));
 
-  /* "pyart/map/ckdtree.pyx":548
+  /* "pyart/map/ckdtree.pyx":549
  * 
  *         cdef RR_stack_item *item = &self.stack[self.stack_size]
  *         self.stack_size += 1             # <<<<<<<<<<<<<<
@@ -11390,7 +11390,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_self->stack_size = (__pyx_v_self->stack_size + 1);
 
-  /* "pyart/map/ckdtree.pyx":549
+  /* "pyart/map/ckdtree.pyx":550
  *         cdef RR_stack_item *item = &self.stack[self.stack_size]
  *         self.stack_size += 1
  *         item.which = which             # <<<<<<<<<<<<<<
@@ -11399,7 +11399,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_item->which = __pyx_v_which;
 
-  /* "pyart/map/ckdtree.pyx":550
+  /* "pyart/map/ckdtree.pyx":551
  *         self.stack_size += 1
  *         item.which = which
  *         item.split_dim = split_dim             # <<<<<<<<<<<<<<
@@ -11408,7 +11408,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_item->split_dim = __pyx_v_split_dim;
 
-  /* "pyart/map/ckdtree.pyx":551
+  /* "pyart/map/ckdtree.pyx":552
  *         item.which = which
  *         item.split_dim = split_dim
  *         item.min_distance = self.min_distance             # <<<<<<<<<<<<<<
@@ -11418,7 +11418,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_4 = __pyx_v_self->min_distance;
   __pyx_v_item->min_distance = __pyx_t_4;
 
-  /* "pyart/map/ckdtree.pyx":552
+  /* "pyart/map/ckdtree.pyx":553
  *         item.split_dim = split_dim
  *         item.min_distance = self.min_distance
  *         item.max_distance = self.max_distance             # <<<<<<<<<<<<<<
@@ -11428,7 +11428,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_4 = __pyx_v_self->max_distance;
   __pyx_v_item->max_distance = __pyx_t_4;
 
-  /* "pyart/map/ckdtree.pyx":553
+  /* "pyart/map/ckdtree.pyx":554
  *         item.min_distance = self.min_distance
  *         item.max_distance = self.max_distance
  *         item.min_along_dim = rect.mins[split_dim]             # <<<<<<<<<<<<<<
@@ -11437,7 +11437,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_item->min_along_dim = (__pyx_v_rect->mins[__pyx_v_split_dim]);
 
-  /* "pyart/map/ckdtree.pyx":554
+  /* "pyart/map/ckdtree.pyx":555
  *         item.max_distance = self.max_distance
  *         item.min_along_dim = rect.mins[split_dim]
  *         item.max_along_dim = rect.maxes[split_dim]             # <<<<<<<<<<<<<<
@@ -11446,7 +11446,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   __pyx_v_item->max_along_dim = (__pyx_v_rect->maxes[__pyx_v_split_dim]);
 
-  /* "pyart/map/ckdtree.pyx":557
+  /* "pyart/map/ckdtree.pyx":558
  * 
  *         # Update min/max distances
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -11456,7 +11456,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_1 = (__pyx_v_self->p != __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":558
+    /* "pyart/map/ckdtree.pyx":559
  *         # Update min/max distances
  *         if self.p != infinity:
  *             self.min_distance -= min_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -11467,12 +11467,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_2);
     __pyx_t_5 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_5);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 558, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 559, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_self->min_distance = (__pyx_v_self->min_distance - __pyx_t_4);
 
-    /* "pyart/map/ckdtree.pyx":559
+    /* "pyart/map/ckdtree.pyx":560
  *         if self.p != infinity:
  *             self.min_distance -= min_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)
  *             self.max_distance -= max_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -11483,12 +11483,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_5);
     __pyx_t_2 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_2);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 559, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 560, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_v_self->max_distance = (__pyx_v_self->max_distance - __pyx_t_4);
 
-    /* "pyart/map/ckdtree.pyx":557
+    /* "pyart/map/ckdtree.pyx":558
  * 
  *         # Update min/max distances
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -11497,7 +11497,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":561
+  /* "pyart/map/ckdtree.pyx":562
  *             self.max_distance -= max_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)
  * 
  *         if direction == LESS:             # <<<<<<<<<<<<<<
@@ -11507,7 +11507,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_1 = (__pyx_v_direction == __pyx_v_5pyart_3map_7ckdtree_LESS);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":562
+    /* "pyart/map/ckdtree.pyx":563
  * 
  *         if direction == LESS:
  *             rect.maxes[split_dim] = split_val             # <<<<<<<<<<<<<<
@@ -11516,7 +11516,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
  */
     (__pyx_v_rect->maxes[__pyx_v_split_dim]) = __pyx_v_split_val;
 
-    /* "pyart/map/ckdtree.pyx":561
+    /* "pyart/map/ckdtree.pyx":562
  *             self.max_distance -= max_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)
  * 
  *         if direction == LESS:             # <<<<<<<<<<<<<<
@@ -11526,7 +11526,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     goto __pyx_L6;
   }
 
-  /* "pyart/map/ckdtree.pyx":564
+  /* "pyart/map/ckdtree.pyx":565
  *             rect.maxes[split_dim] = split_val
  *         else:
  *             rect.mins[split_dim] = split_val             # <<<<<<<<<<<<<<
@@ -11538,7 +11538,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   }
   __pyx_L6:;
 
-  /* "pyart/map/ckdtree.pyx":566
+  /* "pyart/map/ckdtree.pyx":567
  *             rect.mins[split_dim] = split_val
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -11548,7 +11548,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_t_1 = (__pyx_v_self->p != __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":567
+    /* "pyart/map/ckdtree.pyx":568
  * 
  *         if self.p != infinity:
  *             self.min_distance += min_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -11559,12 +11559,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_2);
     __pyx_t_5 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_5);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 567, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 568, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_self->min_distance = (__pyx_v_self->min_distance + __pyx_t_4);
 
-    /* "pyart/map/ckdtree.pyx":568
+    /* "pyart/map/ckdtree.pyx":569
  *         if self.p != infinity:
  *             self.min_distance += min_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)
  *             self.max_distance += max_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -11575,12 +11575,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_5);
     __pyx_t_2 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_2);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 568, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_interval_interval_p(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 569, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_v_self->max_distance = (__pyx_v_self->max_distance + __pyx_t_4);
 
-    /* "pyart/map/ckdtree.pyx":566
+    /* "pyart/map/ckdtree.pyx":567
  *             rect.mins[split_dim] = split_val
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -11590,7 +11590,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     goto __pyx_L7;
   }
 
-  /* "pyart/map/ckdtree.pyx":570
+  /* "pyart/map/ckdtree.pyx":571
  *             self.max_distance += max_dist_interval_interval_p(self.rect1, self.rect2, split_dim, self.p)
  *         else:
  *             self.min_distance = min_dist_rect_rect_p_inf(self.rect1, self.rect2)             # <<<<<<<<<<<<<<
@@ -11602,12 +11602,12 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_2);
     __pyx_t_5 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_5);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_rect_rect_p_inf(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5)); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 570, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_min_dist_rect_rect_p_inf(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5)); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 571, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_self->min_distance = __pyx_t_4;
 
-    /* "pyart/map/ckdtree.pyx":571
+    /* "pyart/map/ckdtree.pyx":572
  *         else:
  *             self.min_distance = min_dist_rect_rect_p_inf(self.rect1, self.rect2)
  *             self.max_distance = max_dist_rect_rect_p_inf(self.rect1, self.rect2)             # <<<<<<<<<<<<<<
@@ -11618,14 +11618,14 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
     __Pyx_INCREF(__pyx_t_5);
     __pyx_t_2 = ((PyObject *)__pyx_v_self->rect2);
     __Pyx_INCREF(__pyx_t_2);
-    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_rect_rect_p_inf(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2)); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 571, __pyx_L1_error)
+    __pyx_t_4 = __pyx_f_5pyart_3map_7ckdtree_max_dist_rect_rect_p_inf(((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_5), ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2)); if (unlikely(__pyx_t_4 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 572, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_v_self->max_distance = __pyx_t_4;
   }
   __pyx_L7:;
 
-  /* "pyart/map/ckdtree.pyx":573
+  /* "pyart/map/ckdtree.pyx":574
  *             self.max_distance = max_dist_rect_rect_p_inf(self.rect1, self.rect2)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -11635,7 +11635,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":533
+  /* "pyart/map/ckdtree.pyx":534
  *         self._free_stack()
  * 
  *     cdef int push(self, np.intp_t which, np.intp_t direction,             # <<<<<<<<<<<<<<
@@ -11655,7 +11655,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push(struct __
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":576
+/* "pyart/map/ckdtree.pyx":577
  * 
  * 
  *     cdef inline int push_less_of(self, np.intp_t which,             # <<<<<<<<<<<<<<
@@ -11670,18 +11670,18 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":578
+  /* "pyart/map/ckdtree.pyx":579
  *     cdef inline int push_less_of(self, np.intp_t which,
  *                                  innernode *node) except -1:
  *         return self.push(which, LESS, node.split_dim, node.split)             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_which, __pyx_v_5pyart_3map_7ckdtree_LESS, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 578, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_which, __pyx_v_5pyart_3map_7ckdtree_LESS, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 579, __pyx_L1_error)
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":576
+  /* "pyart/map/ckdtree.pyx":577
  * 
  * 
  *     cdef inline int push_less_of(self, np.intp_t which,             # <<<<<<<<<<<<<<
@@ -11697,7 +11697,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":581
+/* "pyart/map/ckdtree.pyx":582
  * 
  * 
  *     cdef inline int push_greater_of(self, np.intp_t which,             # <<<<<<<<<<<<<<
@@ -11712,18 +11712,18 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":583
+  /* "pyart/map/ckdtree.pyx":584
  *     cdef inline int push_greater_of(self, np.intp_t which,
  *                                     innernode *node) except -1:
  *         return self.push(which, GREATER, node.split_dim, node.split)             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_which, __pyx_v_5pyart_3map_7ckdtree_GREATER, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 583, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_which, __pyx_v_5pyart_3map_7ckdtree_GREATER, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 584, __pyx_L1_error)
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":581
+  /* "pyart/map/ckdtree.pyx":582
  * 
  * 
  *     cdef inline int push_greater_of(self, np.intp_t which,             # <<<<<<<<<<<<<<
@@ -11739,7 +11739,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":586
+/* "pyart/map/ckdtree.pyx":587
  * 
  * 
  *     cdef inline int pop(self) except -1:             # <<<<<<<<<<<<<<
@@ -11757,7 +11757,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":588
+  /* "pyart/map/ckdtree.pyx":589
  *     cdef inline int pop(self) except -1:
  *         # Pop from stack
  *         self.stack_size -= 1             # <<<<<<<<<<<<<<
@@ -11766,7 +11766,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
  */
   __pyx_v_self->stack_size = (__pyx_v_self->stack_size - 1);
 
-  /* "pyart/map/ckdtree.pyx":589
+  /* "pyart/map/ckdtree.pyx":590
  *         # Pop from stack
  *         self.stack_size -= 1
  *         assert self.stack_size >= 0             # <<<<<<<<<<<<<<
@@ -11778,14 +11778,14 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
     __pyx_t_1 = (__pyx_v_self->stack_size >= 0);
     if (unlikely(!__pyx_t_1)) {
       __Pyx_Raise(__pyx_builtin_AssertionError, 0, 0, 0);
-      __PYX_ERR(0, 589, __pyx_L1_error)
+      __PYX_ERR(0, 590, __pyx_L1_error)
     }
   }
   #else
-  if ((1)); else __PYX_ERR(0, 589, __pyx_L1_error)
+  if ((1)); else __PYX_ERR(0, 590, __pyx_L1_error)
   #endif
 
-  /* "pyart/map/ckdtree.pyx":591
+  /* "pyart/map/ckdtree.pyx":592
  *         assert self.stack_size >= 0
  * 
  *         cdef RR_stack_item* item = &self.stack[self.stack_size]             # <<<<<<<<<<<<<<
@@ -11794,7 +11794,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
  */
   __pyx_v_item = (&(__pyx_v_self->stack[__pyx_v_self->stack_size]));
 
-  /* "pyart/map/ckdtree.pyx":592
+  /* "pyart/map/ckdtree.pyx":593
  * 
  *         cdef RR_stack_item* item = &self.stack[self.stack_size]
  *         self.min_distance = item.min_distance             # <<<<<<<<<<<<<<
@@ -11804,7 +11804,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   __pyx_t_2 = __pyx_v_item->min_distance;
   __pyx_v_self->min_distance = __pyx_t_2;
 
-  /* "pyart/map/ckdtree.pyx":593
+  /* "pyart/map/ckdtree.pyx":594
  *         cdef RR_stack_item* item = &self.stack[self.stack_size]
  *         self.min_distance = item.min_distance
  *         self.max_distance = item.max_distance             # <<<<<<<<<<<<<<
@@ -11814,7 +11814,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   __pyx_t_2 = __pyx_v_item->max_distance;
   __pyx_v_self->max_distance = __pyx_t_2;
 
-  /* "pyart/map/ckdtree.pyx":595
+  /* "pyart/map/ckdtree.pyx":596
  *         self.max_distance = item.max_distance
  * 
  *         if item.which == 1:             # <<<<<<<<<<<<<<
@@ -11824,7 +11824,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   __pyx_t_1 = (__pyx_v_item->which == 1);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":596
+    /* "pyart/map/ckdtree.pyx":597
  * 
  *         if item.which == 1:
  *             self.rect1.mins[item.split_dim] = item.min_along_dim             # <<<<<<<<<<<<<<
@@ -11834,7 +11834,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
     __pyx_t_3 = __pyx_v_item->min_along_dim;
     (__pyx_v_self->rect1->mins[__pyx_v_item->split_dim]) = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":597
+    /* "pyart/map/ckdtree.pyx":598
  *         if item.which == 1:
  *             self.rect1.mins[item.split_dim] = item.min_along_dim
  *             self.rect1.maxes[item.split_dim] = item.max_along_dim             # <<<<<<<<<<<<<<
@@ -11844,7 +11844,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
     __pyx_t_3 = __pyx_v_item->max_along_dim;
     (__pyx_v_self->rect1->maxes[__pyx_v_item->split_dim]) = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":595
+    /* "pyart/map/ckdtree.pyx":596
  *         self.max_distance = item.max_distance
  * 
  *         if item.which == 1:             # <<<<<<<<<<<<<<
@@ -11854,7 +11854,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":599
+  /* "pyart/map/ckdtree.pyx":600
  *             self.rect1.maxes[item.split_dim] = item.max_along_dim
  *         else:
  *             self.rect2.mins[item.split_dim] = item.min_along_dim             # <<<<<<<<<<<<<<
@@ -11865,7 +11865,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
     __pyx_t_3 = __pyx_v_item->min_along_dim;
     (__pyx_v_self->rect2->mins[__pyx_v_item->split_dim]) = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":600
+    /* "pyart/map/ckdtree.pyx":601
  *         else:
  *             self.rect2.mins[item.split_dim] = item.min_along_dim
  *             self.rect2.maxes[item.split_dim] = item.max_along_dim             # <<<<<<<<<<<<<<
@@ -11877,7 +11877,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":602
+  /* "pyart/map/ckdtree.pyx":603
  *             self.rect2.maxes[item.split_dim] = item.max_along_dim
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -11887,7 +11887,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":586
+  /* "pyart/map/ckdtree.pyx":587
  * 
  * 
  *     cdef inline int pop(self) except -1:             # <<<<<<<<<<<<<<
@@ -12117,7 +12117,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_23RectRectDistanceTracker_6__sets
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":646
+/* "pyart/map/ckdtree.pyx":647
  * 
  *     # Stack handling
  *     cdef int _init_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -12133,7 +12133,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":648
+  /* "pyart/map/ckdtree.pyx":649
  *     cdef int _init_stack(self) except -1:
  *         cdef void *tmp
  *         self.stack_max_size = 10             # <<<<<<<<<<<<<<
@@ -12142,7 +12142,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
  */
   __pyx_v_self->stack_max_size = 10;
 
-  /* "pyart/map/ckdtree.pyx":649
+  /* "pyart/map/ckdtree.pyx":650
  *         cdef void *tmp
  *         self.stack_max_size = 10
  *         tmp = stdlib.malloc(sizeof(RP_stack_item) *             # <<<<<<<<<<<<<<
@@ -12151,7 +12151,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
  */
   __pyx_v_tmp = malloc(((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item)) * __pyx_v_self->stack_max_size));
 
-  /* "pyart/map/ckdtree.pyx":651
+  /* "pyart/map/ckdtree.pyx":652
  *         tmp = stdlib.malloc(sizeof(RP_stack_item) *
  *                             self.stack_max_size)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -12161,16 +12161,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":652
+    /* "pyart/map/ckdtree.pyx":653
  *                             self.stack_max_size)
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.stack = <RP_stack_item*> tmp
  *         self.stack_size = 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 652, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 653, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":651
+    /* "pyart/map/ckdtree.pyx":652
  *         tmp = stdlib.malloc(sizeof(RP_stack_item) *
  *                             self.stack_max_size)
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -12179,7 +12179,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":653
+  /* "pyart/map/ckdtree.pyx":654
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.stack = <RP_stack_item*> tmp             # <<<<<<<<<<<<<<
@@ -12188,7 +12188,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
  */
   __pyx_v_self->stack = ((struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":654
+  /* "pyart/map/ckdtree.pyx":655
  *             raise MemoryError
  *         self.stack = <RP_stack_item*> tmp
  *         self.stack_size = 0             # <<<<<<<<<<<<<<
@@ -12197,7 +12197,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
  */
   __pyx_v_self->stack_size = 0;
 
-  /* "pyart/map/ckdtree.pyx":655
+  /* "pyart/map/ckdtree.pyx":656
  *         self.stack = <RP_stack_item*> tmp
  *         self.stack_size = 0
  *         return 0             # <<<<<<<<<<<<<<
@@ -12207,7 +12207,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":646
+  /* "pyart/map/ckdtree.pyx":647
  * 
  *     # Stack handling
  *     cdef int _init_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -12223,7 +12223,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack(s
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":657
+/* "pyart/map/ckdtree.pyx":658
  *         return 0
  * 
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:             # <<<<<<<<<<<<<<
@@ -12239,7 +12239,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":659
+  /* "pyart/map/ckdtree.pyx":660
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:
  *         cdef void *tmp
  *         self.stack_max_size = new_max_size             # <<<<<<<<<<<<<<
@@ -12248,7 +12248,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
  */
   __pyx_v_self->stack_max_size = __pyx_v_new_max_size;
 
-  /* "pyart/map/ckdtree.pyx":660
+  /* "pyart/map/ckdtree.pyx":661
  *         cdef void *tmp
  *         self.stack_max_size = new_max_size
  *         tmp = stdlib.realloc(<RP_stack_item*> self.stack,             # <<<<<<<<<<<<<<
@@ -12257,7 +12257,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
  */
   __pyx_v_tmp = realloc(((struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item *)__pyx_v_self->stack), (__pyx_v_new_max_size * (sizeof(struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item))));
 
-  /* "pyart/map/ckdtree.pyx":662
+  /* "pyart/map/ckdtree.pyx":663
  *         tmp = stdlib.realloc(<RP_stack_item*> self.stack,
  *                               new_max_size * sizeof(RP_stack_item))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -12267,16 +12267,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
   __pyx_t_1 = (__pyx_v_tmp == NULL);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":663
+    /* "pyart/map/ckdtree.pyx":664
  *                               new_max_size * sizeof(RP_stack_item))
  *         if tmp == NULL:
  *             raise MemoryError             # <<<<<<<<<<<<<<
  *         self.stack = <RP_stack_item*> tmp
  *         return 0
  */
-    PyErr_NoMemory(); __PYX_ERR(0, 663, __pyx_L1_error)
+    PyErr_NoMemory(); __PYX_ERR(0, 664, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":662
+    /* "pyart/map/ckdtree.pyx":663
  *         tmp = stdlib.realloc(<RP_stack_item*> self.stack,
  *                               new_max_size * sizeof(RP_stack_item))
  *         if tmp == NULL:             # <<<<<<<<<<<<<<
@@ -12285,7 +12285,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":664
+  /* "pyart/map/ckdtree.pyx":665
  *         if tmp == NULL:
  *             raise MemoryError
  *         self.stack = <RP_stack_item*> tmp             # <<<<<<<<<<<<<<
@@ -12294,7 +12294,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
  */
   __pyx_v_self->stack = ((struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item *)__pyx_v_tmp);
 
-  /* "pyart/map/ckdtree.pyx":665
+  /* "pyart/map/ckdtree.pyx":666
  *             raise MemoryError
  *         self.stack = <RP_stack_item*> tmp
  *         return 0             # <<<<<<<<<<<<<<
@@ -12304,7 +12304,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":657
+  /* "pyart/map/ckdtree.pyx":658
  *         return 0
  * 
  *     cdef int _resize_stack(self, np.intp_t new_max_size) except -1:             # <<<<<<<<<<<<<<
@@ -12320,7 +12320,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__resize_stack
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":667
+/* "pyart/map/ckdtree.pyx":668
  *         return 0
  * 
  *     cdef int _free_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -12332,7 +12332,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
   int __pyx_r;
   int __pyx_t_1;
 
-  /* "pyart/map/ckdtree.pyx":668
+  /* "pyart/map/ckdtree.pyx":669
  * 
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RP_stack_item*> NULL:             # <<<<<<<<<<<<<<
@@ -12342,7 +12342,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
   __pyx_t_1 = (__pyx_v_self->stack != ((struct __pyx_t_5pyart_3map_7ckdtree_RP_stack_item *)NULL));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":669
+    /* "pyart/map/ckdtree.pyx":670
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RP_stack_item*> NULL:
  *             stdlib.free(self.stack)             # <<<<<<<<<<<<<<
@@ -12351,7 +12351,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
  */
     free(__pyx_v_self->stack);
 
-    /* "pyart/map/ckdtree.pyx":668
+    /* "pyart/map/ckdtree.pyx":669
  * 
  *     cdef int _free_stack(self) except -1:
  *         if self.stack != <RP_stack_item*> NULL:             # <<<<<<<<<<<<<<
@@ -12360,7 +12360,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":670
+  /* "pyart/map/ckdtree.pyx":671
  *         if self.stack != <RP_stack_item*> NULL:
  *             stdlib.free(self.stack)
  *         return 0             # <<<<<<<<<<<<<<
@@ -12370,7 +12370,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":667
+  /* "pyart/map/ckdtree.pyx":668
  *         return 0
  * 
  *     cdef int _free_stack(self) except -1:             # <<<<<<<<<<<<<<
@@ -12383,7 +12383,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__free_stack(s
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":672
+/* "pyart/map/ckdtree.pyx":673
  *         return 0
  * 
  *     cdef init(self, np.float64_t *pt, Rectangle rect,             # <<<<<<<<<<<<<<
@@ -12409,7 +12409,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("init", 1);
 
-  /* "pyart/map/ckdtree.pyx":675
+  /* "pyart/map/ckdtree.pyx":676
  *               np.float64_t p, np.float64_t eps, np.float64_t upper_bound):
  * 
  *         self.pt = pt             # <<<<<<<<<<<<<<
@@ -12418,7 +12418,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
  */
   __pyx_v_self->pt = __pyx_v_pt;
 
-  /* "pyart/map/ckdtree.pyx":676
+  /* "pyart/map/ckdtree.pyx":677
  * 
  *         self.pt = pt
  *         self.rect = rect             # <<<<<<<<<<<<<<
@@ -12431,7 +12431,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   __Pyx_DECREF((PyObject *)__pyx_v_self->rect);
   __pyx_v_self->rect = __pyx_v_rect;
 
-  /* "pyart/map/ckdtree.pyx":677
+  /* "pyart/map/ckdtree.pyx":678
  *         self.pt = pt
  *         self.rect = rect
  *         self.p = p             # <<<<<<<<<<<<<<
@@ -12440,7 +12440,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
  */
   __pyx_v_self->p = __pyx_v_p;
 
-  /* "pyart/map/ckdtree.pyx":680
+  /* "pyart/map/ckdtree.pyx":681
  * 
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:             # <<<<<<<<<<<<<<
@@ -12458,7 +12458,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   __pyx_L4_bool_binop_done:;
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":681
+    /* "pyart/map/ckdtree.pyx":682
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:
  *             self.upper_bound = upper_bound ** p             # <<<<<<<<<<<<<<
@@ -12467,7 +12467,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
  */
     __pyx_v_self->upper_bound = pow(__pyx_v_upper_bound, __pyx_v_p);
 
-    /* "pyart/map/ckdtree.pyx":680
+    /* "pyart/map/ckdtree.pyx":681
  * 
  *         # internally we represent all distances as distance ** p
  *         if p != infinity and upper_bound != infinity:             # <<<<<<<<<<<<<<
@@ -12477,7 +12477,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":683
+  /* "pyart/map/ckdtree.pyx":684
  *             self.upper_bound = upper_bound ** p
  *         else:
  *             self.upper_bound = upper_bound             # <<<<<<<<<<<<<<
@@ -12489,7 +12489,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":686
+  /* "pyart/map/ckdtree.pyx":687
  * 
  *         # fiddle approximation factor
  *         if eps == 0:             # <<<<<<<<<<<<<<
@@ -12499,7 +12499,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   __pyx_t_1 = (__pyx_v_eps == 0.0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":687
+    /* "pyart/map/ckdtree.pyx":688
  *         # fiddle approximation factor
  *         if eps == 0:
  *             self.epsfac = 1             # <<<<<<<<<<<<<<
@@ -12508,7 +12508,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
  */
     __pyx_v_self->epsfac = 1.0;
 
-    /* "pyart/map/ckdtree.pyx":686
+    /* "pyart/map/ckdtree.pyx":687
  * 
  *         # fiddle approximation factor
  *         if eps == 0:             # <<<<<<<<<<<<<<
@@ -12518,7 +12518,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     goto __pyx_L6;
   }
 
-  /* "pyart/map/ckdtree.pyx":688
+  /* "pyart/map/ckdtree.pyx":689
  *         if eps == 0:
  *             self.epsfac = 1
  *         elif p == infinity:             # <<<<<<<<<<<<<<
@@ -12528,7 +12528,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   __pyx_t_1 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":689
+    /* "pyart/map/ckdtree.pyx":690
  *             self.epsfac = 1
  *         elif p == infinity:
  *             self.epsfac = 1 / (1 + eps)             # <<<<<<<<<<<<<<
@@ -12538,11 +12538,11 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     __pyx_t_3 = (1.0 + __pyx_v_eps);
     if (unlikely(__pyx_t_3 == 0)) {
       PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-      __PYX_ERR(0, 689, __pyx_L1_error)
+      __PYX_ERR(0, 690, __pyx_L1_error)
     }
     __pyx_v_self->epsfac = (1.0 / __pyx_t_3);
 
-    /* "pyart/map/ckdtree.pyx":688
+    /* "pyart/map/ckdtree.pyx":689
  *         if eps == 0:
  *             self.epsfac = 1
  *         elif p == infinity:             # <<<<<<<<<<<<<<
@@ -12552,7 +12552,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     goto __pyx_L6;
   }
 
-  /* "pyart/map/ckdtree.pyx":691
+  /* "pyart/map/ckdtree.pyx":692
  *             self.epsfac = 1 / (1 + eps)
  *         else:
  *             self.epsfac = 1 / (1 + eps) ** p             # <<<<<<<<<<<<<<
@@ -12563,22 +12563,22 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     __pyx_t_3 = pow((1.0 + __pyx_v_eps), __pyx_v_p);
     if (unlikely(__pyx_t_3 == 0)) {
       PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-      __PYX_ERR(0, 691, __pyx_L1_error)
+      __PYX_ERR(0, 692, __pyx_L1_error)
     }
     __pyx_v_self->epsfac = (1.0 / __pyx_t_3);
   }
   __pyx_L6:;
 
-  /* "pyart/map/ckdtree.pyx":693
+  /* "pyart/map/ckdtree.pyx":694
  *             self.epsfac = 1 / (1 + eps) ** p
  * 
  *         self._init_stack()             # <<<<<<<<<<<<<<
  * 
  *         # Compute initial min and max distances
  */
-  __pyx_t_4 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_init_stack(__pyx_v_self); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 693, __pyx_L1_error)
+  __pyx_t_4 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_init_stack(__pyx_v_self); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 694, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":696
+  /* "pyart/map/ckdtree.pyx":697
  * 
  *         # Compute initial min and max distances
  *         if self.p == infinity:             # <<<<<<<<<<<<<<
@@ -12588,27 +12588,27 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   __pyx_t_1 = (__pyx_v_self->p == __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":697
+    /* "pyart/map/ckdtree.pyx":698
  *         # Compute initial min and max distances
  *         if self.p == infinity:
  *             self.min_distance = min_dist_point_rect_p_inf(pt, rect)             # <<<<<<<<<<<<<<
  *             self.max_distance = max_dist_point_rect_p_inf(pt, rect)
  *         else:
  */
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_pt, __pyx_v_rect); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 697, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_pt, __pyx_v_rect); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 698, __pyx_L1_error)
     __pyx_v_self->min_distance = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":698
+    /* "pyart/map/ckdtree.pyx":699
  *         if self.p == infinity:
  *             self.min_distance = min_dist_point_rect_p_inf(pt, rect)
  *             self.max_distance = max_dist_point_rect_p_inf(pt, rect)             # <<<<<<<<<<<<<<
  *         else:
  *             self.min_distance = 0.
  */
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_pt, __pyx_v_rect); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 698, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_pt, __pyx_v_rect); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 699, __pyx_L1_error)
     __pyx_v_self->max_distance = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":696
+    /* "pyart/map/ckdtree.pyx":697
  * 
  *         # Compute initial min and max distances
  *         if self.p == infinity:             # <<<<<<<<<<<<<<
@@ -12618,7 +12618,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
     goto __pyx_L7;
   }
 
-  /* "pyart/map/ckdtree.pyx":700
+  /* "pyart/map/ckdtree.pyx":701
  *             self.max_distance = max_dist_point_rect_p_inf(pt, rect)
  *         else:
  *             self.min_distance = 0.             # <<<<<<<<<<<<<<
@@ -12628,7 +12628,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   /*else*/ {
     __pyx_v_self->min_distance = 0.;
 
-    /* "pyart/map/ckdtree.pyx":701
+    /* "pyart/map/ckdtree.pyx":702
  *         else:
  *             self.min_distance = 0.
  *             self.max_distance = 0.             # <<<<<<<<<<<<<<
@@ -12637,16 +12637,16 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
  */
     __pyx_v_self->max_distance = 0.;
 
-    /* "pyart/map/ckdtree.pyx":702
+    /* "pyart/map/ckdtree.pyx":703
  *             self.min_distance = 0.
  *             self.max_distance = 0.
  *             for i in range(rect.m):             # <<<<<<<<<<<<<<
  *                 self.min_distance += min_dist_point_interval_p(pt, rect, i, p)
  *                 self.max_distance += max_dist_point_interval_p(pt, rect, i, p)
  */
-    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_rect->m); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 702, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_rect->m); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 703, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 702, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 703, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     if (likely(PyList_CheckExact(__pyx_t_6)) || PyTuple_CheckExact(__pyx_t_6)) {
@@ -12654,9 +12654,9 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
       __pyx_t_7 = 0;
       __pyx_t_8 = NULL;
     } else {
-      __pyx_t_7 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 702, __pyx_L1_error)
+      __pyx_t_7 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 703, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_5);
-      __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 702, __pyx_L1_error)
+      __pyx_t_8 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 703, __pyx_L1_error)
     }
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     for (;;) {
@@ -12665,28 +12665,28 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
           {
             Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_5);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 702, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 703, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_6 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 702, __pyx_L1_error)
+          __pyx_t_6 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 703, __pyx_L1_error)
           #else
-          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 702, __pyx_L1_error)
+          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 703, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_6);
           #endif
         } else {
           {
             Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_5);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 702, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 703, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 702, __pyx_L1_error)
+          __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 703, __pyx_L1_error)
           #else
-          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 702, __pyx_L1_error)
+          __pyx_t_6 = __Pyx_PySequence_ITEM(__pyx_t_5, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 703, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_6);
           #endif
         }
@@ -12696,7 +12696,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
           PyObject* exc_type = PyErr_Occurred();
           if (exc_type) {
             if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-            else __PYX_ERR(0, 702, __pyx_L1_error)
+            else __PYX_ERR(0, 703, __pyx_L1_error)
           }
           break;
         }
@@ -12705,29 +12705,29 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
       __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_6);
       __pyx_t_6 = 0;
 
-      /* "pyart/map/ckdtree.pyx":703
+      /* "pyart/map/ckdtree.pyx":704
  *             self.max_distance = 0.
  *             for i in range(rect.m):
  *                 self.min_distance += min_dist_point_interval_p(pt, rect, i, p)             # <<<<<<<<<<<<<<
  *                 self.max_distance += max_dist_point_interval_p(pt, rect, i, p)
  * 
  */
-      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 703, __pyx_L1_error)
-      __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_pt, __pyx_v_rect, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 703, __pyx_L1_error)
+      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error)
+      __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_pt, __pyx_v_rect, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error)
       __pyx_v_self->min_distance = (__pyx_v_self->min_distance + __pyx_t_3);
 
-      /* "pyart/map/ckdtree.pyx":704
+      /* "pyart/map/ckdtree.pyx":705
  *             for i in range(rect.m):
  *                 self.min_distance += min_dist_point_interval_p(pt, rect, i, p)
  *                 self.max_distance += max_dist_point_interval_p(pt, rect, i, p)             # <<<<<<<<<<<<<<
  * 
  *     def __dealloc__(self):
  */
-      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error)
-      __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_pt, __pyx_v_rect, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error)
+      __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_v_i); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 705, __pyx_L1_error)
+      __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_pt, __pyx_v_rect, __pyx_t_9, __pyx_v_p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 705, __pyx_L1_error)
       __pyx_v_self->max_distance = (__pyx_v_self->max_distance + __pyx_t_3);
 
-      /* "pyart/map/ckdtree.pyx":702
+      /* "pyart/map/ckdtree.pyx":703
  *             self.min_distance = 0.
  *             self.max_distance = 0.
  *             for i in range(rect.m):             # <<<<<<<<<<<<<<
@@ -12739,7 +12739,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   }
   __pyx_L7:;
 
-  /* "pyart/map/ckdtree.pyx":672
+  /* "pyart/map/ckdtree.pyx":673
  *         return 0
  * 
  *     cdef init(self, np.float64_t *pt, Rectangle rect,             # <<<<<<<<<<<<<<
@@ -12762,7 +12762,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_init(st
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":706
+/* "pyart/map/ckdtree.pyx":707
  *                 self.max_distance += max_dist_point_interval_p(pt, rect, i, p)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -12789,16 +12789,16 @@ static void __pyx_pf_5pyart_3map_7ckdtree_24PointRectDistanceTracker___dealloc__
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":707
+  /* "pyart/map/ckdtree.pyx":708
  * 
  *     def __dealloc__(self):
  *         self._free_stack()             # <<<<<<<<<<<<<<
  * 
  *     cdef int push(self, np.intp_t direction,
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_free_stack(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 707, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_free_stack(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 708, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":706
+  /* "pyart/map/ckdtree.pyx":707
  *                 self.max_distance += max_dist_point_interval_p(pt, rect, i, p)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -12813,7 +12813,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_24PointRectDistanceTracker___dealloc__
   __pyx_L0:;
 }
 
-/* "pyart/map/ckdtree.pyx":709
+/* "pyart/map/ckdtree.pyx":710
  *         self._free_stack()
  * 
  *     cdef int push(self, np.intp_t direction,             # <<<<<<<<<<<<<<
@@ -12834,7 +12834,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("push", 1);
 
-  /* "pyart/map/ckdtree.pyx":714
+  /* "pyart/map/ckdtree.pyx":715
  * 
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:             # <<<<<<<<<<<<<<
@@ -12844,16 +12844,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_1 = (__pyx_v_self->stack_size == __pyx_v_self->stack_max_size);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":715
+    /* "pyart/map/ckdtree.pyx":716
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:
  *             self._resize_stack(self.stack_max_size * 2)             # <<<<<<<<<<<<<<
  * 
  *         cdef RP_stack_item *item = &self.stack[self.stack_size]
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_resize_stack(__pyx_v_self, (__pyx_v_self->stack_max_size * 2)); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 715, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->_resize_stack(__pyx_v_self, (__pyx_v_self->stack_max_size * 2)); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 716, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":714
+    /* "pyart/map/ckdtree.pyx":715
  * 
  *         # Push onto stack
  *         if self.stack_size == self.stack_max_size:             # <<<<<<<<<<<<<<
@@ -12862,7 +12862,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":717
+  /* "pyart/map/ckdtree.pyx":718
  *             self._resize_stack(self.stack_max_size * 2)
  * 
  *         cdef RP_stack_item *item = &self.stack[self.stack_size]             # <<<<<<<<<<<<<<
@@ -12871,7 +12871,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   __pyx_v_item = (&(__pyx_v_self->stack[__pyx_v_self->stack_size]));
 
-  /* "pyart/map/ckdtree.pyx":718
+  /* "pyart/map/ckdtree.pyx":719
  * 
  *         cdef RP_stack_item *item = &self.stack[self.stack_size]
  *         self.stack_size += 1             # <<<<<<<<<<<<<<
@@ -12880,7 +12880,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   __pyx_v_self->stack_size = (__pyx_v_self->stack_size + 1);
 
-  /* "pyart/map/ckdtree.pyx":720
+  /* "pyart/map/ckdtree.pyx":721
  *         self.stack_size += 1
  * 
  *         item.split_dim = split_dim             # <<<<<<<<<<<<<<
@@ -12889,7 +12889,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   __pyx_v_item->split_dim = __pyx_v_split_dim;
 
-  /* "pyart/map/ckdtree.pyx":721
+  /* "pyart/map/ckdtree.pyx":722
  * 
  *         item.split_dim = split_dim
  *         item.min_distance = self.min_distance             # <<<<<<<<<<<<<<
@@ -12899,7 +12899,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_3 = __pyx_v_self->min_distance;
   __pyx_v_item->min_distance = __pyx_t_3;
 
-  /* "pyart/map/ckdtree.pyx":722
+  /* "pyart/map/ckdtree.pyx":723
  *         item.split_dim = split_dim
  *         item.min_distance = self.min_distance
  *         item.max_distance = self.max_distance             # <<<<<<<<<<<<<<
@@ -12909,7 +12909,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_3 = __pyx_v_self->max_distance;
   __pyx_v_item->max_distance = __pyx_t_3;
 
-  /* "pyart/map/ckdtree.pyx":723
+  /* "pyart/map/ckdtree.pyx":724
  *         item.min_distance = self.min_distance
  *         item.max_distance = self.max_distance
  *         item.min_along_dim = self.rect.mins[split_dim]             # <<<<<<<<<<<<<<
@@ -12918,7 +12918,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   __pyx_v_item->min_along_dim = (__pyx_v_self->rect->mins[__pyx_v_split_dim]);
 
-  /* "pyart/map/ckdtree.pyx":724
+  /* "pyart/map/ckdtree.pyx":725
  *         item.max_distance = self.max_distance
  *         item.min_along_dim = self.rect.mins[split_dim]
  *         item.max_along_dim = self.rect.maxes[split_dim]             # <<<<<<<<<<<<<<
@@ -12927,7 +12927,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   __pyx_v_item->max_along_dim = (__pyx_v_self->rect->maxes[__pyx_v_split_dim]);
 
-  /* "pyart/map/ckdtree.pyx":726
+  /* "pyart/map/ckdtree.pyx":727
  *         item.max_along_dim = self.rect.maxes[split_dim]
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -12937,7 +12937,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_1 = (__pyx_v_self->p != __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":727
+    /* "pyart/map/ckdtree.pyx":728
  * 
  *         if self.p != infinity:
  *             self.min_distance -= min_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -12946,11 +12946,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 727, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 728, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->min_distance = (__pyx_v_self->min_distance - __pyx_t_3);
 
-    /* "pyart/map/ckdtree.pyx":728
+    /* "pyart/map/ckdtree.pyx":729
  *         if self.p != infinity:
  *             self.min_distance -= min_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
  *             self.max_distance -= max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -12959,11 +12959,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 728, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 729, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->max_distance = (__pyx_v_self->max_distance - __pyx_t_3);
 
-    /* "pyart/map/ckdtree.pyx":726
+    /* "pyart/map/ckdtree.pyx":727
  *         item.max_along_dim = self.rect.maxes[split_dim]
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -12972,7 +12972,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":730
+  /* "pyart/map/ckdtree.pyx":731
  *             self.max_distance -= max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
  * 
  *         if direction == LESS:             # <<<<<<<<<<<<<<
@@ -12982,7 +12982,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_1 = (__pyx_v_direction == __pyx_v_5pyart_3map_7ckdtree_LESS);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":731
+    /* "pyart/map/ckdtree.pyx":732
  * 
  *         if direction == LESS:
  *             self.rect.maxes[split_dim] = split_val             # <<<<<<<<<<<<<<
@@ -12991,7 +12991,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     (__pyx_v_self->rect->maxes[__pyx_v_split_dim]) = __pyx_v_split_val;
 
-    /* "pyart/map/ckdtree.pyx":730
+    /* "pyart/map/ckdtree.pyx":731
  *             self.max_distance -= max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
  * 
  *         if direction == LESS:             # <<<<<<<<<<<<<<
@@ -13001,7 +13001,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
     goto __pyx_L5;
   }
 
-  /* "pyart/map/ckdtree.pyx":733
+  /* "pyart/map/ckdtree.pyx":734
  *             self.rect.maxes[split_dim] = split_val
  *         else:
  *             self.rect.mins[split_dim] = split_val             # <<<<<<<<<<<<<<
@@ -13013,7 +13013,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   }
   __pyx_L5:;
 
-  /* "pyart/map/ckdtree.pyx":735
+  /* "pyart/map/ckdtree.pyx":736
  *             self.rect.mins[split_dim] = split_val
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -13023,7 +13023,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_t_1 = (__pyx_v_self->p != __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":736
+    /* "pyart/map/ckdtree.pyx":737
  * 
  *         if self.p != infinity:
  *             self.min_distance += min_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -13032,11 +13032,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 736, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 737, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->min_distance = (__pyx_v_self->min_distance + __pyx_t_3);
 
-    /* "pyart/map/ckdtree.pyx":737
+    /* "pyart/map/ckdtree.pyx":738
  *         if self.p != infinity:
  *             self.min_distance += min_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
  *             self.max_distance += max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)             # <<<<<<<<<<<<<<
@@ -13045,11 +13045,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 737, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_interval_p(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4), __pyx_v_split_dim, __pyx_v_self->p); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 738, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->max_distance = (__pyx_v_self->max_distance + __pyx_t_3);
 
-    /* "pyart/map/ckdtree.pyx":735
+    /* "pyart/map/ckdtree.pyx":736
  *             self.rect.mins[split_dim] = split_val
  * 
  *         if self.p != infinity:             # <<<<<<<<<<<<<<
@@ -13059,7 +13059,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
     goto __pyx_L6;
   }
 
-  /* "pyart/map/ckdtree.pyx":739
+  /* "pyart/map/ckdtree.pyx":740
  *             self.max_distance += max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
  *         else:
  *             self.min_distance = min_dist_point_rect_p_inf(self.pt, self.rect)             # <<<<<<<<<<<<<<
@@ -13069,11 +13069,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   /*else*/ {
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4)); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 739, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4)); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 740, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->min_distance = __pyx_t_3;
 
-    /* "pyart/map/ckdtree.pyx":740
+    /* "pyart/map/ckdtree.pyx":741
  *         else:
  *             self.min_distance = min_dist_point_rect_p_inf(self.pt, self.rect)
  *             self.max_distance = max_dist_point_rect_p_inf(self.pt, self.rect)             # <<<<<<<<<<<<<<
@@ -13082,13 +13082,13 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
  */
     __pyx_t_4 = ((PyObject *)__pyx_v_self->rect);
     __Pyx_INCREF(__pyx_t_4);
-    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4)); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 740, __pyx_L1_error)
+    __pyx_t_3 = __pyx_f_5pyart_3map_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_self->pt, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_4)); if (unlikely(__pyx_t_3 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 741, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_self->max_distance = __pyx_t_3;
   }
   __pyx_L6:;
 
-  /* "pyart/map/ckdtree.pyx":742
+  /* "pyart/map/ckdtree.pyx":743
  *             self.max_distance = max_dist_point_rect_p_inf(self.pt, self.rect)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -13098,7 +13098,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":709
+  /* "pyart/map/ckdtree.pyx":710
  *         self._free_stack()
  * 
  *     cdef int push(self, np.intp_t direction,             # <<<<<<<<<<<<<<
@@ -13116,7 +13116,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push(struct _
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":745
+/* "pyart/map/ckdtree.pyx":746
  * 
  * 
  *     cdef inline int push_less_of(self, innernode* node) except -1:             # <<<<<<<<<<<<<<
@@ -13131,18 +13131,18 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":746
+  /* "pyart/map/ckdtree.pyx":747
  * 
  *     cdef inline int push_less_of(self, innernode* node) except -1:
  *         return self.push(LESS, node.split_dim, node.split)             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_5pyart_3map_7ckdtree_LESS, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 746, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_5pyart_3map_7ckdtree_LESS, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 747, __pyx_L1_error)
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":745
+  /* "pyart/map/ckdtree.pyx":746
  * 
  * 
  *     cdef inline int push_less_of(self, innernode* node) except -1:             # <<<<<<<<<<<<<<
@@ -13158,7 +13158,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":749
+/* "pyart/map/ckdtree.pyx":750
  * 
  * 
  *     cdef inline int push_greater_of(self, innernode* node) except -1:             # <<<<<<<<<<<<<<
@@ -13173,18 +13173,18 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":750
+  /* "pyart/map/ckdtree.pyx":751
  * 
  *     cdef inline int push_greater_of(self, innernode* node) except -1:
  *         return self.push(GREATER, node.split_dim, node.split)             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_5pyart_3map_7ckdtree_GREATER, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 750, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_self->__pyx_vtab)->push(__pyx_v_self, __pyx_v_5pyart_3map_7ckdtree_GREATER, __pyx_v_node->split_dim, __pyx_v_node->split); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 751, __pyx_L1_error)
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":749
+  /* "pyart/map/ckdtree.pyx":750
  * 
  * 
  *     cdef inline int push_greater_of(self, innernode* node) except -1:             # <<<<<<<<<<<<<<
@@ -13200,7 +13200,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":753
+/* "pyart/map/ckdtree.pyx":754
  * 
  * 
  *     cdef inline int pop(self) except -1:             # <<<<<<<<<<<<<<
@@ -13218,7 +13218,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":754
+  /* "pyart/map/ckdtree.pyx":755
  * 
  *     cdef inline int pop(self) except -1:
  *         self.stack_size -= 1             # <<<<<<<<<<<<<<
@@ -13227,7 +13227,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
  */
   __pyx_v_self->stack_size = (__pyx_v_self->stack_size - 1);
 
-  /* "pyart/map/ckdtree.pyx":755
+  /* "pyart/map/ckdtree.pyx":756
  *     cdef inline int pop(self) except -1:
  *         self.stack_size -= 1
  *         assert self.stack_size >= 0             # <<<<<<<<<<<<<<
@@ -13239,14 +13239,14 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
     __pyx_t_1 = (__pyx_v_self->stack_size >= 0);
     if (unlikely(!__pyx_t_1)) {
       __Pyx_Raise(__pyx_builtin_AssertionError, 0, 0, 0);
-      __PYX_ERR(0, 755, __pyx_L1_error)
+      __PYX_ERR(0, 756, __pyx_L1_error)
     }
   }
   #else
-  if ((1)); else __PYX_ERR(0, 755, __pyx_L1_error)
+  if ((1)); else __PYX_ERR(0, 756, __pyx_L1_error)
   #endif
 
-  /* "pyart/map/ckdtree.pyx":757
+  /* "pyart/map/ckdtree.pyx":758
  *         assert self.stack_size >= 0
  * 
  *         cdef RP_stack_item* item = &self.stack[self.stack_size]             # <<<<<<<<<<<<<<
@@ -13255,7 +13255,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
  */
   __pyx_v_item = (&(__pyx_v_self->stack[__pyx_v_self->stack_size]));
 
-  /* "pyart/map/ckdtree.pyx":758
+  /* "pyart/map/ckdtree.pyx":759
  * 
  *         cdef RP_stack_item* item = &self.stack[self.stack_size]
  *         self.min_distance = item.min_distance             # <<<<<<<<<<<<<<
@@ -13265,7 +13265,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   __pyx_t_2 = __pyx_v_item->min_distance;
   __pyx_v_self->min_distance = __pyx_t_2;
 
-  /* "pyart/map/ckdtree.pyx":759
+  /* "pyart/map/ckdtree.pyx":760
  *         cdef RP_stack_item* item = &self.stack[self.stack_size]
  *         self.min_distance = item.min_distance
  *         self.max_distance = item.max_distance             # <<<<<<<<<<<<<<
@@ -13275,7 +13275,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   __pyx_t_2 = __pyx_v_item->max_distance;
   __pyx_v_self->max_distance = __pyx_t_2;
 
-  /* "pyart/map/ckdtree.pyx":760
+  /* "pyart/map/ckdtree.pyx":761
  *         self.min_distance = item.min_distance
  *         self.max_distance = item.max_distance
  *         self.rect.mins[item.split_dim] = item.min_along_dim             # <<<<<<<<<<<<<<
@@ -13285,7 +13285,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   __pyx_t_3 = __pyx_v_item->min_along_dim;
   (__pyx_v_self->rect->mins[__pyx_v_item->split_dim]) = __pyx_t_3;
 
-  /* "pyart/map/ckdtree.pyx":761
+  /* "pyart/map/ckdtree.pyx":762
  *         self.max_distance = item.max_distance
  *         self.rect.mins[item.split_dim] = item.min_along_dim
  *         self.rect.maxes[item.split_dim] = item.max_along_dim             # <<<<<<<<<<<<<<
@@ -13295,7 +13295,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   __pyx_t_3 = __pyx_v_item->max_along_dim;
   (__pyx_v_self->rect->maxes[__pyx_v_item->split_dim]) = __pyx_t_3;
 
-  /* "pyart/map/ckdtree.pyx":763
+  /* "pyart/map/ckdtree.pyx":764
  *         self.rect.maxes[item.split_dim] = item.max_along_dim
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -13305,7 +13305,7 @@ static CYTHON_INLINE int __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":753
+  /* "pyart/map/ckdtree.pyx":754
  * 
  * 
  *     cdef inline int pop(self) except -1:             # <<<<<<<<<<<<<<
@@ -13535,7 +13535,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_24PointRectDistanceTracker_4__set
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":845
+/* "pyart/map/ckdtree.pyx":846
  *     cdef np.intp_t* raw_indices
  * 
  *     def __init__(cKDTree self, data, np.intp_t leafsize=10):             # <<<<<<<<<<<<<<
@@ -13582,19 +13582,19 @@ static int __pyx_pw_5pyart_3map_7ckdtree_7cKDTree_1__init__(PyObject *__pyx_v_se
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 845, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 846, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_leafsize);
           if (value) { values[1] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 845, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 846, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 845, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 846, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -13607,14 +13607,14 @@ static int __pyx_pw_5pyart_3map_7ckdtree_7cKDTree_1__init__(PyObject *__pyx_v_se
     }
     __pyx_v_data = values[0];
     if (values[1]) {
-      __pyx_v_leafsize = __Pyx_PyInt_As_npy_intp(values[1]); if (unlikely((__pyx_v_leafsize == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 845, __pyx_L3_error)
+      __pyx_v_leafsize = __Pyx_PyInt_As_npy_intp(values[1]); if (unlikely((__pyx_v_leafsize == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 846, __pyx_L3_error)
     } else {
       __pyx_v_leafsize = ((__pyx_t_5numpy_intp_t)10);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 845, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 846, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -13662,54 +13662,54 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "pyart/map/ckdtree.pyx":846
+  /* "pyart/map/ckdtree.pyx":847
  * 
  *     def __init__(cKDTree self, data, np.intp_t leafsize=10):
  *         self.data = np.ascontiguousarray(data,dtype=np.float64)             # <<<<<<<<<<<<<<
  *         self.n, self.m = np.shape(self.data)
  *         self.leafsize = leafsize
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_v_data);
   __Pyx_GIVEREF(__pyx_v_data);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_data)) __PYX_ERR(0, 846, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 846, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_data)) __PYX_ERR(0, 847, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 846, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 846, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 846, __pyx_L1_error)
+  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 847, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_5);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->data);
   __Pyx_DECREF((PyObject *)__pyx_v_self->data);
   __pyx_v_self->data = ((PyArrayObject *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":847
+  /* "pyart/map/ckdtree.pyx":848
  *     def __init__(cKDTree self, data, np.intp_t leafsize=10):
  *         self.data = np.ascontiguousarray(data,dtype=np.float64)
  *         self.n, self.m = np.shape(self.data)             # <<<<<<<<<<<<<<
  *         self.leafsize = leafsize
  *         if self.leafsize<1:
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 847, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 848, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 847, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 848, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -13730,7 +13730,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     PyObject *__pyx_callargs[2] = {__pyx_t_3, ((PyObject *)__pyx_v_self->data)};
     __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 847, __pyx_L1_error)
+    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 848, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
@@ -13740,7 +13740,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     if (unlikely(size != 2)) {
       if (size > 2) __Pyx_RaiseTooManyValuesError(2);
       else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-      __PYX_ERR(0, 847, __pyx_L1_error)
+      __PYX_ERR(0, 848, __pyx_L1_error)
     }
     #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
     if (likely(PyTuple_CheckExact(sequence))) {
@@ -13753,15 +13753,15 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     __Pyx_INCREF(__pyx_t_1);
     __Pyx_INCREF(__pyx_t_3);
     #else
-    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 847, __pyx_L1_error)
+    __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 848, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_3 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 847, __pyx_L1_error)
+    __pyx_t_3 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 848, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     #endif
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   } else {
     Py_ssize_t index = -1;
-    __pyx_t_2 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 847, __pyx_L1_error)
+    __pyx_t_2 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 848, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_t_7 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2);
@@ -13769,7 +13769,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     __Pyx_GOTREF(__pyx_t_1);
     index = 1; __pyx_t_3 = __pyx_t_7(__pyx_t_2); if (unlikely(!__pyx_t_3)) goto __pyx_L3_unpacking_failed;
     __Pyx_GOTREF(__pyx_t_3);
-    if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_2), 2) < 0) __PYX_ERR(0, 847, __pyx_L1_error)
+    if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_2), 2) < 0) __PYX_ERR(0, 848, __pyx_L1_error)
     __pyx_t_7 = NULL;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     goto __pyx_L4_unpacking_done;
@@ -13777,17 +13777,17 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_t_7 = NULL;
     if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-    __PYX_ERR(0, 847, __pyx_L1_error)
+    __PYX_ERR(0, 848, __pyx_L1_error)
     __pyx_L4_unpacking_done:;
   }
-  __pyx_t_8 = __Pyx_PyInt_As_npy_intp(__pyx_t_1); if (unlikely((__pyx_t_8 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 847, __pyx_L1_error)
+  __pyx_t_8 = __Pyx_PyInt_As_npy_intp(__pyx_t_1); if (unlikely((__pyx_t_8 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 848, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_t_3); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 847, __pyx_L1_error)
+  __pyx_t_9 = __Pyx_PyInt_As_npy_intp(__pyx_t_3); if (unlikely((__pyx_t_9 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 848, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_self->n = __pyx_t_8;
   __pyx_v_self->m = __pyx_t_9;
 
-  /* "pyart/map/ckdtree.pyx":848
+  /* "pyart/map/ckdtree.pyx":849
  *         self.data = np.ascontiguousarray(data,dtype=np.float64)
  *         self.n, self.m = np.shape(self.data)
  *         self.leafsize = leafsize             # <<<<<<<<<<<<<<
@@ -13796,7 +13796,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
  */
   __pyx_v_self->leafsize = __pyx_v_leafsize;
 
-  /* "pyart/map/ckdtree.pyx":849
+  /* "pyart/map/ckdtree.pyx":850
  *         self.n, self.m = np.shape(self.data)
  *         self.leafsize = leafsize
  *         if self.leafsize<1:             # <<<<<<<<<<<<<<
@@ -13806,20 +13806,20 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   __pyx_t_10 = (__pyx_v_self->leafsize < 1);
   if (unlikely(__pyx_t_10)) {
 
-    /* "pyart/map/ckdtree.pyx":850
+    /* "pyart/map/ckdtree.pyx":851
  *         self.leafsize = leafsize
  *         if self.leafsize<1:
  *             raise ValueError("leafsize must be at least 1")             # <<<<<<<<<<<<<<
  *         self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)
  *         self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)
  */
-    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 850, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_Raise(__pyx_t_5, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __PYX_ERR(0, 850, __pyx_L1_error)
+    __PYX_ERR(0, 851, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":849
+    /* "pyart/map/ckdtree.pyx":850
  *         self.n, self.m = np.shape(self.data)
  *         self.leafsize = leafsize
  *         if self.leafsize<1:             # <<<<<<<<<<<<<<
@@ -13828,152 +13828,152 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":851
+  /* "pyart/map/ckdtree.pyx":852
  *         if self.leafsize<1:
  *             raise ValueError("leafsize must be at least 1")
  *         self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)             # <<<<<<<<<<<<<<
  *         self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)
  *         self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.intp))
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_amax); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_amax); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_INCREF((PyObject *)__pyx_v_self->data);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->data);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_v_self->data))) __PYX_ERR(0, 851, __pyx_L1_error);
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 851, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_v_self->data))) __PYX_ERR(0, 852, __pyx_L1_error);
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_int_0) < 0) __PYX_ERR(0, 851, __pyx_L1_error)
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 851, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_int_0) < 0) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 851, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4)) __PYX_ERR(0, 852, __pyx_L1_error);
   __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_1) < 0) __PYX_ERR(0, 851, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_1) < 0) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 851, __pyx_L1_error)
+  if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 852, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_1);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_DECREF((PyObject *)__pyx_v_self->maxes);
   __pyx_v_self->maxes = ((PyArrayObject *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":852
+  /* "pyart/map/ckdtree.pyx":853
  *             raise ValueError("leafsize must be at least 1")
  *         self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)
  *         self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)             # <<<<<<<<<<<<<<
  *         self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.intp))
  * 
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_amin); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_amin); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF((PyObject *)__pyx_v_self->data);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->data);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->data))) __PYX_ERR(0, 852, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 852, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->data))) __PYX_ERR(0, 853, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_axis, __pyx_int_0) < 0) __PYX_ERR(0, 852, __pyx_L1_error)
-  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_axis, __pyx_int_0) < 0) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error);
   __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 852, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 852, __pyx_L1_error)
+  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 853, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->mins);
   __Pyx_DECREF((PyObject *)__pyx_v_self->mins);
   __pyx_v_self->mins = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":853
+  /* "pyart/map/ckdtree.pyx":854
  *         self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)
  *         self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)
  *         self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.intp))             # <<<<<<<<<<<<<<
  * 
  *         self.raw_data = <np.float64_t*>np.PyArray_DATA(self.data)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_arange); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_arange); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5)) __PYX_ERR(0, 854, __pyx_L1_error);
   __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
-  __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_intp); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_intp); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_12);
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_12) < 0) __PYX_ERR(0, 853, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_12) < 0) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
-  __pyx_t_12 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 853, __pyx_L1_error)
+  __pyx_t_12 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_12);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -13997,18 +13997,18 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
     __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 854, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
-  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 853, __pyx_L1_error)
+  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 854, __pyx_L1_error)
   __Pyx_GIVEREF(__pyx_t_2);
   __Pyx_GOTREF((PyObject *)__pyx_v_self->indices);
   __Pyx_DECREF((PyObject *)__pyx_v_self->indices);
   __pyx_v_self->indices = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":855
+  /* "pyart/map/ckdtree.pyx":856
  *         self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.intp))
  * 
  *         self.raw_data = <np.float64_t*>np.PyArray_DATA(self.data)             # <<<<<<<<<<<<<<
@@ -14020,7 +14020,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   __pyx_v_self->raw_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":856
+  /* "pyart/map/ckdtree.pyx":857
  * 
  *         self.raw_data = <np.float64_t*>np.PyArray_DATA(self.data)
  *         self.raw_maxes = <np.float64_t*>np.PyArray_DATA(self.maxes)             # <<<<<<<<<<<<<<
@@ -14032,7 +14032,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   __pyx_v_self->raw_maxes = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":857
+  /* "pyart/map/ckdtree.pyx":858
  *         self.raw_data = <np.float64_t*>np.PyArray_DATA(self.data)
  *         self.raw_maxes = <np.float64_t*>np.PyArray_DATA(self.maxes)
  *         self.raw_mins = <np.float64_t*>np.PyArray_DATA(self.mins)             # <<<<<<<<<<<<<<
@@ -14044,7 +14044,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   __pyx_v_self->raw_mins = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":858
+  /* "pyart/map/ckdtree.pyx":859
  *         self.raw_maxes = <np.float64_t*>np.PyArray_DATA(self.maxes)
  *         self.raw_mins = <np.float64_t*>np.PyArray_DATA(self.mins)
  *         self.raw_indices = <np.intp_t*>np.PyArray_DATA(self.indices)             # <<<<<<<<<<<<<<
@@ -14056,17 +14056,17 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   __pyx_v_self->raw_indices = ((__pyx_t_5numpy_intp_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":860
+  /* "pyart/map/ckdtree.pyx":861
  *         self.raw_indices = <np.intp_t*>np.PyArray_DATA(self.indices)
  * 
  *         self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins)             # <<<<<<<<<<<<<<
  * 
  *     cdef innernode* __build(cKDTree self, np.intp_t start_idx, np.intp_t end_idx,
  */
-  __pyx_t_13 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, 0, __pyx_v_self->n, __pyx_v_self->raw_maxes, __pyx_v_self->raw_mins); if (unlikely(__pyx_t_13 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 860, __pyx_L1_error)
+  __pyx_t_13 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, 0, __pyx_v_self->n, __pyx_v_self->raw_maxes, __pyx_v_self->raw_mins); if (unlikely(__pyx_t_13 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 861, __pyx_L1_error)
   __pyx_v_self->tree = __pyx_t_13;
 
-  /* "pyart/map/ckdtree.pyx":845
+  /* "pyart/map/ckdtree.pyx":846
  *     cdef np.intp_t* raw_indices
  * 
  *     def __init__(cKDTree self, data, np.intp_t leafsize=10):             # <<<<<<<<<<<<<<
@@ -14092,7 +14092,7 @@ static int __pyx_pf_5pyart_3map_7ckdtree_7cKDTree___init__(struct __pyx_obj_5pya
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":862
+/* "pyart/map/ckdtree.pyx":863
  *         self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins)
  * 
  *     cdef innernode* __build(cKDTree self, np.intp_t start_idx, np.intp_t end_idx,             # <<<<<<<<<<<<<<
@@ -14132,7 +14132,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__build", 1);
 
-  /* "pyart/map/ckdtree.pyx":869
+  /* "pyart/map/ckdtree.pyx":870
  *         cdef np.float64_t size, split, minval, maxval
  *         cdef np.float64_t*mids
  *         if end_idx-start_idx<=self.leafsize:             # <<<<<<<<<<<<<<
@@ -14142,7 +14142,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
   __pyx_t_1 = ((__pyx_v_end_idx - __pyx_v_start_idx) <= __pyx_v_self->leafsize);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":870
+    /* "pyart/map/ckdtree.pyx":871
  *         cdef np.float64_t*mids
  *         if end_idx-start_idx<=self.leafsize:
  *             n = <leafnode*>stdlib.malloc(sizeof(leafnode))             # <<<<<<<<<<<<<<
@@ -14151,7 +14151,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_n = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_leafnode))));
 
-    /* "pyart/map/ckdtree.pyx":871
+    /* "pyart/map/ckdtree.pyx":872
  *         if end_idx-start_idx<=self.leafsize:
  *             n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *             if n == <leafnode*> NULL:             # <<<<<<<<<<<<<<
@@ -14161,16 +14161,16 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_t_1 = (__pyx_v_n == ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)NULL));
     if (unlikely(__pyx_t_1)) {
 
-      /* "pyart/map/ckdtree.pyx":872
+      /* "pyart/map/ckdtree.pyx":873
  *             n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *             if n == <leafnode*> NULL:
  *                 raise MemoryError             # <<<<<<<<<<<<<<
  *             n.split_dim = -1
  *             n.children = end_idx - start_idx
  */
-      PyErr_NoMemory(); __PYX_ERR(0, 872, __pyx_L1_error)
+      PyErr_NoMemory(); __PYX_ERR(0, 873, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":871
+      /* "pyart/map/ckdtree.pyx":872
  *         if end_idx-start_idx<=self.leafsize:
  *             n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *             if n == <leafnode*> NULL:             # <<<<<<<<<<<<<<
@@ -14179,7 +14179,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":873
+    /* "pyart/map/ckdtree.pyx":874
  *             if n == <leafnode*> NULL:
  *                 raise MemoryError
  *             n.split_dim = -1             # <<<<<<<<<<<<<<
@@ -14188,7 +14188,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_n->split_dim = -1L;
 
-    /* "pyart/map/ckdtree.pyx":874
+    /* "pyart/map/ckdtree.pyx":875
  *                 raise MemoryError
  *             n.split_dim = -1
  *             n.children = end_idx - start_idx             # <<<<<<<<<<<<<<
@@ -14197,7 +14197,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_n->children = (__pyx_v_end_idx - __pyx_v_start_idx);
 
-    /* "pyart/map/ckdtree.pyx":875
+    /* "pyart/map/ckdtree.pyx":876
  *             n.split_dim = -1
  *             n.children = end_idx - start_idx
  *             n.start_idx = start_idx             # <<<<<<<<<<<<<<
@@ -14206,7 +14206,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_n->start_idx = __pyx_v_start_idx;
 
-    /* "pyart/map/ckdtree.pyx":876
+    /* "pyart/map/ckdtree.pyx":877
  *             n.children = end_idx - start_idx
  *             n.start_idx = start_idx
  *             n.end_idx = end_idx             # <<<<<<<<<<<<<<
@@ -14215,7 +14215,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_n->end_idx = __pyx_v_end_idx;
 
-    /* "pyart/map/ckdtree.pyx":877
+    /* "pyart/map/ckdtree.pyx":878
  *             n.start_idx = start_idx
  *             n.end_idx = end_idx
  *             return <innernode*>n             # <<<<<<<<<<<<<<
@@ -14225,7 +14225,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_r = ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)__pyx_v_n);
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":869
+    /* "pyart/map/ckdtree.pyx":870
  *         cdef np.float64_t size, split, minval, maxval
  *         cdef np.float64_t*mids
  *         if end_idx-start_idx<=self.leafsize:             # <<<<<<<<<<<<<<
@@ -14234,7 +14234,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":879
+  /* "pyart/map/ckdtree.pyx":880
  *             return <innernode*>n
  *         else:
  *             d = 0             # <<<<<<<<<<<<<<
@@ -14244,7 +14244,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
   /*else*/ {
     __pyx_v_d = 0;
 
-    /* "pyart/map/ckdtree.pyx":880
+    /* "pyart/map/ckdtree.pyx":881
  *         else:
  *             d = 0
  *             size = 0             # <<<<<<<<<<<<<<
@@ -14253,7 +14253,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_size = 0.0;
 
-    /* "pyart/map/ckdtree.pyx":881
+    /* "pyart/map/ckdtree.pyx":882
  *             d = 0
  *             size = 0
  *             for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -14265,7 +14265,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":882
+      /* "pyart/map/ckdtree.pyx":883
  *             size = 0
  *             for i in range(self.m):
  *                 if maxes[i]-mins[i] > size:             # <<<<<<<<<<<<<<
@@ -14275,7 +14275,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_t_1 = (((__pyx_v_maxes[__pyx_v_i]) - (__pyx_v_mins[__pyx_v_i])) > __pyx_v_size);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":883
+        /* "pyart/map/ckdtree.pyx":884
  *             for i in range(self.m):
  *                 if maxes[i]-mins[i] > size:
  *                     d = i             # <<<<<<<<<<<<<<
@@ -14284,7 +14284,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_d = __pyx_v_i;
 
-        /* "pyart/map/ckdtree.pyx":884
+        /* "pyart/map/ckdtree.pyx":885
  *                 if maxes[i]-mins[i] > size:
  *                     d = i
  *                     size =  maxes[i]-mins[i]             # <<<<<<<<<<<<<<
@@ -14293,7 +14293,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_size = ((__pyx_v_maxes[__pyx_v_i]) - (__pyx_v_mins[__pyx_v_i]));
 
-        /* "pyart/map/ckdtree.pyx":882
+        /* "pyart/map/ckdtree.pyx":883
  *             size = 0
  *             for i in range(self.m):
  *                 if maxes[i]-mins[i] > size:             # <<<<<<<<<<<<<<
@@ -14303,7 +14303,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":885
+    /* "pyart/map/ckdtree.pyx":886
  *                     d = i
  *                     size =  maxes[i]-mins[i]
  *             maxval = maxes[d]             # <<<<<<<<<<<<<<
@@ -14312,7 +14312,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_maxval = (__pyx_v_maxes[__pyx_v_d]);
 
-    /* "pyart/map/ckdtree.pyx":886
+    /* "pyart/map/ckdtree.pyx":887
  *                     size =  maxes[i]-mins[i]
  *             maxval = maxes[d]
  *             minval = mins[d]             # <<<<<<<<<<<<<<
@@ -14321,7 +14321,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_minval = (__pyx_v_mins[__pyx_v_d]);
 
-    /* "pyart/map/ckdtree.pyx":887
+    /* "pyart/map/ckdtree.pyx":888
  *             maxval = maxes[d]
  *             minval = mins[d]
  *             if maxval==minval:             # <<<<<<<<<<<<<<
@@ -14331,7 +14331,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_t_1 = (__pyx_v_maxval == __pyx_v_minval);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":889
+      /* "pyart/map/ckdtree.pyx":890
  *             if maxval==minval:
  *                 # all points are identical; warn user?
  *                 n = <leafnode*>stdlib.malloc(sizeof(leafnode))             # <<<<<<<<<<<<<<
@@ -14340,7 +14340,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_n = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_leafnode))));
 
-      /* "pyart/map/ckdtree.pyx":890
+      /* "pyart/map/ckdtree.pyx":891
  *                 # all points are identical; warn user?
  *                 n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *                 if n == <leafnode*> NULL:             # <<<<<<<<<<<<<<
@@ -14350,16 +14350,16 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_t_1 = (__pyx_v_n == ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)NULL));
       if (unlikely(__pyx_t_1)) {
 
-        /* "pyart/map/ckdtree.pyx":891
+        /* "pyart/map/ckdtree.pyx":892
  *                 n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *                 if n == <leafnode*> NULL:
  *                     raise MemoryError             # <<<<<<<<<<<<<<
  *                 n.split_dim = -1
  *                 n.children = end_idx - start_idx
  */
-        PyErr_NoMemory(); __PYX_ERR(0, 891, __pyx_L1_error)
+        PyErr_NoMemory(); __PYX_ERR(0, 892, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":890
+        /* "pyart/map/ckdtree.pyx":891
  *                 # all points are identical; warn user?
  *                 n = <leafnode*>stdlib.malloc(sizeof(leafnode))
  *                 if n == <leafnode*> NULL:             # <<<<<<<<<<<<<<
@@ -14368,7 +14368,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":892
+      /* "pyart/map/ckdtree.pyx":893
  *                 if n == <leafnode*> NULL:
  *                     raise MemoryError
  *                 n.split_dim = -1             # <<<<<<<<<<<<<<
@@ -14377,7 +14377,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_n->split_dim = -1L;
 
-      /* "pyart/map/ckdtree.pyx":893
+      /* "pyart/map/ckdtree.pyx":894
  *                     raise MemoryError
  *                 n.split_dim = -1
  *                 n.children = end_idx - start_idx             # <<<<<<<<<<<<<<
@@ -14386,7 +14386,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_n->children = (__pyx_v_end_idx - __pyx_v_start_idx);
 
-      /* "pyart/map/ckdtree.pyx":894
+      /* "pyart/map/ckdtree.pyx":895
  *                 n.split_dim = -1
  *                 n.children = end_idx - start_idx
  *                 n.start_idx = start_idx             # <<<<<<<<<<<<<<
@@ -14395,7 +14395,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_n->start_idx = __pyx_v_start_idx;
 
-      /* "pyart/map/ckdtree.pyx":895
+      /* "pyart/map/ckdtree.pyx":896
  *                 n.children = end_idx - start_idx
  *                 n.start_idx = start_idx
  *                 n.end_idx = end_idx             # <<<<<<<<<<<<<<
@@ -14404,7 +14404,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_n->end_idx = __pyx_v_end_idx;
 
-      /* "pyart/map/ckdtree.pyx":896
+      /* "pyart/map/ckdtree.pyx":897
  *                 n.start_idx = start_idx
  *                 n.end_idx = end_idx
  *                 return <innernode*>n             # <<<<<<<<<<<<<<
@@ -14414,7 +14414,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_r = ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)__pyx_v_n);
       goto __pyx_L0;
 
-      /* "pyart/map/ckdtree.pyx":887
+      /* "pyart/map/ckdtree.pyx":888
  *             maxval = maxes[d]
  *             minval = mins[d]
  *             if maxval==minval:             # <<<<<<<<<<<<<<
@@ -14423,7 +14423,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":898
+    /* "pyart/map/ckdtree.pyx":899
  *                 return <innernode*>n
  * 
  *             split = (maxval+minval)/2             # <<<<<<<<<<<<<<
@@ -14432,7 +14432,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_split = ((__pyx_v_maxval + __pyx_v_minval) / 2.0);
 
-    /* "pyart/map/ckdtree.pyx":900
+    /* "pyart/map/ckdtree.pyx":901
  *             split = (maxval+minval)/2
  * 
  *             p = start_idx             # <<<<<<<<<<<<<<
@@ -14441,7 +14441,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_p = __pyx_v_start_idx;
 
-    /* "pyart/map/ckdtree.pyx":901
+    /* "pyart/map/ckdtree.pyx":902
  * 
  *             p = start_idx
  *             q = end_idx-1             # <<<<<<<<<<<<<<
@@ -14450,7 +14450,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_q = (__pyx_v_end_idx - 1);
 
-    /* "pyart/map/ckdtree.pyx":902
+    /* "pyart/map/ckdtree.pyx":903
  *             p = start_idx
  *             q = end_idx-1
  *             while p<=q:             # <<<<<<<<<<<<<<
@@ -14461,7 +14461,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_t_1 = (__pyx_v_p <= __pyx_v_q);
       if (!__pyx_t_1) break;
 
-      /* "pyart/map/ckdtree.pyx":903
+      /* "pyart/map/ckdtree.pyx":904
  *             q = end_idx-1
  *             while p<=q:
  *                 if self.raw_data[self.raw_indices[p]*self.m+d]<split:             # <<<<<<<<<<<<<<
@@ -14471,7 +14471,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_p]) * __pyx_v_self->m) + __pyx_v_d)]) < __pyx_v_split);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":904
+        /* "pyart/map/ckdtree.pyx":905
  *             while p<=q:
  *                 if self.raw_data[self.raw_indices[p]*self.m+d]<split:
  *                     p+=1             # <<<<<<<<<<<<<<
@@ -14480,7 +14480,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_p = (__pyx_v_p + 1);
 
-        /* "pyart/map/ckdtree.pyx":903
+        /* "pyart/map/ckdtree.pyx":904
  *             q = end_idx-1
  *             while p<=q:
  *                 if self.raw_data[self.raw_indices[p]*self.m+d]<split:             # <<<<<<<<<<<<<<
@@ -14490,7 +14490,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         goto __pyx_L12;
       }
 
-      /* "pyart/map/ckdtree.pyx":905
+      /* "pyart/map/ckdtree.pyx":906
  *                 if self.raw_data[self.raw_indices[p]*self.m+d]<split:
  *                     p+=1
  *                 elif self.raw_data[self.raw_indices[q]*self.m+d]>=split:             # <<<<<<<<<<<<<<
@@ -14500,7 +14500,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_q]) * __pyx_v_self->m) + __pyx_v_d)]) >= __pyx_v_split);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":906
+        /* "pyart/map/ckdtree.pyx":907
  *                     p+=1
  *                 elif self.raw_data[self.raw_indices[q]*self.m+d]>=split:
  *                     q-=1             # <<<<<<<<<<<<<<
@@ -14509,7 +14509,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_q = (__pyx_v_q - 1);
 
-        /* "pyart/map/ckdtree.pyx":905
+        /* "pyart/map/ckdtree.pyx":906
  *                 if self.raw_data[self.raw_indices[p]*self.m+d]<split:
  *                     p+=1
  *                 elif self.raw_data[self.raw_indices[q]*self.m+d]>=split:             # <<<<<<<<<<<<<<
@@ -14519,7 +14519,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         goto __pyx_L12;
       }
 
-      /* "pyart/map/ckdtree.pyx":908
+      /* "pyart/map/ckdtree.pyx":909
  *                     q-=1
  *                 else:
  *                     t = self.raw_indices[p]             # <<<<<<<<<<<<<<
@@ -14529,7 +14529,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       /*else*/ {
         __pyx_v_t = (__pyx_v_self->raw_indices[__pyx_v_p]);
 
-        /* "pyart/map/ckdtree.pyx":909
+        /* "pyart/map/ckdtree.pyx":910
  *                 else:
  *                     t = self.raw_indices[p]
  *                     self.raw_indices[p] = self.raw_indices[q]             # <<<<<<<<<<<<<<
@@ -14538,7 +14538,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         (__pyx_v_self->raw_indices[__pyx_v_p]) = (__pyx_v_self->raw_indices[__pyx_v_q]);
 
-        /* "pyart/map/ckdtree.pyx":910
+        /* "pyart/map/ckdtree.pyx":911
  *                     t = self.raw_indices[p]
  *                     self.raw_indices[p] = self.raw_indices[q]
  *                     self.raw_indices[q] = t             # <<<<<<<<<<<<<<
@@ -14547,7 +14547,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         (__pyx_v_self->raw_indices[__pyx_v_q]) = __pyx_v_t;
 
-        /* "pyart/map/ckdtree.pyx":911
+        /* "pyart/map/ckdtree.pyx":912
  *                     self.raw_indices[p] = self.raw_indices[q]
  *                     self.raw_indices[q] = t
  *                     p+=1             # <<<<<<<<<<<<<<
@@ -14556,7 +14556,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_p = (__pyx_v_p + 1);
 
-        /* "pyart/map/ckdtree.pyx":912
+        /* "pyart/map/ckdtree.pyx":913
  *                     self.raw_indices[q] = t
  *                     p+=1
  *                     q-=1             # <<<<<<<<<<<<<<
@@ -14568,7 +14568,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_L12:;
     }
 
-    /* "pyart/map/ckdtree.pyx":915
+    /* "pyart/map/ckdtree.pyx":916
  * 
  *             # slide midpoint if necessary
  *             if p==start_idx:             # <<<<<<<<<<<<<<
@@ -14578,7 +14578,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_t_1 = (__pyx_v_p == __pyx_v_start_idx);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":917
+      /* "pyart/map/ckdtree.pyx":918
  *             if p==start_idx:
  *                 # no points less than split
  *                 j = start_idx             # <<<<<<<<<<<<<<
@@ -14587,7 +14587,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_j = __pyx_v_start_idx;
 
-      /* "pyart/map/ckdtree.pyx":918
+      /* "pyart/map/ckdtree.pyx":919
  *                 # no points less than split
  *                 j = start_idx
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]             # <<<<<<<<<<<<<<
@@ -14596,7 +14596,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);
 
-      /* "pyart/map/ckdtree.pyx":919
+      /* "pyart/map/ckdtree.pyx":920
  *                 j = start_idx
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx+1, end_idx):             # <<<<<<<<<<<<<<
@@ -14608,7 +14608,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       for (__pyx_t_4 = (__pyx_v_start_idx + 1); __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
         __pyx_v_i = __pyx_t_4;
 
-        /* "pyart/map/ckdtree.pyx":920
+        /* "pyart/map/ckdtree.pyx":921
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx+1, end_idx):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]<split:             # <<<<<<<<<<<<<<
@@ -14618,7 +14618,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m) + __pyx_v_d)]) < __pyx_v_split);
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":921
+          /* "pyart/map/ckdtree.pyx":922
  *                 for i in range(start_idx+1, end_idx):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]<split:
  *                         j = i             # <<<<<<<<<<<<<<
@@ -14627,7 +14627,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           __pyx_v_j = __pyx_v_i;
 
-          /* "pyart/map/ckdtree.pyx":922
+          /* "pyart/map/ckdtree.pyx":923
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]<split:
  *                         j = i
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]             # <<<<<<<<<<<<<<
@@ -14636,7 +14636,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);
 
-          /* "pyart/map/ckdtree.pyx":920
+          /* "pyart/map/ckdtree.pyx":921
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx+1, end_idx):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]<split:             # <<<<<<<<<<<<<<
@@ -14646,7 +14646,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":923
+      /* "pyart/map/ckdtree.pyx":924
  *                         j = i
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 t = self.raw_indices[start_idx]             # <<<<<<<<<<<<<<
@@ -14655,7 +14655,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_t = (__pyx_v_self->raw_indices[__pyx_v_start_idx]);
 
-      /* "pyart/map/ckdtree.pyx":924
+      /* "pyart/map/ckdtree.pyx":925
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 t = self.raw_indices[start_idx]
  *                 self.raw_indices[start_idx] = self.raw_indices[j]             # <<<<<<<<<<<<<<
@@ -14664,7 +14664,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       (__pyx_v_self->raw_indices[__pyx_v_start_idx]) = (__pyx_v_self->raw_indices[__pyx_v_j]);
 
-      /* "pyart/map/ckdtree.pyx":925
+      /* "pyart/map/ckdtree.pyx":926
  *                 t = self.raw_indices[start_idx]
  *                 self.raw_indices[start_idx] = self.raw_indices[j]
  *                 self.raw_indices[j] = t             # <<<<<<<<<<<<<<
@@ -14673,7 +14673,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       (__pyx_v_self->raw_indices[__pyx_v_j]) = __pyx_v_t;
 
-      /* "pyart/map/ckdtree.pyx":926
+      /* "pyart/map/ckdtree.pyx":927
  *                 self.raw_indices[start_idx] = self.raw_indices[j]
  *                 self.raw_indices[j] = t
  *                 p = start_idx+1             # <<<<<<<<<<<<<<
@@ -14682,7 +14682,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_p = (__pyx_v_start_idx + 1);
 
-      /* "pyart/map/ckdtree.pyx":927
+      /* "pyart/map/ckdtree.pyx":928
  *                 self.raw_indices[j] = t
  *                 p = start_idx+1
  *                 q = start_idx             # <<<<<<<<<<<<<<
@@ -14691,7 +14691,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_q = __pyx_v_start_idx;
 
-      /* "pyart/map/ckdtree.pyx":915
+      /* "pyart/map/ckdtree.pyx":916
  * 
  *             # slide midpoint if necessary
  *             if p==start_idx:             # <<<<<<<<<<<<<<
@@ -14701,7 +14701,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       goto __pyx_L13;
     }
 
-    /* "pyart/map/ckdtree.pyx":928
+    /* "pyart/map/ckdtree.pyx":929
  *                 p = start_idx+1
  *                 q = start_idx
  *             elif p==end_idx:             # <<<<<<<<<<<<<<
@@ -14711,7 +14711,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_t_1 = (__pyx_v_p == __pyx_v_end_idx);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":930
+      /* "pyart/map/ckdtree.pyx":931
  *             elif p==end_idx:
  *                 # no points greater than split
  *                 j = end_idx-1             # <<<<<<<<<<<<<<
@@ -14720,7 +14720,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_j = (__pyx_v_end_idx - 1);
 
-      /* "pyart/map/ckdtree.pyx":931
+      /* "pyart/map/ckdtree.pyx":932
  *                 # no points greater than split
  *                 j = end_idx-1
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]             # <<<<<<<<<<<<<<
@@ -14729,7 +14729,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);
 
-      /* "pyart/map/ckdtree.pyx":932
+      /* "pyart/map/ckdtree.pyx":933
  *                 j = end_idx-1
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx, end_idx-1):             # <<<<<<<<<<<<<<
@@ -14741,7 +14741,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       for (__pyx_t_4 = __pyx_v_start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
         __pyx_v_i = __pyx_t_4;
 
-        /* "pyart/map/ckdtree.pyx":933
+        /* "pyart/map/ckdtree.pyx":934
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx, end_idx-1):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]>split:             # <<<<<<<<<<<<<<
@@ -14751,7 +14751,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m) + __pyx_v_d)]) > __pyx_v_split);
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":934
+          /* "pyart/map/ckdtree.pyx":935
  *                 for i in range(start_idx, end_idx-1):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]>split:
  *                         j = i             # <<<<<<<<<<<<<<
@@ -14760,7 +14760,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           __pyx_v_j = __pyx_v_i;
 
-          /* "pyart/map/ckdtree.pyx":935
+          /* "pyart/map/ckdtree.pyx":936
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]>split:
  *                         j = i
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]             # <<<<<<<<<<<<<<
@@ -14769,7 +14769,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);
 
-          /* "pyart/map/ckdtree.pyx":933
+          /* "pyart/map/ckdtree.pyx":934
  *                 split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 for i in range(start_idx, end_idx-1):
  *                     if self.raw_data[self.raw_indices[i]*self.m+d]>split:             # <<<<<<<<<<<<<<
@@ -14779,7 +14779,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":936
+      /* "pyart/map/ckdtree.pyx":937
  *                         j = i
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 t = self.raw_indices[end_idx-1]             # <<<<<<<<<<<<<<
@@ -14788,7 +14788,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_t = (__pyx_v_self->raw_indices[(__pyx_v_end_idx - 1)]);
 
-      /* "pyart/map/ckdtree.pyx":937
+      /* "pyart/map/ckdtree.pyx":938
  *                         split = self.raw_data[self.raw_indices[j]*self.m+d]
  *                 t = self.raw_indices[end_idx-1]
  *                 self.raw_indices[end_idx-1] = self.raw_indices[j]             # <<<<<<<<<<<<<<
@@ -14797,7 +14797,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       (__pyx_v_self->raw_indices[(__pyx_v_end_idx - 1)]) = (__pyx_v_self->raw_indices[__pyx_v_j]);
 
-      /* "pyart/map/ckdtree.pyx":938
+      /* "pyart/map/ckdtree.pyx":939
  *                 t = self.raw_indices[end_idx-1]
  *                 self.raw_indices[end_idx-1] = self.raw_indices[j]
  *                 self.raw_indices[j] = t             # <<<<<<<<<<<<<<
@@ -14806,7 +14806,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       (__pyx_v_self->raw_indices[__pyx_v_j]) = __pyx_v_t;
 
-      /* "pyart/map/ckdtree.pyx":939
+      /* "pyart/map/ckdtree.pyx":940
  *                 self.raw_indices[end_idx-1] = self.raw_indices[j]
  *                 self.raw_indices[j] = t
  *                 p = end_idx-1             # <<<<<<<<<<<<<<
@@ -14815,7 +14815,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_p = (__pyx_v_end_idx - 1);
 
-      /* "pyart/map/ckdtree.pyx":940
+      /* "pyart/map/ckdtree.pyx":941
  *                 self.raw_indices[j] = t
  *                 p = end_idx-1
  *                 q = end_idx-2             # <<<<<<<<<<<<<<
@@ -14824,7 +14824,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       __pyx_v_q = (__pyx_v_end_idx - 2);
 
-      /* "pyart/map/ckdtree.pyx":928
+      /* "pyart/map/ckdtree.pyx":929
  *                 p = start_idx+1
  *                 q = start_idx
  *             elif p==end_idx:             # <<<<<<<<<<<<<<
@@ -14834,7 +14834,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     }
     __pyx_L13:;
 
-    /* "pyart/map/ckdtree.pyx":943
+    /* "pyart/map/ckdtree.pyx":944
  * 
  *             # construct new node representation
  *             ni = <innernode*>stdlib.malloc(sizeof(innernode))             # <<<<<<<<<<<<<<
@@ -14843,7 +14843,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_ni = ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)malloc((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_innernode))));
 
-    /* "pyart/map/ckdtree.pyx":944
+    /* "pyart/map/ckdtree.pyx":945
  *             # construct new node representation
  *             ni = <innernode*>stdlib.malloc(sizeof(innernode))
  *             if ni ==  <innernode*> NULL:             # <<<<<<<<<<<<<<
@@ -14853,16 +14853,16 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     __pyx_t_1 = (__pyx_v_ni == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL));
     if (unlikely(__pyx_t_1)) {
 
-      /* "pyart/map/ckdtree.pyx":945
+      /* "pyart/map/ckdtree.pyx":946
  *             ni = <innernode*>stdlib.malloc(sizeof(innernode))
  *             if ni ==  <innernode*> NULL:
  *                 raise MemoryError             # <<<<<<<<<<<<<<
  * 
  *             try:
  */
-      PyErr_NoMemory(); __PYX_ERR(0, 945, __pyx_L1_error)
+      PyErr_NoMemory(); __PYX_ERR(0, 946, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":944
+      /* "pyart/map/ckdtree.pyx":945
  *             # construct new node representation
  *             ni = <innernode*>stdlib.malloc(sizeof(innernode))
  *             if ni ==  <innernode*> NULL:             # <<<<<<<<<<<<<<
@@ -14871,7 +14871,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":947
+    /* "pyart/map/ckdtree.pyx":948
  *                 raise MemoryError
  * 
  *             try:             # <<<<<<<<<<<<<<
@@ -14887,7 +14887,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __Pyx_XGOTREF(__pyx_t_7);
       /*try:*/ {
 
-        /* "pyart/map/ckdtree.pyx":948
+        /* "pyart/map/ckdtree.pyx":949
  * 
  *             try:
  *                 mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)             # <<<<<<<<<<<<<<
@@ -14896,7 +14896,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_mids = ((__pyx_t_5numpy_float64_t *)malloc(((sizeof(__pyx_t_5numpy_float64_t)) * __pyx_v_self->m)));
 
-        /* "pyart/map/ckdtree.pyx":949
+        /* "pyart/map/ckdtree.pyx":950
  *             try:
  *                 mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)
  *                 if mids == <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -14906,16 +14906,16 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = (__pyx_v_mids == ((__pyx_t_5numpy_float64_t *)NULL));
         if (unlikely(__pyx_t_1)) {
 
-          /* "pyart/map/ckdtree.pyx":950
+          /* "pyart/map/ckdtree.pyx":951
  *                 mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)
  *                 if mids == <np.float64_t*> NULL:
  *                     raise MemoryError             # <<<<<<<<<<<<<<
  * 
  *                 for i in range(self.m):
  */
-          PyErr_NoMemory(); __PYX_ERR(0, 950, __pyx_L21_error)
+          PyErr_NoMemory(); __PYX_ERR(0, 951, __pyx_L21_error)
 
-          /* "pyart/map/ckdtree.pyx":949
+          /* "pyart/map/ckdtree.pyx":950
  *             try:
  *                 mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)
  *                 if mids == <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -14924,7 +14924,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":952
+        /* "pyart/map/ckdtree.pyx":953
  *                     raise MemoryError
  * 
  *                 for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -14936,7 +14936,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
           __pyx_v_i = __pyx_t_4;
 
-          /* "pyart/map/ckdtree.pyx":953
+          /* "pyart/map/ckdtree.pyx":954
  * 
  *                 for i in range(self.m):
  *                     mids[i] = maxes[i]             # <<<<<<<<<<<<<<
@@ -14946,7 +14946,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
           (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_maxes[__pyx_v_i]);
         }
 
-        /* "pyart/map/ckdtree.pyx":954
+        /* "pyart/map/ckdtree.pyx":955
  *                 for i in range(self.m):
  *                     mids[i] = maxes[i]
  *                 mids[d] = split             # <<<<<<<<<<<<<<
@@ -14955,17 +14955,17 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;
 
-        /* "pyart/map/ckdtree.pyx":955
+        /* "pyart/map/ckdtree.pyx":956
  *                     mids[i] = maxes[i]
  *                 mids[d] = split
  *                 ni.less = self.__build(start_idx,p,mids,mins)             # <<<<<<<<<<<<<<
  * 
  *                 for i in range(self.m):
  */
-        __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, __pyx_v_start_idx, __pyx_v_p, __pyx_v_mids, __pyx_v_mins); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 955, __pyx_L21_error)
+        __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, __pyx_v_start_idx, __pyx_v_p, __pyx_v_mids, __pyx_v_mins); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 956, __pyx_L21_error)
         __pyx_v_ni->less = __pyx_t_8;
 
-        /* "pyart/map/ckdtree.pyx":957
+        /* "pyart/map/ckdtree.pyx":958
  *                 ni.less = self.__build(start_idx,p,mids,mins)
  * 
  *                 for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -14977,7 +14977,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
           __pyx_v_i = __pyx_t_4;
 
-          /* "pyart/map/ckdtree.pyx":958
+          /* "pyart/map/ckdtree.pyx":959
  * 
  *                 for i in range(self.m):
  *                     mids[i] = mins[i]             # <<<<<<<<<<<<<<
@@ -14987,7 +14987,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
           (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_mins[__pyx_v_i]);
         }
 
-        /* "pyart/map/ckdtree.pyx":959
+        /* "pyart/map/ckdtree.pyx":960
  *                 for i in range(self.m):
  *                     mids[i] = mins[i]
  *                 mids[d] = split             # <<<<<<<<<<<<<<
@@ -14996,17 +14996,17 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;
 
-        /* "pyart/map/ckdtree.pyx":960
+        /* "pyart/map/ckdtree.pyx":961
  *                     mids[i] = mins[i]
  *                 mids[d] = split
  *                 ni.greater = self.__build(p,end_idx,maxes,mids)             # <<<<<<<<<<<<<<
  * 
  *                 ni.children = ni.less.children + ni.greater.children
  */
-        __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, __pyx_v_p, __pyx_v_end_idx, __pyx_v_maxes, __pyx_v_mids); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 960, __pyx_L21_error)
+        __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__build(__pyx_v_self, __pyx_v_p, __pyx_v_end_idx, __pyx_v_maxes, __pyx_v_mids); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL)) && PyErr_Occurred())) __PYX_ERR(0, 961, __pyx_L21_error)
         __pyx_v_ni->greater = __pyx_t_8;
 
-        /* "pyart/map/ckdtree.pyx":962
+        /* "pyart/map/ckdtree.pyx":963
  *                 ni.greater = self.__build(p,end_idx,maxes,mids)
  * 
  *                 ni.children = ni.less.children + ni.greater.children             # <<<<<<<<<<<<<<
@@ -15015,7 +15015,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         __pyx_v_ni->children = (__pyx_v_ni->less->children + __pyx_v_ni->greater->children);
 
-        /* "pyart/map/ckdtree.pyx":947
+        /* "pyart/map/ckdtree.pyx":948
  *                 raise MemoryError
  * 
  *             try:             # <<<<<<<<<<<<<<
@@ -15024,7 +15024,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":972
+      /* "pyart/map/ckdtree.pyx":973
  *                 raise
  *             else:
  *                 if mids != <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -15035,7 +15035,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = (__pyx_v_mids != ((__pyx_t_5numpy_float64_t *)NULL));
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":973
+          /* "pyart/map/ckdtree.pyx":974
  *             else:
  *                 if mids != <np.float64_t*> NULL:
  *                     stdlib.free(mids)             # <<<<<<<<<<<<<<
@@ -15044,7 +15044,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           free(__pyx_v_mids);
 
-          /* "pyart/map/ckdtree.pyx":972
+          /* "pyart/map/ckdtree.pyx":973
  *                 raise
  *             else:
  *                 if mids != <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -15059,7 +15059,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       goto __pyx_L26_try_end;
       __pyx_L21_error:;
 
-      /* "pyart/map/ckdtree.pyx":964
+      /* "pyart/map/ckdtree.pyx":965
  *                 ni.children = ni.less.children + ni.greater.children
  * 
  *             except:             # <<<<<<<<<<<<<<
@@ -15068,12 +15068,12 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
       /*except:*/ {
         __Pyx_AddTraceback("pyart.map.ckdtree.cKDTree._cKDTree__build", __pyx_clineno, __pyx_lineno, __pyx_filename);
-        if (__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0) __PYX_ERR(0, 964, __pyx_L23_except_error)
+        if (__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0) __PYX_ERR(0, 965, __pyx_L23_except_error)
         __Pyx_XGOTREF(__pyx_t_9);
         __Pyx_XGOTREF(__pyx_t_10);
         __Pyx_XGOTREF(__pyx_t_11);
 
-        /* "pyart/map/ckdtree.pyx":966
+        /* "pyart/map/ckdtree.pyx":967
  *             except:
  *                 # free ni if it cannot be returned
  *                 if ni !=  <innernode*> NULL:             # <<<<<<<<<<<<<<
@@ -15083,7 +15083,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = (__pyx_v_ni != ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)NULL));
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":967
+          /* "pyart/map/ckdtree.pyx":968
  *                 # free ni if it cannot be returned
  *                 if ni !=  <innernode*> NULL:
  *                     stdlib.free(mids)             # <<<<<<<<<<<<<<
@@ -15092,7 +15092,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           free(__pyx_v_mids);
 
-          /* "pyart/map/ckdtree.pyx":966
+          /* "pyart/map/ckdtree.pyx":967
  *             except:
  *                 # free ni if it cannot be returned
  *                 if ni !=  <innernode*> NULL:             # <<<<<<<<<<<<<<
@@ -15101,7 +15101,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":968
+        /* "pyart/map/ckdtree.pyx":969
  *                 if ni !=  <innernode*> NULL:
  *                     stdlib.free(mids)
  *                 if mids != <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -15111,7 +15111,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __pyx_t_1 = (__pyx_v_mids != ((__pyx_t_5numpy_float64_t *)NULL));
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":969
+          /* "pyart/map/ckdtree.pyx":970
  *                     stdlib.free(mids)
  *                 if mids != <np.float64_t*> NULL:
  *                     stdlib.free(mids)             # <<<<<<<<<<<<<<
@@ -15120,7 +15120,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
           free(__pyx_v_mids);
 
-          /* "pyart/map/ckdtree.pyx":968
+          /* "pyart/map/ckdtree.pyx":969
  *                 if ni !=  <innernode*> NULL:
  *                     stdlib.free(mids)
  *                 if mids != <np.float64_t*> NULL:             # <<<<<<<<<<<<<<
@@ -15129,7 +15129,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":970
+        /* "pyart/map/ckdtree.pyx":971
  *                 if mids != <np.float64_t*> NULL:
  *                     stdlib.free(mids)
  *                 raise             # <<<<<<<<<<<<<<
@@ -15141,10 +15141,10 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
         __Pyx_XGIVEREF(__pyx_t_11);
         __Pyx_ErrRestoreWithState(__pyx_t_9, __pyx_t_10, __pyx_t_11);
         __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; 
-        __PYX_ERR(0, 970, __pyx_L23_except_error)
+        __PYX_ERR(0, 971, __pyx_L23_except_error)
       }
 
-      /* "pyart/map/ckdtree.pyx":947
+      /* "pyart/map/ckdtree.pyx":948
  *                 raise MemoryError
  * 
  *             try:             # <<<<<<<<<<<<<<
@@ -15160,7 +15160,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
       __pyx_L26_try_end:;
     }
 
-    /* "pyart/map/ckdtree.pyx":975
+    /* "pyart/map/ckdtree.pyx":976
  *                     stdlib.free(mids)
  * 
  *             ni.split_dim = d             # <<<<<<<<<<<<<<
@@ -15169,7 +15169,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_ni->split_dim = __pyx_v_d;
 
-    /* "pyart/map/ckdtree.pyx":976
+    /* "pyart/map/ckdtree.pyx":977
  * 
  *             ni.split_dim = d
  *             ni.split = split             # <<<<<<<<<<<<<<
@@ -15178,7 +15178,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
  */
     __pyx_v_ni->split = __pyx_v_split;
 
-    /* "pyart/map/ckdtree.pyx":977
+    /* "pyart/map/ckdtree.pyx":978
  *             ni.split_dim = d
  *             ni.split = split
  *             return ni             # <<<<<<<<<<<<<<
@@ -15189,7 +15189,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
     goto __pyx_L0;
   }
 
-  /* "pyart/map/ckdtree.pyx":862
+  /* "pyart/map/ckdtree.pyx":863
  *         self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins)
  * 
  *     cdef innernode* __build(cKDTree self, np.intp_t start_idx, np.intp_t end_idx,             # <<<<<<<<<<<<<<
@@ -15209,7 +15209,7 @@ static struct __pyx_t_5pyart_3map_7ckdtree_innernode *__pyx_f_5pyart_3map_7ckdtr
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":979
+/* "pyart/map/ckdtree.pyx":980
  *             return ni
  * 
  *     cdef __free_tree(cKDTree self, innernode* node):             # <<<<<<<<<<<<<<
@@ -15227,7 +15227,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__free_tree(struc
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__free_tree", 1);
 
-  /* "pyart/map/ckdtree.pyx":980
+  /* "pyart/map/ckdtree.pyx":981
  * 
  *     cdef __free_tree(cKDTree self, innernode* node):
  *         if node.split_dim!=-1:             # <<<<<<<<<<<<<<
@@ -15237,29 +15237,29 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__free_tree(struc
   __pyx_t_1 = (__pyx_v_node->split_dim != -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":981
+    /* "pyart/map/ckdtree.pyx":982
  *     cdef __free_tree(cKDTree self, innernode* node):
  *         if node.split_dim!=-1:
  *             self.__free_tree(node.less)             # <<<<<<<<<<<<<<
  *             self.__free_tree(node.greater)
  *         stdlib.free(node)
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_node->less); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 981, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_node->less); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 982, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":982
+    /* "pyart/map/ckdtree.pyx":983
  *         if node.split_dim!=-1:
  *             self.__free_tree(node.less)
  *             self.__free_tree(node.greater)             # <<<<<<<<<<<<<<
  *         stdlib.free(node)
  * 
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_node->greater); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 982, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_node->greater); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 983, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":980
+    /* "pyart/map/ckdtree.pyx":981
  * 
  *     cdef __free_tree(cKDTree self, innernode* node):
  *         if node.split_dim!=-1:             # <<<<<<<<<<<<<<
@@ -15268,7 +15268,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__free_tree(struc
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":983
+  /* "pyart/map/ckdtree.pyx":984
  *             self.__free_tree(node.less)
  *             self.__free_tree(node.greater)
  *         stdlib.free(node)             # <<<<<<<<<<<<<<
@@ -15277,7 +15277,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__free_tree(struc
  */
   free(__pyx_v_node);
 
-  /* "pyart/map/ckdtree.pyx":979
+  /* "pyart/map/ckdtree.pyx":980
  *             return ni
  * 
  *     cdef __free_tree(cKDTree self, innernode* node):             # <<<<<<<<<<<<<<
@@ -15298,7 +15298,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__free_tree(struc
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":985
+/* "pyart/map/ckdtree.pyx":986
  *         stdlib.free(node)
  * 
  *     def __dealloc__(cKDTree self):             # <<<<<<<<<<<<<<
@@ -15328,7 +15328,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__dealloc__", 1);
 
-  /* "pyart/map/ckdtree.pyx":986
+  /* "pyart/map/ckdtree.pyx":987
  * 
  *     def __dealloc__(cKDTree self):
  *         if <np.intp_t>(self.tree) == 0:             # <<<<<<<<<<<<<<
@@ -15338,7 +15338,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj
   __pyx_t_1 = (((__pyx_t_5numpy_intp_t)__pyx_v_self->tree) == 0);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":988
+    /* "pyart/map/ckdtree.pyx":989
  *         if <np.intp_t>(self.tree) == 0:
  *             # should happen only if __init__ was never called
  *             return             # <<<<<<<<<<<<<<
@@ -15347,7 +15347,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj
  */
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":986
+    /* "pyart/map/ckdtree.pyx":987
  * 
  *     def __dealloc__(cKDTree self):
  *         if <np.intp_t>(self.tree) == 0:             # <<<<<<<<<<<<<<
@@ -15356,18 +15356,18 @@ static void __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":989
+  /* "pyart/map/ckdtree.pyx":990
  *             # should happen only if __init__ was never called
  *             return
  *         self.__free_tree(self.tree)             # <<<<<<<<<<<<<<
  * 
  *     # -----
  */
-  __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_self->tree); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 989, __pyx_L1_error)
+  __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__free_tree(__pyx_v_self, __pyx_v_self->tree); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 990, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":985
+  /* "pyart/map/ckdtree.pyx":986
  *         stdlib.free(node)
  * 
  *     def __dealloc__(cKDTree self):             # <<<<<<<<<<<<<<
@@ -15384,7 +15384,7 @@ static void __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj
   __Pyx_RefNannyFinishContext();
 }
 
-/* "pyart/map/ckdtree.pyx":995
+/* "pyart/map/ckdtree.pyx":996
  *     # -----
  * 
  *     cdef int __query(cKDTree self,             # <<<<<<<<<<<<<<
@@ -15437,34 +15437,34 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__query", 1);
 
-  /* "pyart/map/ckdtree.pyx":1028
+  /* "pyart/map/ckdtree.pyx":1029
  *         #  distances between the nearest side of the cell and the target
  *         #  the head node of the cell
  *         q = heap(12)             # <<<<<<<<<<<<<<
  * 
  *         # priority queue for the nearest neighbors
  */
-  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_heap), __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1028, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_heap), __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1029, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_q = ((struct __pyx_obj_5pyart_3map_7ckdtree_heap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1033
+  /* "pyart/map/ckdtree.pyx":1034
  *         # furthest known neighbor first
  *         # entries are (-distance**p, i)
  *         neighbors = heap(k)             # <<<<<<<<<<<<<<
  * 
  *         inf = inf2 = <nodeinfo*> NULL
  */
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1033, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1034, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_heap), __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1033, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_heap), __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1034, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_neighbors = ((struct __pyx_obj_5pyart_3map_7ckdtree_heap *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1035
+  /* "pyart/map/ckdtree.pyx":1036
  *         neighbors = heap(k)
  * 
  *         inf = inf2 = <nodeinfo*> NULL             # <<<<<<<<<<<<<<
@@ -15474,7 +15474,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
   __pyx_v_inf = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
   __pyx_v_inf2 = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
 
-  /* "pyart/map/ckdtree.pyx":1037
+  /* "pyart/map/ckdtree.pyx":1038
  *         inf = inf2 = <nodeinfo*> NULL
  * 
  *         try:             # <<<<<<<<<<<<<<
@@ -15483,7 +15483,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
   /*try:*/ {
 
-    /* "pyart/map/ckdtree.pyx":1039
+    /* "pyart/map/ckdtree.pyx":1040
  *         try:
  *             # set up first nodeinfo
  *             inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))             # <<<<<<<<<<<<<<
@@ -15492,7 +15492,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
     __pyx_v_inf = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t))))));
 
-    /* "pyart/map/ckdtree.pyx":1040
+    /* "pyart/map/ckdtree.pyx":1041
  *             # set up first nodeinfo
  *             inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *             if inf == <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -15502,16 +15502,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_t_3 = (__pyx_v_inf == ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
     if (unlikely(__pyx_t_3)) {
 
-      /* "pyart/map/ckdtree.pyx":1041
+      /* "pyart/map/ckdtree.pyx":1042
  *             inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *             if inf == <nodeinfo*> NULL:
  *                 raise MemoryError             # <<<<<<<<<<<<<<
  *             inf.node = self.tree
  *             for i in range(self.m):
  */
-      PyErr_NoMemory(); __PYX_ERR(0, 1041, __pyx_L4_error)
+      PyErr_NoMemory(); __PYX_ERR(0, 1042, __pyx_L4_error)
 
-      /* "pyart/map/ckdtree.pyx":1040
+      /* "pyart/map/ckdtree.pyx":1041
  *             # set up first nodeinfo
  *             inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *             if inf == <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -15520,7 +15520,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":1042
+    /* "pyart/map/ckdtree.pyx":1043
  *             if inf == <nodeinfo*> NULL:
  *                 raise MemoryError
  *             inf.node = self.tree             # <<<<<<<<<<<<<<
@@ -15530,7 +15530,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_t_4 = __pyx_v_self->tree;
     __pyx_v_inf->node = __pyx_t_4;
 
-    /* "pyart/map/ckdtree.pyx":1043
+    /* "pyart/map/ckdtree.pyx":1044
  *                 raise MemoryError
  *             inf.node = self.tree
  *             for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -15542,7 +15542,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
       __pyx_v_i = __pyx_t_7;
 
-      /* "pyart/map/ckdtree.pyx":1044
+      /* "pyart/map/ckdtree.pyx":1045
  *             inf.node = self.tree
  *             for i in range(self.m):
  *                 inf.side_distances[i] = 0             # <<<<<<<<<<<<<<
@@ -15551,7 +15551,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
       (__pyx_v_inf->side_distances[__pyx_v_i]) = 0.0;
 
-      /* "pyart/map/ckdtree.pyx":1045
+      /* "pyart/map/ckdtree.pyx":1046
  *             for i in range(self.m):
  *                 inf.side_distances[i] = 0
  *                 t = x[i]-self.raw_maxes[i]             # <<<<<<<<<<<<<<
@@ -15560,7 +15560,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
       __pyx_v_t = ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_self->raw_maxes[__pyx_v_i]));
 
-      /* "pyart/map/ckdtree.pyx":1046
+      /* "pyart/map/ckdtree.pyx":1047
  *                 inf.side_distances[i] = 0
  *                 t = x[i]-self.raw_maxes[i]
  *                 if t>inf.side_distances[i]:             # <<<<<<<<<<<<<<
@@ -15570,7 +15570,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_3 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1047
+        /* "pyart/map/ckdtree.pyx":1048
  *                 t = x[i]-self.raw_maxes[i]
  *                 if t>inf.side_distances[i]:
  *                     inf.side_distances[i] = t             # <<<<<<<<<<<<<<
@@ -15579,7 +15579,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         (__pyx_v_inf->side_distances[__pyx_v_i]) = __pyx_v_t;
 
-        /* "pyart/map/ckdtree.pyx":1046
+        /* "pyart/map/ckdtree.pyx":1047
  *                 inf.side_distances[i] = 0
  *                 t = x[i]-self.raw_maxes[i]
  *                 if t>inf.side_distances[i]:             # <<<<<<<<<<<<<<
@@ -15589,7 +15589,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         goto __pyx_L9;
       }
 
-      /* "pyart/map/ckdtree.pyx":1049
+      /* "pyart/map/ckdtree.pyx":1050
  *                     inf.side_distances[i] = t
  *                 else:
  *                     t = self.raw_mins[i]-x[i]             # <<<<<<<<<<<<<<
@@ -15599,7 +15599,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       /*else*/ {
         __pyx_v_t = ((__pyx_v_self->raw_mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i]));
 
-        /* "pyart/map/ckdtree.pyx":1050
+        /* "pyart/map/ckdtree.pyx":1051
  *                 else:
  *                     t = self.raw_mins[i]-x[i]
  *                     if t>inf.side_distances[i]:             # <<<<<<<<<<<<<<
@@ -15609,7 +15609,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1051
+          /* "pyart/map/ckdtree.pyx":1052
  *                     t = self.raw_mins[i]-x[i]
  *                     if t>inf.side_distances[i]:
  *                         inf.side_distances[i] = t             # <<<<<<<<<<<<<<
@@ -15618,7 +15618,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           (__pyx_v_inf->side_distances[__pyx_v_i]) = __pyx_v_t;
 
-          /* "pyart/map/ckdtree.pyx":1050
+          /* "pyart/map/ckdtree.pyx":1051
  *                 else:
  *                     t = self.raw_mins[i]-x[i]
  *                     if t>inf.side_distances[i]:             # <<<<<<<<<<<<<<
@@ -15629,7 +15629,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       }
       __pyx_L9:;
 
-      /* "pyart/map/ckdtree.pyx":1052
+      /* "pyart/map/ckdtree.pyx":1053
  *                     if t>inf.side_distances[i]:
  *                         inf.side_distances[i] = t
  *                 if p!=1 and p!=infinity:             # <<<<<<<<<<<<<<
@@ -15647,7 +15647,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_L12_bool_binop_done:;
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1053
+        /* "pyart/map/ckdtree.pyx":1054
  *                         inf.side_distances[i] = t
  *                 if p!=1 and p!=infinity:
  *                     inf.side_distances[i]=inf.side_distances[i]**p             # <<<<<<<<<<<<<<
@@ -15656,7 +15656,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         (__pyx_v_inf->side_distances[__pyx_v_i]) = pow((__pyx_v_inf->side_distances[__pyx_v_i]), __pyx_v_p);
 
-        /* "pyart/map/ckdtree.pyx":1052
+        /* "pyart/map/ckdtree.pyx":1053
  *                     if t>inf.side_distances[i]:
  *                         inf.side_distances[i] = t
  *                 if p!=1 and p!=infinity:             # <<<<<<<<<<<<<<
@@ -15666,7 +15666,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":1056
+    /* "pyart/map/ckdtree.pyx":1057
  * 
  *             # compute first distance
  *             min_distance = 0.             # <<<<<<<<<<<<<<
@@ -15675,7 +15675,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
     __pyx_v_min_distance = 0.;
 
-    /* "pyart/map/ckdtree.pyx":1057
+    /* "pyart/map/ckdtree.pyx":1058
  *             # compute first distance
  *             min_distance = 0.
  *             for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -15687,7 +15687,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
       __pyx_v_i = __pyx_t_7;
 
-      /* "pyart/map/ckdtree.pyx":1058
+      /* "pyart/map/ckdtree.pyx":1059
  *             min_distance = 0.
  *             for i in range(self.m):
  *                 if p==infinity:             # <<<<<<<<<<<<<<
@@ -15697,17 +15697,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_3 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1059
+        /* "pyart/map/ckdtree.pyx":1060
  *             for i in range(self.m):
  *                 if p==infinity:
  *                     min_distance = dmax(min_distance,inf.side_distances[i])             # <<<<<<<<<<<<<<
  *                 else:
  *                     min_distance += inf.side_distances[i]
  */
-        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_distance, (__pyx_v_inf->side_distances[__pyx_v_i])); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1059, __pyx_L4_error)
+        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_distance, (__pyx_v_inf->side_distances[__pyx_v_i])); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1060, __pyx_L4_error)
         __pyx_v_min_distance = __pyx_t_9;
 
-        /* "pyart/map/ckdtree.pyx":1058
+        /* "pyart/map/ckdtree.pyx":1059
  *             min_distance = 0.
  *             for i in range(self.m):
  *                 if p==infinity:             # <<<<<<<<<<<<<<
@@ -15717,7 +15717,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         goto __pyx_L16;
       }
 
-      /* "pyart/map/ckdtree.pyx":1061
+      /* "pyart/map/ckdtree.pyx":1062
  *                     min_distance = dmax(min_distance,inf.side_distances[i])
  *                 else:
  *                     min_distance += inf.side_distances[i]             # <<<<<<<<<<<<<<
@@ -15730,7 +15730,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_L16:;
     }
 
-    /* "pyart/map/ckdtree.pyx":1064
+    /* "pyart/map/ckdtree.pyx":1065
  * 
  *             # fiddle approximation factor
  *             if eps==0:             # <<<<<<<<<<<<<<
@@ -15740,7 +15740,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_t_3 = (__pyx_v_eps == 0.0);
     if (__pyx_t_3) {
 
-      /* "pyart/map/ckdtree.pyx":1065
+      /* "pyart/map/ckdtree.pyx":1066
  *             # fiddle approximation factor
  *             if eps==0:
  *                 epsfac=1             # <<<<<<<<<<<<<<
@@ -15749,7 +15749,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
       __pyx_v_epsfac = 1.0;
 
-      /* "pyart/map/ckdtree.pyx":1064
+      /* "pyart/map/ckdtree.pyx":1065
  * 
  *             # fiddle approximation factor
  *             if eps==0:             # <<<<<<<<<<<<<<
@@ -15759,7 +15759,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       goto __pyx_L17;
     }
 
-    /* "pyart/map/ckdtree.pyx":1066
+    /* "pyart/map/ckdtree.pyx":1067
  *             if eps==0:
  *                 epsfac=1
  *             elif p==infinity:             # <<<<<<<<<<<<<<
@@ -15769,7 +15769,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_t_3 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
     if (__pyx_t_3) {
 
-      /* "pyart/map/ckdtree.pyx":1067
+      /* "pyart/map/ckdtree.pyx":1068
  *                 epsfac=1
  *             elif p==infinity:
  *                 epsfac = 1/(1+eps)             # <<<<<<<<<<<<<<
@@ -15779,11 +15779,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_9 = (1.0 + __pyx_v_eps);
       if (unlikely(__pyx_t_9 == 0)) {
         PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-        __PYX_ERR(0, 1067, __pyx_L4_error)
+        __PYX_ERR(0, 1068, __pyx_L4_error)
       }
       __pyx_v_epsfac = (1.0 / __pyx_t_9);
 
-      /* "pyart/map/ckdtree.pyx":1066
+      /* "pyart/map/ckdtree.pyx":1067
  *             if eps==0:
  *                 epsfac=1
  *             elif p==infinity:             # <<<<<<<<<<<<<<
@@ -15793,7 +15793,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       goto __pyx_L17;
     }
 
-    /* "pyart/map/ckdtree.pyx":1069
+    /* "pyart/map/ckdtree.pyx":1070
  *                 epsfac = 1/(1+eps)
  *             else:
  *                 epsfac = 1/(1+eps)**p             # <<<<<<<<<<<<<<
@@ -15804,13 +15804,13 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_9 = pow((1.0 + __pyx_v_eps), __pyx_v_p);
       if (unlikely(__pyx_t_9 == 0)) {
         PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-        __PYX_ERR(0, 1069, __pyx_L4_error)
+        __PYX_ERR(0, 1070, __pyx_L4_error)
       }
       __pyx_v_epsfac = (1.0 / __pyx_t_9);
     }
     __pyx_L17:;
 
-    /* "pyart/map/ckdtree.pyx":1072
+    /* "pyart/map/ckdtree.pyx":1073
  * 
  *             # internally we represent all distances as distance**p
  *             if p!=infinity and distance_upper_bound!=infinity:             # <<<<<<<<<<<<<<
@@ -15828,7 +15828,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_L19_bool_binop_done:;
     if (__pyx_t_3) {
 
-      /* "pyart/map/ckdtree.pyx":1073
+      /* "pyart/map/ckdtree.pyx":1074
  *             # internally we represent all distances as distance**p
  *             if p!=infinity and distance_upper_bound!=infinity:
  *                 distance_upper_bound = distance_upper_bound**p             # <<<<<<<<<<<<<<
@@ -15837,7 +15837,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
       __pyx_v_distance_upper_bound = pow(__pyx_v_distance_upper_bound, __pyx_v_p);
 
-      /* "pyart/map/ckdtree.pyx":1072
+      /* "pyart/map/ckdtree.pyx":1073
  * 
  *             # internally we represent all distances as distance**p
  *             if p!=infinity and distance_upper_bound!=infinity:             # <<<<<<<<<<<<<<
@@ -15846,7 +15846,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":1075
+    /* "pyart/map/ckdtree.pyx":1076
  *                 distance_upper_bound = distance_upper_bound**p
  * 
  *             while True:             # <<<<<<<<<<<<<<
@@ -15855,7 +15855,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
     while (1) {
 
-      /* "pyart/map/ckdtree.pyx":1076
+      /* "pyart/map/ckdtree.pyx":1077
  * 
  *             while True:
  *                 if inf.node.split_dim==-1:             # <<<<<<<<<<<<<<
@@ -15865,7 +15865,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_3 = (__pyx_v_inf->node->split_dim == -1L);
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1077
+        /* "pyart/map/ckdtree.pyx":1078
  *             while True:
  *                 if inf.node.split_dim==-1:
  *                     node = <leafnode*>inf.node             # <<<<<<<<<<<<<<
@@ -15874,7 +15874,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_node = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_inf->node);
 
-        /* "pyart/map/ckdtree.pyx":1080
+        /* "pyart/map/ckdtree.pyx":1081
  * 
  *                     # brute-force
  *                     for i in range(node.start_idx,node.end_idx):             # <<<<<<<<<<<<<<
@@ -15886,17 +15886,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         for (__pyx_t_7 = __pyx_v_node->start_idx; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
           __pyx_v_i = __pyx_t_7;
 
-          /* "pyart/map/ckdtree.pyx":1081
+          /* "pyart/map/ckdtree.pyx":1082
  *                     # brute-force
  *                     for i in range(node.start_idx,node.end_idx):
  *                         d = _distance_p(             # <<<<<<<<<<<<<<
  *                                 self.raw_data+self.raw_indices[i]*self.m,
  *                                 x,p,self.m,distance_upper_bound)
  */
-          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_x, __pyx_v_p, __pyx_v_self->m, __pyx_v_distance_upper_bound); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1081, __pyx_L4_error)
+          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_x, __pyx_v_p, __pyx_v_self->m, __pyx_v_distance_upper_bound); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1082, __pyx_L4_error)
           __pyx_v_d = __pyx_t_9;
 
-          /* "pyart/map/ckdtree.pyx":1085
+          /* "pyart/map/ckdtree.pyx":1086
  *                                 x,p,self.m,distance_upper_bound)
  * 
  *                         if d<distance_upper_bound:             # <<<<<<<<<<<<<<
@@ -15906,7 +15906,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           __pyx_t_3 = (__pyx_v_d < __pyx_v_distance_upper_bound);
           if (__pyx_t_3) {
 
-            /* "pyart/map/ckdtree.pyx":1087
+            /* "pyart/map/ckdtree.pyx":1088
  *                         if d<distance_upper_bound:
  *                             # replace furthest neighbor
  *                             if neighbors.n==k:             # <<<<<<<<<<<<<<
@@ -15916,16 +15916,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
             __pyx_t_3 = (__pyx_v_neighbors->n == __pyx_v_k);
             if (__pyx_t_3) {
 
-              /* "pyart/map/ckdtree.pyx":1088
+              /* "pyart/map/ckdtree.pyx":1089
  *                             # replace furthest neighbor
  *                             if neighbors.n==k:
  *                                 neighbors.remove()             # <<<<<<<<<<<<<<
  *                             neighbor.priority = -d
  *                             neighbor.contents.intdata = self.raw_indices[i]
  */
-              __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->remove(__pyx_v_neighbors); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1088, __pyx_L4_error)
+              __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->remove(__pyx_v_neighbors); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1089, __pyx_L4_error)
 
-              /* "pyart/map/ckdtree.pyx":1087
+              /* "pyart/map/ckdtree.pyx":1088
  *                         if d<distance_upper_bound:
  *                             # replace furthest neighbor
  *                             if neighbors.n==k:             # <<<<<<<<<<<<<<
@@ -15934,7 +15934,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
             }
 
-            /* "pyart/map/ckdtree.pyx":1089
+            /* "pyart/map/ckdtree.pyx":1090
  *                             if neighbors.n==k:
  *                                 neighbors.remove()
  *                             neighbor.priority = -d             # <<<<<<<<<<<<<<
@@ -15943,7 +15943,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
             __pyx_v_neighbor.priority = (-__pyx_v_d);
 
-            /* "pyart/map/ckdtree.pyx":1090
+            /* "pyart/map/ckdtree.pyx":1091
  *                                 neighbors.remove()
  *                             neighbor.priority = -d
  *                             neighbor.contents.intdata = self.raw_indices[i]             # <<<<<<<<<<<<<<
@@ -15952,16 +15952,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
             __pyx_v_neighbor.contents.intdata = (__pyx_v_self->raw_indices[__pyx_v_i]);
 
-            /* "pyart/map/ckdtree.pyx":1091
+            /* "pyart/map/ckdtree.pyx":1092
  *                             neighbor.priority = -d
  *                             neighbor.contents.intdata = self.raw_indices[i]
  *                             neighbors.push(neighbor)             # <<<<<<<<<<<<<<
  * 
  *                             # adjust upper bound for efficiency
  */
-            __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree_4heap_push(__pyx_v_neighbors, __pyx_v_neighbor); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1091, __pyx_L4_error)
+            __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree_4heap_push(__pyx_v_neighbors, __pyx_v_neighbor); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1092, __pyx_L4_error)
 
-            /* "pyart/map/ckdtree.pyx":1094
+            /* "pyart/map/ckdtree.pyx":1095
  * 
  *                             # adjust upper bound for efficiency
  *                             if neighbors.n==k:             # <<<<<<<<<<<<<<
@@ -15971,17 +15971,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
             __pyx_t_3 = (__pyx_v_neighbors->n == __pyx_v_k);
             if (__pyx_t_3) {
 
-              /* "pyart/map/ckdtree.pyx":1095
+              /* "pyart/map/ckdtree.pyx":1096
  *                             # adjust upper bound for efficiency
  *                             if neighbors.n==k:
  *                                 distance_upper_bound = -neighbors.peek().priority             # <<<<<<<<<<<<<<
  * 
  *                     # done with this node, get another
  */
-              __pyx_t_11 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->peek(__pyx_v_neighbors); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1095, __pyx_L4_error)
+              __pyx_t_11 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->peek(__pyx_v_neighbors); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1096, __pyx_L4_error)
               __pyx_v_distance_upper_bound = (-__pyx_t_11.priority);
 
-              /* "pyart/map/ckdtree.pyx":1094
+              /* "pyart/map/ckdtree.pyx":1095
  * 
  *                             # adjust upper bound for efficiency
  *                             if neighbors.n==k:             # <<<<<<<<<<<<<<
@@ -15990,7 +15990,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
             }
 
-            /* "pyart/map/ckdtree.pyx":1085
+            /* "pyart/map/ckdtree.pyx":1086
  *                                 x,p,self.m,distance_upper_bound)
  * 
  *                         if d<distance_upper_bound:             # <<<<<<<<<<<<<<
@@ -16000,7 +16000,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           }
         }
 
-        /* "pyart/map/ckdtree.pyx":1098
+        /* "pyart/map/ckdtree.pyx":1099
  * 
  *                     # done with this node, get another
  *                     stdlib.free(inf)             # <<<<<<<<<<<<<<
@@ -16009,7 +16009,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         free(__pyx_v_inf);
 
-        /* "pyart/map/ckdtree.pyx":1099
+        /* "pyart/map/ckdtree.pyx":1100
  *                     # done with this node, get another
  *                     stdlib.free(inf)
  *                     inf = <nodeinfo*> NULL             # <<<<<<<<<<<<<<
@@ -16018,7 +16018,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_inf = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
 
-        /* "pyart/map/ckdtree.pyx":1101
+        /* "pyart/map/ckdtree.pyx":1102
  *                     inf = <nodeinfo*> NULL
  * 
  *                     if q.n==0:             # <<<<<<<<<<<<<<
@@ -16028,7 +16028,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_q->n == 0);
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1103
+          /* "pyart/map/ckdtree.pyx":1104
  *                     if q.n==0:
  *                         # no more nodes to visit
  *                         break             # <<<<<<<<<<<<<<
@@ -16037,7 +16037,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           goto __pyx_L22_break;
 
-          /* "pyart/map/ckdtree.pyx":1101
+          /* "pyart/map/ckdtree.pyx":1102
  *                     inf = <nodeinfo*> NULL
  * 
  *                     if q.n==0:             # <<<<<<<<<<<<<<
@@ -16046,7 +16046,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":1105
+        /* "pyart/map/ckdtree.pyx":1106
  *                         break
  *                     else:
  *                         q.pop(&it)             # <<<<<<<<<<<<<<
@@ -16054,9 +16054,9 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  *                         min_distance = it.priority
  */
         /*else*/ {
-          __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_q->__pyx_vtab)->pop(__pyx_v_q, (&__pyx_v_it)); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1105, __pyx_L4_error)
+          __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_q->__pyx_vtab)->pop(__pyx_v_q, (&__pyx_v_it)); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1106, __pyx_L4_error)
 
-          /* "pyart/map/ckdtree.pyx":1106
+          /* "pyart/map/ckdtree.pyx":1107
  *                     else:
  *                         q.pop(&it)
  *                         inf = <nodeinfo*>it.contents.ptrdata             # <<<<<<<<<<<<<<
@@ -16065,7 +16065,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           __pyx_v_inf = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)__pyx_v_it.contents.ptrdata);
 
-          /* "pyart/map/ckdtree.pyx":1107
+          /* "pyart/map/ckdtree.pyx":1108
  *                         q.pop(&it)
  *                         inf = <nodeinfo*>it.contents.ptrdata
  *                         min_distance = it.priority             # <<<<<<<<<<<<<<
@@ -16076,7 +16076,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           __pyx_v_min_distance = __pyx_t_9;
         }
 
-        /* "pyart/map/ckdtree.pyx":1076
+        /* "pyart/map/ckdtree.pyx":1077
  * 
  *             while True:
  *                 if inf.node.split_dim==-1:             # <<<<<<<<<<<<<<
@@ -16086,7 +16086,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         goto __pyx_L23;
       }
 
-      /* "pyart/map/ckdtree.pyx":1109
+      /* "pyart/map/ckdtree.pyx":1110
  *                         min_distance = it.priority
  *                 else:
  *                     inode = <innernode*>inf.node             # <<<<<<<<<<<<<<
@@ -16096,7 +16096,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       /*else*/ {
         __pyx_v_inode = ((struct __pyx_t_5pyart_3map_7ckdtree_innernode *)__pyx_v_inf->node);
 
-        /* "pyart/map/ckdtree.pyx":1114
+        /* "pyart/map/ckdtree.pyx":1115
  *                     # but since the distance_upper_bound decreases, we might get
  *                     # here even if the cell's too far
  *                     if min_distance>distance_upper_bound*epsfac:             # <<<<<<<<<<<<<<
@@ -16106,7 +16106,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_min_distance > (__pyx_v_distance_upper_bound * __pyx_v_epsfac));
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1117
+          /* "pyart/map/ckdtree.pyx":1118
  * 
  *                         # since this is the nearest cell, we're done, bail out
  *                         stdlib.free(inf)             # <<<<<<<<<<<<<<
@@ -16115,7 +16115,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           free(__pyx_v_inf);
 
-          /* "pyart/map/ckdtree.pyx":1118
+          /* "pyart/map/ckdtree.pyx":1119
  *                         # since this is the nearest cell, we're done, bail out
  *                         stdlib.free(inf)
  *                         inf = <nodeinfo*> NULL             # <<<<<<<<<<<<<<
@@ -16124,7 +16124,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           __pyx_v_inf = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
 
-          /* "pyart/map/ckdtree.pyx":1121
+          /* "pyart/map/ckdtree.pyx":1122
  * 
  *                         # free all the nodes still on the heap
  *                         for i in range(q.n):             # <<<<<<<<<<<<<<
@@ -16136,7 +16136,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
             __pyx_v_i = __pyx_t_7;
 
-            /* "pyart/map/ckdtree.pyx":1122
+            /* "pyart/map/ckdtree.pyx":1123
  *                         # free all the nodes still on the heap
  *                         for i in range(q.n):
  *                             stdlib.free(q.heap[i].contents.ptrdata)             # <<<<<<<<<<<<<<
@@ -16145,7 +16145,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
             free((__pyx_v_q->heap[__pyx_v_i]).contents.ptrdata);
 
-            /* "pyart/map/ckdtree.pyx":1123
+            /* "pyart/map/ckdtree.pyx":1124
  *                         for i in range(q.n):
  *                             stdlib.free(q.heap[i].contents.ptrdata)
  *                             q.heap[i].contents.ptrdata = <char*> NULL             # <<<<<<<<<<<<<<
@@ -16155,7 +16155,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
             (__pyx_v_q->heap[__pyx_v_i]).contents.ptrdata = ((char *)NULL);
           }
 
-          /* "pyart/map/ckdtree.pyx":1124
+          /* "pyart/map/ckdtree.pyx":1125
  *                             stdlib.free(q.heap[i].contents.ptrdata)
  *                             q.heap[i].contents.ptrdata = <char*> NULL
  *                         break             # <<<<<<<<<<<<<<
@@ -16164,7 +16164,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           goto __pyx_L22_break;
 
-          /* "pyart/map/ckdtree.pyx":1114
+          /* "pyart/map/ckdtree.pyx":1115
  *                     # but since the distance_upper_bound decreases, we might get
  *                     # here even if the cell's too far
  *                     if min_distance>distance_upper_bound*epsfac:             # <<<<<<<<<<<<<<
@@ -16173,7 +16173,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":1127
+        /* "pyart/map/ckdtree.pyx":1128
  * 
  *                     # set up children for searching
  *                     if x[inode.split_dim]<inode.split:             # <<<<<<<<<<<<<<
@@ -16183,7 +16183,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = ((__pyx_v_x[__pyx_v_inode->split_dim]) < __pyx_v_inode->split);
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1128
+          /* "pyart/map/ckdtree.pyx":1129
  *                     # set up children for searching
  *                     if x[inode.split_dim]<inode.split:
  *                         near = inode.less             # <<<<<<<<<<<<<<
@@ -16193,7 +16193,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           __pyx_t_4 = __pyx_v_inode->less;
           __pyx_v_near = __pyx_t_4;
 
-          /* "pyart/map/ckdtree.pyx":1129
+          /* "pyart/map/ckdtree.pyx":1130
  *                     if x[inode.split_dim]<inode.split:
  *                         near = inode.less
  *                         far = inode.greater             # <<<<<<<<<<<<<<
@@ -16203,7 +16203,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           __pyx_t_4 = __pyx_v_inode->greater;
           __pyx_v_far = __pyx_t_4;
 
-          /* "pyart/map/ckdtree.pyx":1127
+          /* "pyart/map/ckdtree.pyx":1128
  * 
  *                     # set up children for searching
  *                     if x[inode.split_dim]<inode.split:             # <<<<<<<<<<<<<<
@@ -16213,7 +16213,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           goto __pyx_L33;
         }
 
-        /* "pyart/map/ckdtree.pyx":1131
+        /* "pyart/map/ckdtree.pyx":1132
  *                         far = inode.greater
  *                     else:
  *                         near = inode.greater             # <<<<<<<<<<<<<<
@@ -16224,7 +16224,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           __pyx_t_4 = __pyx_v_inode->greater;
           __pyx_v_near = __pyx_t_4;
 
-          /* "pyart/map/ckdtree.pyx":1132
+          /* "pyart/map/ckdtree.pyx":1133
  *                     else:
  *                         near = inode.greater
  *                         far = inode.less             # <<<<<<<<<<<<<<
@@ -16236,7 +16236,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         }
         __pyx_L33:;
 
-        /* "pyart/map/ckdtree.pyx":1137
+        /* "pyart/map/ckdtree.pyx":1138
  *                     # we're going here next, so no point pushing it on the queue
  *                     # no need to recompute the distance or the side_distances
  *                     inf.node = near             # <<<<<<<<<<<<<<
@@ -16245,7 +16245,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_inf->node = __pyx_v_near;
 
-        /* "pyart/map/ckdtree.pyx":1142
+        /* "pyart/map/ckdtree.pyx":1143
  *                     # on the split value; compute its distance and side_distances
  *                     # and push it on the queue if it's near enough
  *                     inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))             # <<<<<<<<<<<<<<
@@ -16254,7 +16254,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_inf2 = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t))))));
 
-        /* "pyart/map/ckdtree.pyx":1143
+        /* "pyart/map/ckdtree.pyx":1144
  *                     # and push it on the queue if it's near enough
  *                     inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *                     if inf2 == <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16264,16 +16264,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_inf2 == ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
         if (unlikely(__pyx_t_3)) {
 
-          /* "pyart/map/ckdtree.pyx":1144
+          /* "pyart/map/ckdtree.pyx":1145
  *                     inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *                     if inf2 == <nodeinfo*> NULL:
  *                         raise MemoryError             # <<<<<<<<<<<<<<
  * 
  *                     it2.contents.ptrdata = <char*> inf2
  */
-          PyErr_NoMemory(); __PYX_ERR(0, 1144, __pyx_L4_error)
+          PyErr_NoMemory(); __PYX_ERR(0, 1145, __pyx_L4_error)
 
-          /* "pyart/map/ckdtree.pyx":1143
+          /* "pyart/map/ckdtree.pyx":1144
  *                     # and push it on the queue if it's near enough
  *                     inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
  *                     if inf2 == <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16282,7 +16282,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":1146
+        /* "pyart/map/ckdtree.pyx":1147
  *                         raise MemoryError
  * 
  *                     it2.contents.ptrdata = <char*> inf2             # <<<<<<<<<<<<<<
@@ -16291,7 +16291,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_it2.contents.ptrdata = ((char *)__pyx_v_inf2);
 
-        /* "pyart/map/ckdtree.pyx":1147
+        /* "pyart/map/ckdtree.pyx":1148
  * 
  *                     it2.contents.ptrdata = <char*> inf2
  *                     inf2.node = far             # <<<<<<<<<<<<<<
@@ -16300,7 +16300,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_inf2->node = __pyx_v_far;
 
-        /* "pyart/map/ckdtree.pyx":1149
+        /* "pyart/map/ckdtree.pyx":1150
  *                     inf2.node = far
  *                     # most side distances unchanged
  *                     for i in range(self.m):             # <<<<<<<<<<<<<<
@@ -16312,7 +16312,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
           __pyx_v_i = __pyx_t_7;
 
-          /* "pyart/map/ckdtree.pyx":1150
+          /* "pyart/map/ckdtree.pyx":1151
  *                     # most side distances unchanged
  *                     for i in range(self.m):
  *                         inf2.side_distances[i] = inf.side_distances[i]             # <<<<<<<<<<<<<<
@@ -16322,7 +16322,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           (__pyx_v_inf2->side_distances[__pyx_v_i]) = (__pyx_v_inf->side_distances[__pyx_v_i]);
         }
 
-        /* "pyart/map/ckdtree.pyx":1154
+        /* "pyart/map/ckdtree.pyx":1155
  *                     # one side distance changes
  *                     # we can adjust the minimum distance without recomputing
  *                     if p == infinity:             # <<<<<<<<<<<<<<
@@ -16332,18 +16332,18 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_p == __pyx_v_5pyart_3map_7ckdtree_infinity);
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1157
+          /* "pyart/map/ckdtree.pyx":1158
  *                         # we never use side_distances in the l_infinity case
  *                         # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])
  *                         far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))             # <<<<<<<<<<<<<<
  *                     elif p == 1:
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])
  */
-          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1157, __pyx_L4_error)
-          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_distance, __pyx_t_9); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1157, __pyx_L4_error)
+          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1158, __pyx_L4_error)
+          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dmax(__pyx_v_min_distance, __pyx_t_9); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1158, __pyx_L4_error)
           __pyx_v_far_min_distance = __pyx_t_12;
 
-          /* "pyart/map/ckdtree.pyx":1154
+          /* "pyart/map/ckdtree.pyx":1155
  *                     # one side distance changes
  *                     # we can adjust the minimum distance without recomputing
  *                     if p == infinity:             # <<<<<<<<<<<<<<
@@ -16353,7 +16353,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           goto __pyx_L37;
         }
 
-        /* "pyart/map/ckdtree.pyx":1158
+        /* "pyart/map/ckdtree.pyx":1159
  *                         # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])
  *                         far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))
  *                     elif p == 1:             # <<<<<<<<<<<<<<
@@ -16363,17 +16363,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_p == 1.0);
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1159
+          /* "pyart/map/ckdtree.pyx":1160
  *                         far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))
  *                     elif p == 1:
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])             # <<<<<<<<<<<<<<
  *                         far_min_distance = min_distance - \
  *                             inf.side_distances[inode.split_dim] + \
  */
-          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1159, __pyx_L4_error)
+          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1160, __pyx_L4_error)
           (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = __pyx_t_12;
 
-          /* "pyart/map/ckdtree.pyx":1161
+          /* "pyart/map/ckdtree.pyx":1162
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])
  *                         far_min_distance = min_distance - \
  *                             inf.side_distances[inode.split_dim] + \             # <<<<<<<<<<<<<<
@@ -16382,7 +16382,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           __pyx_v_far_min_distance = ((__pyx_v_min_distance - (__pyx_v_inf->side_distances[__pyx_v_inode->split_dim])) + (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]));
 
-          /* "pyart/map/ckdtree.pyx":1158
+          /* "pyart/map/ckdtree.pyx":1159
  *                         # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])
  *                         far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))
  *                     elif p == 1:             # <<<<<<<<<<<<<<
@@ -16392,7 +16392,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           goto __pyx_L37;
         }
 
-        /* "pyart/map/ckdtree.pyx":1164
+        /* "pyart/map/ckdtree.pyx":1165
  *                             inf2.side_distances[inode.split_dim]
  *                     else:
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split -             # <<<<<<<<<<<<<<
@@ -16401,16 +16401,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         /*else*/ {
 
-          /* "pyart/map/ckdtree.pyx":1165
+          /* "pyart/map/ckdtree.pyx":1166
  *                     else:
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split -
  *                                                                     x[inode.split_dim])**p             # <<<<<<<<<<<<<<
  *                         far_min_distance = min_distance - \
  *                             inf.side_distances[inode.split_dim] + \
  */
-          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1164, __pyx_L4_error)
+          __pyx_t_12 = __pyx_f_5pyart_3map_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))); if (unlikely(__pyx_t_12 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1165, __pyx_L4_error)
 
-          /* "pyart/map/ckdtree.pyx":1164
+          /* "pyart/map/ckdtree.pyx":1165
  *                             inf2.side_distances[inode.split_dim]
  *                     else:
  *                         inf2.side_distances[inode.split_dim] = dabs(inode.split -             # <<<<<<<<<<<<<<
@@ -16419,7 +16419,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = pow(__pyx_t_12, __pyx_v_p);
 
-          /* "pyart/map/ckdtree.pyx":1167
+          /* "pyart/map/ckdtree.pyx":1168
  *                                                                     x[inode.split_dim])**p
  *                         far_min_distance = min_distance - \
  *                             inf.side_distances[inode.split_dim] + \             # <<<<<<<<<<<<<<
@@ -16430,7 +16430,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         }
         __pyx_L37:;
 
-        /* "pyart/map/ckdtree.pyx":1170
+        /* "pyart/map/ckdtree.pyx":1171
  *                             inf2.side_distances[inode.split_dim]
  * 
  *                     it2.priority = far_min_distance             # <<<<<<<<<<<<<<
@@ -16439,7 +16439,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         __pyx_v_it2.priority = __pyx_v_far_min_distance;
 
-        /* "pyart/map/ckdtree.pyx":1174
+        /* "pyart/map/ckdtree.pyx":1175
  * 
  *                     # far child might be too far, if so, don't bother pushing it
  *                     if far_min_distance<=distance_upper_bound*epsfac:             # <<<<<<<<<<<<<<
@@ -16449,16 +16449,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_far_min_distance <= (__pyx_v_distance_upper_bound * __pyx_v_epsfac));
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1175
+          /* "pyart/map/ckdtree.pyx":1176
  *                     # far child might be too far, if so, don't bother pushing it
  *                     if far_min_distance<=distance_upper_bound*epsfac:
  *                         q.push(it2)             # <<<<<<<<<<<<<<
  *                     else:
  *                         stdlib.free(inf2)
  */
-          __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree_4heap_push(__pyx_v_q, __pyx_v_it2); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1175, __pyx_L4_error)
+          __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree_4heap_push(__pyx_v_q, __pyx_v_it2); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1176, __pyx_L4_error)
 
-          /* "pyart/map/ckdtree.pyx":1174
+          /* "pyart/map/ckdtree.pyx":1175
  * 
  *                     # far child might be too far, if so, don't bother pushing it
  *                     if far_min_distance<=distance_upper_bound*epsfac:             # <<<<<<<<<<<<<<
@@ -16468,7 +16468,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
           goto __pyx_L38;
         }
 
-        /* "pyart/map/ckdtree.pyx":1177
+        /* "pyart/map/ckdtree.pyx":1178
  *                         q.push(it2)
  *                     else:
  *                         stdlib.free(inf2)             # <<<<<<<<<<<<<<
@@ -16478,7 +16478,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         /*else*/ {
           free(__pyx_v_inf2);
 
-          /* "pyart/map/ckdtree.pyx":1178
+          /* "pyart/map/ckdtree.pyx":1179
  *                     else:
  *                         stdlib.free(inf2)
  *                         inf2 = <nodeinfo*> NULL             # <<<<<<<<<<<<<<
@@ -16487,7 +16487,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           __pyx_v_inf2 = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
 
-          /* "pyart/map/ckdtree.pyx":1180
+          /* "pyart/map/ckdtree.pyx":1181
  *                         inf2 = <nodeinfo*> NULL
  *                         # just in case
  *                         it2.contents.ptrdata = <char*> NULL             # <<<<<<<<<<<<<<
@@ -16502,7 +16502,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     }
     __pyx_L22_break:;
 
-    /* "pyart/map/ckdtree.pyx":1183
+    /* "pyart/map/ckdtree.pyx":1184
  * 
  *             # fill output arrays with sorted neighbors
  *             for i in range(neighbors.n-1,-1,-1):             # <<<<<<<<<<<<<<
@@ -16512,16 +16512,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     for (__pyx_t_5 = (__pyx_v_neighbors->n - 1); __pyx_t_5 > -1L; __pyx_t_5-=1) {
       __pyx_v_i = __pyx_t_5;
 
-      /* "pyart/map/ckdtree.pyx":1184
+      /* "pyart/map/ckdtree.pyx":1185
  *             # fill output arrays with sorted neighbors
  *             for i in range(neighbors.n-1,-1,-1):
  *                 neighbors.pop(&neighbor)             # <<<<<<<<<<<<<<
  *                 result_indices[i] = neighbor.contents.intdata
  *                 if p==1 or p==infinity:
  */
-      __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->pop(__pyx_v_neighbors, (&__pyx_v_neighbor)); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1184, __pyx_L4_error)
+      __pyx_t_10 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_heap *)__pyx_v_neighbors->__pyx_vtab)->pop(__pyx_v_neighbors, (&__pyx_v_neighbor)); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 1185, __pyx_L4_error)
 
-      /* "pyart/map/ckdtree.pyx":1185
+      /* "pyart/map/ckdtree.pyx":1186
  *             for i in range(neighbors.n-1,-1,-1):
  *                 neighbors.pop(&neighbor)
  *                 result_indices[i] = neighbor.contents.intdata             # <<<<<<<<<<<<<<
@@ -16531,7 +16531,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_6 = __pyx_v_neighbor.contents.intdata;
       (__pyx_v_result_indices[__pyx_v_i]) = __pyx_t_6;
 
-      /* "pyart/map/ckdtree.pyx":1186
+      /* "pyart/map/ckdtree.pyx":1187
  *                 neighbors.pop(&neighbor)
  *                 result_indices[i] = neighbor.contents.intdata
  *                 if p==1 or p==infinity:             # <<<<<<<<<<<<<<
@@ -16549,7 +16549,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_L42_bool_binop_done:;
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1187
+        /* "pyart/map/ckdtree.pyx":1188
  *                 result_indices[i] = neighbor.contents.intdata
  *                 if p==1 or p==infinity:
  *                     result_distances[i] = -neighbor.priority             # <<<<<<<<<<<<<<
@@ -16558,7 +16558,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         (__pyx_v_result_distances[__pyx_v_i]) = (-__pyx_v_neighbor.priority);
 
-        /* "pyart/map/ckdtree.pyx":1186
+        /* "pyart/map/ckdtree.pyx":1187
  *                 neighbors.pop(&neighbor)
  *                 result_indices[i] = neighbor.contents.intdata
  *                 if p==1 or p==infinity:             # <<<<<<<<<<<<<<
@@ -16568,7 +16568,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         goto __pyx_L41;
       }
 
-      /* "pyart/map/ckdtree.pyx":1189
+      /* "pyart/map/ckdtree.pyx":1190
  *                     result_distances[i] = -neighbor.priority
  *                 else:
  *                     result_distances[i] = (-neighbor.priority)**(1./p)             # <<<<<<<<<<<<<<
@@ -16578,14 +16578,14 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       /*else*/ {
         if (unlikely(__pyx_v_p == 0)) {
           PyErr_SetString(PyExc_ZeroDivisionError, "float division");
-          __PYX_ERR(0, 1189, __pyx_L4_error)
+          __PYX_ERR(0, 1190, __pyx_L4_error)
         }
         (__pyx_v_result_distances[__pyx_v_i]) = pow((-__pyx_v_neighbor.priority), (((__pyx_t_5numpy_float64_t)1.) / __pyx_v_p));
       }
       __pyx_L41:;
     }
 
-    /* "pyart/map/ckdtree.pyx":1191
+    /* "pyart/map/ckdtree.pyx":1192
  *                     result_distances[i] = (-neighbor.priority)**(1./p)
  * 
  *             inf = inf2 = <nodeinfo*> NULL             # <<<<<<<<<<<<<<
@@ -16596,7 +16596,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_v_inf2 = ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL);
   }
 
-  /* "pyart/map/ckdtree.pyx":1194
+  /* "pyart/map/ckdtree.pyx":1195
  * 
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16608,7 +16608,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_3 = (__pyx_v_inf2 != ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1195
+        /* "pyart/map/ckdtree.pyx":1196
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:
  *                 stdlib.free(inf2)             # <<<<<<<<<<<<<<
@@ -16617,7 +16617,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         free(__pyx_v_inf2);
 
-        /* "pyart/map/ckdtree.pyx":1194
+        /* "pyart/map/ckdtree.pyx":1195
  * 
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16626,7 +16626,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":1197
+      /* "pyart/map/ckdtree.pyx":1198
  *                 stdlib.free(inf2)
  * 
  *             if inf != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16636,7 +16636,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_3 = (__pyx_v_inf != ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
       if (__pyx_t_3) {
 
-        /* "pyart/map/ckdtree.pyx":1198
+        /* "pyart/map/ckdtree.pyx":1199
  * 
  *             if inf != <nodeinfo*> NULL:
  *                 stdlib.free(inf)             # <<<<<<<<<<<<<<
@@ -16645,7 +16645,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         free(__pyx_v_inf);
 
-        /* "pyart/map/ckdtree.pyx":1197
+        /* "pyart/map/ckdtree.pyx":1198
  *                 stdlib.free(inf2)
  * 
  *             if inf != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16673,7 +16673,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
       __pyx_t_10 = __pyx_lineno; __pyx_t_13 = __pyx_clineno; __pyx_t_14 = __pyx_filename;
       {
 
-        /* "pyart/map/ckdtree.pyx":1194
+        /* "pyart/map/ckdtree.pyx":1195
  * 
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16683,7 +16683,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_inf2 != ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1195
+          /* "pyart/map/ckdtree.pyx":1196
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:
  *                 stdlib.free(inf2)             # <<<<<<<<<<<<<<
@@ -16692,7 +16692,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           free(__pyx_v_inf2);
 
-          /* "pyart/map/ckdtree.pyx":1194
+          /* "pyart/map/ckdtree.pyx":1195
  * 
  *         finally:
  *             if inf2 != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16701,7 +16701,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":1197
+        /* "pyart/map/ckdtree.pyx":1198
  *                 stdlib.free(inf2)
  * 
  *             if inf != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16711,7 +16711,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
         __pyx_t_3 = (__pyx_v_inf != ((struct __pyx_t_5pyart_3map_7ckdtree_nodeinfo *)NULL));
         if (__pyx_t_3) {
 
-          /* "pyart/map/ckdtree.pyx":1198
+          /* "pyart/map/ckdtree.pyx":1199
  * 
  *             if inf != <nodeinfo*> NULL:
  *                 stdlib.free(inf)             # <<<<<<<<<<<<<<
@@ -16720,7 +16720,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
  */
           free(__pyx_v_inf);
 
-          /* "pyart/map/ckdtree.pyx":1197
+          /* "pyart/map/ckdtree.pyx":1198
  *                 stdlib.free(inf2)
  * 
  *             if inf != <nodeinfo*> NULL:             # <<<<<<<<<<<<<<
@@ -16746,7 +16746,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
     __pyx_L5:;
   }
 
-  /* "pyart/map/ckdtree.pyx":1200
+  /* "pyart/map/ckdtree.pyx":1201
  *                 stdlib.free(inf)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -16756,7 +16756,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":995
+  /* "pyart/map/ckdtree.pyx":996
  *     # -----
  * 
  *     cdef int __query(cKDTree self,             # <<<<<<<<<<<<<<
@@ -16777,7 +16777,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1203
+/* "pyart/map/ckdtree.pyx":1204
  * 
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -16793,7 +16793,7 @@ PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
 PyObject *__pyx_args, PyObject *__pyx_kwds
 #endif
 ); /*proto*/
-PyDoc_STRVAR(__pyx_doc_5pyart_3map_7ckdtree_7cKDTree_4query, "query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n        \n        Query the kd-tree for nearest neighbors\n\n        Parameters\n        ----------\n        x : array_like, last dimension self.m\n            An array of points to query.\n        k : integer\n            The number of nearest neighbors to return.\n        eps : non-negative float\n            Return approximate nearest neighbors; the kth returned value \n            is guaranteed to be no further than (1+eps) times the \n            distance to the real k-th nearest neighbor.\n        p : float, 1<=p<=infinity\n            Which Minkowski p-norm to use. \n            1 is the sum-of-absolute-values \"Manhattan\" distance\n            2 is the usual Euclidean distance\n            infinity is the maximum-coordinate-difference distance\n        distance_upper_bound : nonnegative float\n            Return only neighbors within this distance.  This is used to prune\n            tree searches, so if you are doing a series of nearest-neighbor\n            queries, it may help to supply the distance to the nearest neighbor\n            of the most recent point.\n\n        Returns\n        -------\n        d : array of floats\n            The distances to the nearest neighbors. \n            If x has shape tuple+(self.m,), then d has shape tuple+(k,).\n            Missing neighbors are indicated with infinite distances.\n        i : ndarray of ints\n            The locations of the neighbors in self.data.\n            If `x` has shape tuple+(self.m,), then `i` has shape tuple+(k,).\n            Missing neighbors are indicated with self.n.\n\n        ");
+PyDoc_STRVAR(__pyx_doc_5pyart_3map_7ckdtree_7cKDTree_4query, "query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n\n        Query the kd-tree for nearest neighbors\n\n        Parameters\n        ----------\n        x : array_like, last dimension self.m\n            An array of points to query.\n        k : integer\n            The number of nearest neighbors to return.\n        eps : non-negative float\n            Return approximate nearest neighbors; the kth returned value\n            is guaranteed to be no further than (1+eps) times the\n            distance to the real k-th nearest neighbor.\n        p : float, 1<=p<=infinity\n            Which Minkowski p-norm to use.\n            1 is the sum-of-absolute-values \"Manhattan\" distance\n            2 is the usual Euclidean distance\n            infinity is the maximum-coordinate-difference distance\n        distance_upper_bound : nonnegative float\n            Return only neighbors within this distance.  This is used to prune\n            tree searches, so if you are doing a series of nearest-neighbor\n            queries, it may help to supply the distance to the nearest neighbor\n            of the most recent point.\n\n        Returns\n        -------\n        d : array of floats\n            The distances to the nearest neighbors.\n            If x has shape tuple+(self.m,), then d has shape tuple+(k,).\n            Missing neighbors are indicated with infinite distances.\n        i : ndarray of ints\n            The locations of the neighbors in self.data.\n            If `x` has shape tuple+(self.m,), then `i` has shape tuple+(k,).\n            Missing neighbors are indicated with self.n.\n\n        ");
 static PyMethodDef __pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_5query = {"query", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_5pyart_3map_7ckdtree_7cKDTree_5query, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_5pyart_3map_7ckdtree_7cKDTree_4query};
 static PyObject *__pyx_pw_5pyart_3map_7ckdtree_7cKDTree_5query(PyObject *__pyx_v_self, 
 #if CYTHON_METH_FASTCALL
@@ -16851,40 +16851,40 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1203, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1204, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_k);
           if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1203, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1204, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_eps);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1203, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1204, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[3] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1203, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1204, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  4:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_distance_upper_bound);
           if (value) { values[4] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1203, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1204, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query") < 0)) __PYX_ERR(0, 1203, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query") < 0)) __PYX_ERR(0, 1204, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -16903,29 +16903,29 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
     }
     __pyx_v_x = values[0];
     if (values[1]) {
-      __pyx_v_k = __Pyx_PyInt_As_npy_intp(values[1]); if (unlikely((__pyx_v_k == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1205, __pyx_L3_error)
+      __pyx_v_k = __Pyx_PyInt_As_npy_intp(values[1]); if (unlikely((__pyx_v_k == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1206, __pyx_L3_error)
     } else {
       __pyx_v_k = ((__pyx_t_5numpy_intp_t)1);
     }
     if (values[2]) {
-      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1205, __pyx_L3_error)
+      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1206, __pyx_L3_error)
     } else {
       __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);
     }
     if (values[3]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1206, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1207, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.0);
     }
     if (values[4]) {
-      __pyx_v_distance_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_distance_upper_bound == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1206, __pyx_L3_error)
+      __pyx_v_distance_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_distance_upper_bound == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1207, __pyx_L3_error)
     } else {
       __pyx_v_distance_upper_bound = __pyx_k__6;
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("query", 0, 1, 5, __pyx_nargs); __PYX_ERR(0, 1203, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("query", 0, 1, 5, __pyx_nargs); __PYX_ERR(0, 1204, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -17018,16 +17018,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
   __pyx_pybuffernd_xx.data = NULL;
   __pyx_pybuffernd_xx.rcbuffer = &__pyx_pybuffer_xx;
 
-  /* "pyart/map/ckdtree.pyx":1248
+  /* "pyart/map/ckdtree.pyx":1249
  *         cdef np.ndarray[np.float64_t, ndim=2] xx
  *         cdef np.intp_t c, n, i, j
  *         x = np.asarray(x).astype(np.float64)             # <<<<<<<<<<<<<<
  *         sh = np.shape(x)
  *         if sh[len(sh)-1] != self.m:
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1248, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1248, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -17048,16 +17048,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_x};
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1248, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1249, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_astype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1248, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_astype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1248, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1248, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1249, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = NULL;
@@ -17079,23 +17079,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1248, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1249, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
   __Pyx_DECREF_SET(__pyx_v_x, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1249
+  /* "pyart/map/ckdtree.pyx":1250
  *         cdef np.intp_t c, n, i, j
  *         x = np.asarray(x).astype(np.float64)
  *         sh = np.shape(x)             # <<<<<<<<<<<<<<
  *         if sh[len(sh)-1] != self.m:
  *             raise ValueError("x must consist of vectors of length %d but has"
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1249, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1249, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1250, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -17116,41 +17116,41 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_x};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1249, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1250, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __pyx_v_sh = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1250
+  /* "pyart/map/ckdtree.pyx":1251
  *         x = np.asarray(x).astype(np.float64)
  *         sh = np.shape(x)
  *         if sh[len(sh)-1] != self.m:             # <<<<<<<<<<<<<<
  *             raise ValueError("x must consist of vectors of length %d but has"
  *                              "shape %s" % (int(self.m), np.shape(x)))
  */
-  __pyx_t_6 = PyObject_Length(__pyx_v_sh); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1250, __pyx_L1_error)
+  __pyx_t_6 = PyObject_Length(__pyx_v_sh); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1251, __pyx_L1_error)
   __pyx_t_7 = (__pyx_t_6 - 1);
-  __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_sh, __pyx_t_7, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1250, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_sh, __pyx_t_7, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1250, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1251, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = PyObject_RichCompare(__pyx_t_1, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1250, __pyx_L1_error)
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_1, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1251, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 1250, __pyx_L1_error)
+  __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 1251, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (unlikely(__pyx_t_8)) {
 
-    /* "pyart/map/ckdtree.pyx":1251
+    /* "pyart/map/ckdtree.pyx":1252
  *         sh = np.shape(x)
  *         if sh[len(sh)-1] != self.m:
  *             raise ValueError("x must consist of vectors of length %d but has"             # <<<<<<<<<<<<<<
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:
  */
-    __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1251, __pyx_L1_error)
+    __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1252, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_7 = 0;
     __pyx_t_9 = 127;
@@ -17159,19 +17159,19 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __Pyx_GIVEREF(__pyx_kp_u_x_must_consist_of_vectors_of_len);
     PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_u_x_must_consist_of_vectors_of_len);
 
-    /* "pyart/map/ckdtree.pyx":1252
+    /* "pyart/map/ckdtree.pyx":1253
  *         if sh[len(sh)-1] != self.m:
  *             raise ValueError("x must consist of vectors of length %d but has"
  *                              "shape %s" % (int(self.m), np.shape(x)))             # <<<<<<<<<<<<<<
  *         if p < 1:
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")
  */
-    __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_9 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_3) > __pyx_t_9) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_3) : __pyx_t_9;
@@ -17183,9 +17183,9 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_7 += 14;
     __Pyx_GIVEREF(__pyx_kp_u_but_hasshape);
     PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_kp_u_but_hasshape);
-    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_1 = NULL;
@@ -17206,11 +17206,11 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       PyObject *__pyx_callargs[2] = {__pyx_t_1, __pyx_v_x};
       __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
       __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1252, __pyx_L1_error)
+      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1253, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_2 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Unicode(__pyx_t_3), __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1252, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Unicode(__pyx_t_3), __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1253, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_9 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_9) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_9;
@@ -17219,24 +17219,24 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1251
+    /* "pyart/map/ckdtree.pyx":1252
  *         sh = np.shape(x)
  *         if sh[len(sh)-1] != self.m:
  *             raise ValueError("x must consist of vectors of length %d but has"             # <<<<<<<<<<<<<<
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:
  */
-    __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_7, __pyx_t_9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1251, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_4, 4, __pyx_t_7, __pyx_t_9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1252, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1251, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1252, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(0, 1251, __pyx_L1_error)
+    __PYX_ERR(0, 1252, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1250
+    /* "pyart/map/ckdtree.pyx":1251
  *         x = np.asarray(x).astype(np.float64)
  *         sh = np.shape(x)
  *         if sh[len(sh)-1] != self.m:             # <<<<<<<<<<<<<<
@@ -17245,7 +17245,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1253
+  /* "pyart/map/ckdtree.pyx":1254
  *             raise ValueError("x must consist of vectors of length %d but has"
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:             # <<<<<<<<<<<<<<
@@ -17255,20 +17255,20 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
   __pyx_t_8 = (__pyx_v_p < 1.0);
   if (unlikely(__pyx_t_8)) {
 
-    /* "pyart/map/ckdtree.pyx":1254
+    /* "pyart/map/ckdtree.pyx":1255
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")             # <<<<<<<<<<<<<<
  *         if len(x.shape)==1:
  *             single = True
  */
-    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1254, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1255, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(0, 1254, __pyx_L1_error)
+    __PYX_ERR(0, 1255, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1253
+    /* "pyart/map/ckdtree.pyx":1254
  *             raise ValueError("x must consist of vectors of length %d but has"
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:             # <<<<<<<<<<<<<<
@@ -17277,21 +17277,21 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1255
+  /* "pyart/map/ckdtree.pyx":1256
  *         if p < 1:
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")
  *         if len(x.shape)==1:             # <<<<<<<<<<<<<<
  *             single = True
  *             x = x[np.newaxis,:]
  */
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1255, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1256, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_7 = PyObject_Length(__pyx_t_4); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1255, __pyx_L1_error)
+  __pyx_t_7 = PyObject_Length(__pyx_t_4); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1256, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_8 = (__pyx_t_7 == 1);
   if (__pyx_t_8) {
 
-    /* "pyart/map/ckdtree.pyx":1256
+    /* "pyart/map/ckdtree.pyx":1257
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")
  *         if len(x.shape)==1:
  *             single = True             # <<<<<<<<<<<<<<
@@ -17300,33 +17300,33 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
     __pyx_v_single = 1;
 
-    /* "pyart/map/ckdtree.pyx":1257
+    /* "pyart/map/ckdtree.pyx":1258
  *         if len(x.shape)==1:
  *             single = True
  *             x = x[np.newaxis,:]             # <<<<<<<<<<<<<<
  *         else:
  *             single = False
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1257, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1258, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_newaxis); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1257, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_newaxis); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1258, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1257, __pyx_L1_error)
+    __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1258, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_GIVEREF(__pyx_t_2);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 1257, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 1258, __pyx_L1_error);
     __Pyx_INCREF(__pyx_slice__8);
     __Pyx_GIVEREF(__pyx_slice__8);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_slice__8)) __PYX_ERR(0, 1257, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_slice__8)) __PYX_ERR(0, 1258, __pyx_L1_error);
     __pyx_t_2 = 0;
-    __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_x, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1257, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_x, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1258, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF_SET(__pyx_v_x, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1255
+    /* "pyart/map/ckdtree.pyx":1256
  *         if p < 1:
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")
  *         if len(x.shape)==1:             # <<<<<<<<<<<<<<
@@ -17336,7 +17336,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     goto __pyx_L5;
   }
 
-  /* "pyart/map/ckdtree.pyx":1259
+  /* "pyart/map/ckdtree.pyx":1260
  *             x = x[np.newaxis,:]
  *         else:
  *             single = False             # <<<<<<<<<<<<<<
@@ -17348,16 +17348,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
   }
   __pyx_L5:;
 
-  /* "pyart/map/ckdtree.pyx":1260
+  /* "pyart/map/ckdtree.pyx":1261
  *         else:
  *             single = False
  *         sh = np.shape(x)             # <<<<<<<<<<<<<<
  *         retshape = sh[len(sh) - 1]
  *         n = <np.intp_t> np.prod(retshape)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1260, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1261, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1260, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1261, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -17378,37 +17378,37 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_x};
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1260, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1261, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __Pyx_DECREF_SET(__pyx_v_sh, __pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1261
+  /* "pyart/map/ckdtree.pyx":1262
  *             single = False
  *         sh = np.shape(x)
  *         retshape = sh[len(sh) - 1]             # <<<<<<<<<<<<<<
  *         n = <np.intp_t> np.prod(retshape)
  *         xx = np.reshape(x,(n,self.m))
  */
-  __pyx_t_7 = PyObject_Length(__pyx_v_sh); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1261, __pyx_L1_error)
+  __pyx_t_7 = PyObject_Length(__pyx_v_sh); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1262, __pyx_L1_error)
   __pyx_t_6 = (__pyx_t_7 - 1);
-  __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_sh, __pyx_t_6, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1261, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_sh, __pyx_t_6, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1262, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_v_retshape = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1262
+  /* "pyart/map/ckdtree.pyx":1263
  *         sh = np.shape(x)
  *         retshape = sh[len(sh) - 1]
  *         n = <np.intp_t> np.prod(retshape)             # <<<<<<<<<<<<<<
  *         xx = np.reshape(x,(n,self.m))
  *         xx = np.ascontiguousarray(xx,dtype=np.float64)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1262, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1263, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prod); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1262, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_prod); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1263, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -17429,36 +17429,36 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_retshape};
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1262, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1263, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
-  __pyx_t_10 = __Pyx_PyInt_As_npy_intp(__pyx_t_2); if (unlikely((__pyx_t_10 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1262, __pyx_L1_error)
+  __pyx_t_10 = __Pyx_PyInt_As_npy_intp(__pyx_t_2); if (unlikely((__pyx_t_10 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1263, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_n = ((__pyx_t_5numpy_intp_t)__pyx_t_10);
 
-  /* "pyart/map/ckdtree.pyx":1263
+  /* "pyart/map/ckdtree.pyx":1264
  *         retshape = sh[len(sh) - 1]
  *         n = <np.intp_t> np.prod(retshape)
  *         xx = np.reshape(x,(n,self.m))             # <<<<<<<<<<<<<<
  *         xx = np.ascontiguousarray(xx,dtype=np.float64)
  *         dd = np.empty((n,k),dtype=np.float64)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1263, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1264, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1263, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1264, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1263, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1264, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1263, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1264, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1263, __pyx_L1_error)
+  __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1264, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1263, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1264, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1)) __PYX_ERR(0, 1263, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1)) __PYX_ERR(0, 1264, __pyx_L1_error);
   __pyx_t_4 = 0;
   __pyx_t_1 = 0;
   __pyx_t_1 = NULL;
@@ -17480,11 +17480,11 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1263, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1264, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
-  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1263, __pyx_L1_error)
+  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1264, __pyx_L1_error)
   __pyx_t_12 = ((PyArrayObject *)__pyx_t_2);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -17501,44 +17501,44 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_13 = __pyx_t_14 = __pyx_t_15 = 0;
     }
     __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_xx.diminfo[1].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_xx.diminfo[1].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[1];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1263, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1264, __pyx_L1_error)
   }
   __pyx_t_12 = 0;
   __pyx_v_xx = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1264
+  /* "pyart/map/ckdtree.pyx":1265
  *         n = <np.intp_t> np.prod(retshape)
  *         xx = np.reshape(x,(n,self.m))
  *         xx = np.ascontiguousarray(xx,dtype=np.float64)             # <<<<<<<<<<<<<<
  *         dd = np.empty((n,k),dtype=np.float64)
  *         dd.fill(infinity)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_xx);
   __Pyx_GIVEREF((PyObject *)__pyx_v_xx);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_xx))) __PYX_ERR(0, 1264, __pyx_L1_error);
-  __pyx_t_11 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_xx))) __PYX_ERR(0, 1265, __pyx_L1_error);
+  __pyx_t_11 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 1264, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1264, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1264, __pyx_L1_error)
+  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1265, __pyx_L1_error)
   __pyx_t_12 = ((PyArrayObject *)__pyx_t_4);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -17555,56 +17555,56 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_15 = __pyx_t_14 = __pyx_t_13 = 0;
     }
     __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_xx.diminfo[1].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_xx.diminfo[1].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[1];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1264, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1265, __pyx_L1_error)
   }
   __pyx_t_12 = 0;
   __Pyx_DECREF_SET(__pyx_v_xx, ((PyArrayObject *)__pyx_t_4));
   __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1265
+  /* "pyart/map/ckdtree.pyx":1266
  *         xx = np.reshape(x,(n,self.m))
  *         xx = np.ascontiguousarray(xx,dtype=np.float64)
  *         dd = np.empty((n,k),dtype=np.float64)             # <<<<<<<<<<<<<<
  *         dd.fill(infinity)
  *         ii = np.empty((n,k),dtype=np.intp)
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1266, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2)) __PYX_ERR(0, 1265, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2)) __PYX_ERR(0, 1266, __pyx_L1_error);
   __pyx_t_4 = 0;
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1265, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1266, __pyx_L1_error);
   __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_1) < 0) __PYX_ERR(0, 1265, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_1) < 0) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1265, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1266, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1265, __pyx_L1_error)
+  if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1266, __pyx_L1_error)
   __pyx_t_16 = ((PyArrayObject *)__pyx_t_1);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -17621,22 +17621,22 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_13 = __pyx_t_14 = __pyx_t_15 = 0;
     }
     __pyx_pybuffernd_dd.diminfo[0].strides = __pyx_pybuffernd_dd.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_dd.diminfo[0].shape = __pyx_pybuffernd_dd.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_dd.diminfo[1].strides = __pyx_pybuffernd_dd.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_dd.diminfo[1].shape = __pyx_pybuffernd_dd.rcbuffer->pybuffer.shape[1];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1265, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1266, __pyx_L1_error)
   }
   __pyx_t_16 = 0;
   __pyx_v_dd = ((PyArrayObject *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1266
+  /* "pyart/map/ckdtree.pyx":1267
  *         xx = np.ascontiguousarray(xx,dtype=np.float64)
  *         dd = np.empty((n,k),dtype=np.float64)
  *         dd.fill(infinity)             # <<<<<<<<<<<<<<
  *         ii = np.empty((n,k),dtype=np.intp)
  *         ii.fill(self.n)
  */
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_dd), __pyx_n_s_fill); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1266, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_dd), __pyx_n_s_fill); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1267, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_5pyart_3map_7ckdtree_infinity); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1266, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_5pyart_3map_7ckdtree_infinity); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1267, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_11 = NULL;
   __pyx_t_5 = 0;
@@ -17657,56 +17657,56 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1266, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1267, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1267
+  /* "pyart/map/ckdtree.pyx":1268
  *         dd = np.empty((n,k),dtype=np.float64)
  *         dd.fill(infinity)
  *         ii = np.empty((n,k),dtype=np.intp)             # <<<<<<<<<<<<<<
  *         ii.fill(self.n)
  *         for c in range(n):
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_n); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_1)) __PYX_ERR(0, 1267, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_1)) __PYX_ERR(0, 1268, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1267, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1268, __pyx_L1_error);
   __pyx_t_1 = 0;
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_11);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11)) __PYX_ERR(0, 1267, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11)) __PYX_ERR(0, 1268, __pyx_L1_error);
   __pyx_t_11 = 0;
-  __pyx_t_11 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_intp); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_intp); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 1267, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1267, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1268, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1267, __pyx_L1_error)
+  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1268, __pyx_L1_error)
   __pyx_t_17 = ((PyArrayObject *)__pyx_t_4);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -17723,22 +17723,22 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_15 = __pyx_t_14 = __pyx_t_13 = 0;
     }
     __pyx_pybuffernd_ii.diminfo[0].strides = __pyx_pybuffernd_ii.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_ii.diminfo[0].shape = __pyx_pybuffernd_ii.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_ii.diminfo[1].strides = __pyx_pybuffernd_ii.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_ii.diminfo[1].shape = __pyx_pybuffernd_ii.rcbuffer->pybuffer.shape[1];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1267, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1268, __pyx_L1_error)
   }
   __pyx_t_17 = 0;
   __pyx_v_ii = ((PyArrayObject *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1268
+  /* "pyart/map/ckdtree.pyx":1269
  *         dd.fill(infinity)
  *         ii = np.empty((n,k),dtype=np.intp)
  *         ii.fill(self.n)             # <<<<<<<<<<<<<<
  *         for c in range(n):
  *             self.__query(&dd[c, 0], &ii[c, 0], &xx[c, 0],
  */
-  __pyx_t_11 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ii), __pyx_n_s_fill); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1268, __pyx_L1_error)
+  __pyx_t_11 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ii), __pyx_n_s_fill); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1269, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_11);
-  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1268, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1269, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = NULL;
   __pyx_t_5 = 0;
@@ -17759,13 +17759,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1268, __pyx_L1_error)
+    if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1269, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   }
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1269
+  /* "pyart/map/ckdtree.pyx":1270
  *         ii = np.empty((n,k),dtype=np.intp)
  *         ii.fill(self.n)
  *         for c in range(n):             # <<<<<<<<<<<<<<
@@ -17777,7 +17777,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
   for (__pyx_t_19 = 0; __pyx_t_19 < __pyx_t_18; __pyx_t_19+=1) {
     __pyx_v_c = __pyx_t_19;
 
-    /* "pyart/map/ckdtree.pyx":1270
+    /* "pyart/map/ckdtree.pyx":1271
  *         ii.fill(self.n)
  *         for c in range(n):
  *             self.__query(&dd[c, 0], &ii[c, 0], &xx[c, 0],             # <<<<<<<<<<<<<<
@@ -17791,17 +17791,17 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_24 = __pyx_v_c;
     __pyx_t_25 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1271
+    /* "pyart/map/ckdtree.pyx":1272
  *         for c in range(n):
  *             self.__query(&dd[c, 0], &ii[c, 0], &xx[c, 0],
  *                          k, eps, p, distance_upper_bound)             # <<<<<<<<<<<<<<
  * 
  *         if single:
  */
-    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query(__pyx_v_self, (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_20, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_21, __pyx_pybuffernd_dd.diminfo[1].strides))), (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_22, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_23, __pyx_pybuffernd_ii.diminfo[1].strides))), (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_xx.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_xx.diminfo[1].strides))), __pyx_v_k, __pyx_v_eps, __pyx_v_p, __pyx_v_distance_upper_bound); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1270, __pyx_L1_error)
+    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query(__pyx_v_self, (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_20, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_21, __pyx_pybuffernd_dd.diminfo[1].strides))), (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_22, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_23, __pyx_pybuffernd_ii.diminfo[1].strides))), (&(*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_xx.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_xx.diminfo[1].strides))), __pyx_v_k, __pyx_v_eps, __pyx_v_p, __pyx_v_distance_upper_bound); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1271, __pyx_L1_error)
   }
 
-  /* "pyart/map/ckdtree.pyx":1273
+  /* "pyart/map/ckdtree.pyx":1274
  *                          k, eps, p, distance_upper_bound)
  * 
  *         if single:             # <<<<<<<<<<<<<<
@@ -17810,7 +17810,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
   if (__pyx_v_single) {
 
-    /* "pyart/map/ckdtree.pyx":1274
+    /* "pyart/map/ckdtree.pyx":1275
  * 
  *         if single:
  *             if k==1:             # <<<<<<<<<<<<<<
@@ -17820,7 +17820,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_8 = (__pyx_v_k == 1);
     if (__pyx_t_8) {
 
-      /* "pyart/map/ckdtree.pyx":1275
+      /* "pyart/map/ckdtree.pyx":1276
  *         if single:
  *             if k==1:
  *                 if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -17830,7 +17830,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_8 = ((sizeof(long)) < (sizeof(__pyx_t_5numpy_intp_t)));
       if (__pyx_t_8) {
 
-        /* "pyart/map/ckdtree.pyx":1277
+        /* "pyart/map/ckdtree.pyx":1278
  *                 if sizeof(long) < sizeof(np.intp_t):
  *                     # ... e.g. Windows 64
  *                     if ii[0,0] <= <np.intp_t>LONG_MAX:             # <<<<<<<<<<<<<<
@@ -17842,7 +17842,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         __pyx_t_8 = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides)) <= ((__pyx_t_5numpy_intp_t)LONG_MAX));
         if (__pyx_t_8) {
 
-          /* "pyart/map/ckdtree.pyx":1278
+          /* "pyart/map/ckdtree.pyx":1279
  *                     # ... e.g. Windows 64
  *                     if ii[0,0] <= <np.intp_t>LONG_MAX:
  *                         return dd[0,0], int(ii[0,0])             # <<<<<<<<<<<<<<
@@ -17852,28 +17852,28 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __Pyx_XDECREF(__pyx_r);
           __pyx_t_24 = 0;
           __pyx_t_25 = 0;
-          __pyx_t_4 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1278, __pyx_L1_error)
+          __pyx_t_4 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1279, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_4);
           __pyx_t_25 = 0;
           __pyx_t_24 = 0;
-          __pyx_t_11 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1278, __pyx_L1_error)
+          __pyx_t_11 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1279, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_11);
-          __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1278, __pyx_L1_error)
+          __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1279, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-          __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1278, __pyx_L1_error)
+          __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1279, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_11);
           __Pyx_GIVEREF(__pyx_t_4);
-          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1278, __pyx_L1_error);
+          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1279, __pyx_L1_error);
           __Pyx_GIVEREF(__pyx_t_2);
-          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1278, __pyx_L1_error);
+          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1279, __pyx_L1_error);
           __pyx_t_4 = 0;
           __pyx_t_2 = 0;
           __pyx_r = __pyx_t_11;
           __pyx_t_11 = 0;
           goto __pyx_L0;
 
-          /* "pyart/map/ckdtree.pyx":1277
+          /* "pyart/map/ckdtree.pyx":1278
  *                 if sizeof(long) < sizeof(np.intp_t):
  *                     # ... e.g. Windows 64
  *                     if ii[0,0] <= <np.intp_t>LONG_MAX:             # <<<<<<<<<<<<<<
@@ -17882,7 +17882,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
         }
 
-        /* "pyart/map/ckdtree.pyx":1280
+        /* "pyart/map/ckdtree.pyx":1281
  *                         return dd[0,0], int(ii[0,0])
  *                     else:
  *                         return dd[0,0], ii[0,0]             # <<<<<<<<<<<<<<
@@ -17893,18 +17893,18 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __Pyx_XDECREF(__pyx_r);
           __pyx_t_24 = 0;
           __pyx_t_25 = 0;
-          __pyx_t_11 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1280, __pyx_L1_error)
+          __pyx_t_11 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1281, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_11);
           __pyx_t_25 = 0;
           __pyx_t_24 = 0;
-          __pyx_t_2 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1280, __pyx_L1_error)
+          __pyx_t_2 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1281, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
-          __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1280, __pyx_L1_error)
+          __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1281, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_4);
           __Pyx_GIVEREF(__pyx_t_11);
-          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_11)) __PYX_ERR(0, 1280, __pyx_L1_error);
+          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_11)) __PYX_ERR(0, 1281, __pyx_L1_error);
           __Pyx_GIVEREF(__pyx_t_2);
-          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_2)) __PYX_ERR(0, 1280, __pyx_L1_error);
+          if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_2)) __PYX_ERR(0, 1281, __pyx_L1_error);
           __pyx_t_11 = 0;
           __pyx_t_2 = 0;
           __pyx_r = __pyx_t_4;
@@ -17912,7 +17912,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           goto __pyx_L0;
         }
 
-        /* "pyart/map/ckdtree.pyx":1275
+        /* "pyart/map/ckdtree.pyx":1276
  *         if single:
  *             if k==1:
  *                 if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -17921,7 +17921,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":1283
+      /* "pyart/map/ckdtree.pyx":1284
  *                 else:
  *                     # ... most other platforms
  *                     return dd[0,0], ii[0,0]             # <<<<<<<<<<<<<<
@@ -17932,18 +17932,18 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         __Pyx_XDECREF(__pyx_r);
         __pyx_t_24 = 0;
         __pyx_t_25 = 0;
-        __pyx_t_4 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1283, __pyx_L1_error)
+        __pyx_t_4 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1284, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __pyx_t_25 = 0;
         __pyx_t_24 = 0;
-        __pyx_t_2 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1283, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1284, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1283, __pyx_L1_error)
+        __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1284, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_GIVEREF(__pyx_t_4);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1283, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4)) __PYX_ERR(0, 1284, __pyx_L1_error);
         __Pyx_GIVEREF(__pyx_t_2);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1283, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1284, __pyx_L1_error);
         __pyx_t_4 = 0;
         __pyx_t_2 = 0;
         __pyx_r = __pyx_t_11;
@@ -17951,7 +17951,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         goto __pyx_L0;
       }
 
-      /* "pyart/map/ckdtree.pyx":1274
+      /* "pyart/map/ckdtree.pyx":1275
  * 
  *         if single:
  *             if k==1:             # <<<<<<<<<<<<<<
@@ -17960,7 +17960,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":1285
+    /* "pyart/map/ckdtree.pyx":1286
  *                     return dd[0,0], ii[0,0]
  *             else:
  *                 return dd[0], ii[0]             # <<<<<<<<<<<<<<
@@ -17969,16 +17969,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
     /*else*/ {
       __Pyx_XDECREF(__pyx_r);
-      __pyx_t_11 = __Pyx_GetItemInt(((PyObject *)__pyx_v_dd), 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1285, __pyx_L1_error)
+      __pyx_t_11 = __Pyx_GetItemInt(((PyObject *)__pyx_v_dd), 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1286, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_11);
-      __pyx_t_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ii), 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1285, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ii), 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1286, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1285, __pyx_L1_error)
+      __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1286, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_GIVEREF(__pyx_t_11);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_11)) __PYX_ERR(0, 1285, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_11)) __PYX_ERR(0, 1286, __pyx_L1_error);
       __Pyx_GIVEREF(__pyx_t_2);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_2)) __PYX_ERR(0, 1285, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_2)) __PYX_ERR(0, 1286, __pyx_L1_error);
       __pyx_t_11 = 0;
       __pyx_t_2 = 0;
       __pyx_r = __pyx_t_4;
@@ -17986,7 +17986,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       goto __pyx_L0;
     }
 
-    /* "pyart/map/ckdtree.pyx":1273
+    /* "pyart/map/ckdtree.pyx":1274
  *                          k, eps, p, distance_upper_bound)
  * 
  *         if single:             # <<<<<<<<<<<<<<
@@ -17995,7 +17995,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1287
+  /* "pyart/map/ckdtree.pyx":1288
  *                 return dd[0], ii[0]
  *         else:
  *             if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -18006,7 +18006,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     __pyx_t_8 = ((sizeof(long)) < (sizeof(__pyx_t_5numpy_intp_t)));
     if (__pyx_t_8) {
 
-      /* "pyart/map/ckdtree.pyx":1289
+      /* "pyart/map/ckdtree.pyx":1290
  *             if sizeof(long) < sizeof(np.intp_t):
  *                 # ... e.g. Windows 64
  *                 for i in range(n):             # <<<<<<<<<<<<<<
@@ -18018,7 +18018,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       for (__pyx_t_19 = 0; __pyx_t_19 < __pyx_t_18; __pyx_t_19+=1) {
         __pyx_v_i = __pyx_t_19;
 
-        /* "pyart/map/ckdtree.pyx":1290
+        /* "pyart/map/ckdtree.pyx":1291
  *                 # ... e.g. Windows 64
  *                 for i in range(n):
  *                     for j in range(k):             # <<<<<<<<<<<<<<
@@ -18030,7 +18030,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         for (__pyx_t_28 = 0; __pyx_t_28 < __pyx_t_27; __pyx_t_28+=1) {
           __pyx_v_j = __pyx_t_28;
 
-          /* "pyart/map/ckdtree.pyx":1291
+          /* "pyart/map/ckdtree.pyx":1292
  *                 for i in range(n):
  *                     for j in range(k):
  *                         if ii[i,j] > <np.intp_t>LONG_MAX:             # <<<<<<<<<<<<<<
@@ -18042,7 +18042,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_8 = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_24, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_25, __pyx_pybuffernd_ii.diminfo[1].strides)) > ((__pyx_t_5numpy_intp_t)LONG_MAX));
           if (__pyx_t_8) {
 
-            /* "pyart/map/ckdtree.pyx":1293
+            /* "pyart/map/ckdtree.pyx":1294
  *                         if ii[i,j] > <np.intp_t>LONG_MAX:
  *                             # C long overlow, return array of dtype=np.int_p
  *                             if k==1:             # <<<<<<<<<<<<<<
@@ -18052,7 +18052,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
             __pyx_t_8 = (__pyx_v_k == 1);
             if (__pyx_t_8) {
 
-              /* "pyart/map/ckdtree.pyx":1294
+              /* "pyart/map/ckdtree.pyx":1295
  *                             # C long overlow, return array of dtype=np.int_p
  *                             if k==1:
  *                                 return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)             # <<<<<<<<<<<<<<
@@ -18060,12 +18060,12 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  *                                 return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))
  */
               __Pyx_XDECREF(__pyx_r);
-              __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
-              __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
               __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-              __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
               __pyx_t_3 = NULL;
               __pyx_t_5 = 0;
@@ -18086,16 +18086,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
                 __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
                 __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
                 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-                if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1294, __pyx_L1_error)
+                if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1295, __pyx_L1_error)
                 __Pyx_GOTREF(__pyx_t_4);
                 __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
               }
-              __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
-              __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_3);
               __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-              __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
               __pyx_t_1 = NULL;
               __pyx_t_5 = 0;
@@ -18116,23 +18116,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
                 __pyx_t_11 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
                 __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
                 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-                if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1294, __pyx_L1_error)
+                if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1295, __pyx_L1_error)
                 __Pyx_GOTREF(__pyx_t_11);
                 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
               }
-              __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1294, __pyx_L1_error)
+              __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1295, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_3);
               __Pyx_GIVEREF(__pyx_t_4);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1294, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1295, __pyx_L1_error);
               __Pyx_GIVEREF(__pyx_t_11);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_11)) __PYX_ERR(0, 1294, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_11)) __PYX_ERR(0, 1295, __pyx_L1_error);
               __pyx_t_4 = 0;
               __pyx_t_11 = 0;
               __pyx_r = __pyx_t_3;
               __pyx_t_3 = 0;
               goto __pyx_L0;
 
-              /* "pyart/map/ckdtree.pyx":1293
+              /* "pyart/map/ckdtree.pyx":1294
  *                         if ii[i,j] > <np.intp_t>LONG_MAX:
  *                             # C long overlow, return array of dtype=np.int_p
  *                             if k==1:             # <<<<<<<<<<<<<<
@@ -18141,7 +18141,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
             }
 
-            /* "pyart/map/ckdtree.pyx":1296
+            /* "pyart/map/ckdtree.pyx":1297
  *                                 return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)
  *                             else:
  *                                 return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))             # <<<<<<<<<<<<<<
@@ -18150,19 +18150,19 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
             /*else*/ {
               __Pyx_XDECREF(__pyx_r);
-              __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
-              __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_4);
               __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-              __pyx_t_11 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_11 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
-              __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
               __Pyx_GIVEREF(__pyx_t_11);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error);
               __pyx_t_11 = 0;
-              __pyx_t_11 = PyNumber_Add(__pyx_v_retshape, __pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_11 = PyNumber_Add(__pyx_v_retshape, __pyx_t_2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
               __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
               __pyx_t_2 = NULL;
@@ -18184,23 +18184,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
                 __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
                 __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
                 __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-                if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1296, __pyx_L1_error)
+                if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1297, __pyx_L1_error)
                 __Pyx_GOTREF(__pyx_t_3);
                 __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
               }
-              __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
-              __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
               __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-              __pyx_t_11 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_11 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
-              __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_1);
               __Pyx_GIVEREF(__pyx_t_11);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error);
               __pyx_t_11 = 0;
-              __pyx_t_11 = PyNumber_Add(__pyx_v_retshape, __pyx_t_1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_11 = PyNumber_Add(__pyx_v_retshape, __pyx_t_1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_11);
               __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
               __pyx_t_1 = NULL;
@@ -18222,16 +18222,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
                 __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
                 __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
                 __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-                if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1296, __pyx_L1_error)
+                if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1297, __pyx_L1_error)
                 __Pyx_GOTREF(__pyx_t_4);
                 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
               }
-              __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1296, __pyx_L1_error)
+              __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1297, __pyx_L1_error)
               __Pyx_GOTREF(__pyx_t_2);
               __Pyx_GIVEREF(__pyx_t_3);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1296, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1297, __pyx_L1_error);
               __Pyx_GIVEREF(__pyx_t_4);
-              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 1296, __pyx_L1_error);
+              if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4)) __PYX_ERR(0, 1297, __pyx_L1_error);
               __pyx_t_3 = 0;
               __pyx_t_4 = 0;
               __pyx_r = __pyx_t_2;
@@ -18239,7 +18239,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
               goto __pyx_L0;
             }
 
-            /* "pyart/map/ckdtree.pyx":1291
+            /* "pyart/map/ckdtree.pyx":1292
  *                 for i in range(n):
  *                     for j in range(k):
  *                         if ii[i,j] > <np.intp_t>LONG_MAX:             # <<<<<<<<<<<<<<
@@ -18250,7 +18250,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":1299
+      /* "pyart/map/ckdtree.pyx":1300
  * 
  *                 # no C long overlow, return array of dtype=int
  *                 if k==1:             # <<<<<<<<<<<<<<
@@ -18260,7 +18260,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_8 = (__pyx_v_k == 1);
       if (__pyx_t_8) {
 
-        /* "pyart/map/ckdtree.pyx":1300
+        /* "pyart/map/ckdtree.pyx":1301
  *                 # no C long overlow, return array of dtype=int
  *                 if k==1:
  *                     return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape).astype(int)             # <<<<<<<<<<<<<<
@@ -18268,12 +18268,12 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  *                     return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)).astype(int)
  */
         __Pyx_XDECREF(__pyx_r);
-        __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __pyx_t_4 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_4 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __pyx_t_11 = NULL;
         __pyx_t_5 = 0;
@@ -18294,16 +18294,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1300, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1301, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
         }
-        __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_np); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
-        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-        __pyx_t_11 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __pyx_t_29 = NULL;
         __pyx_t_5 = 0;
@@ -18324,11 +18324,11 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_29); __pyx_t_29 = 0;
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-          if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1300, __pyx_L1_error)
+          if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1301, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_4);
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
         }
-        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_astype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_astype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
         __pyx_t_4 = NULL;
@@ -18349,23 +18349,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           PyObject *__pyx_callargs[2] = {__pyx_t_4, ((PyObject *)(&PyInt_Type))};
           __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1300, __pyx_L1_error)
+          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1301, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_3);
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
         }
-        __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1300, __pyx_L1_error)
+        __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1301, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_GIVEREF(__pyx_t_2);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2)) __PYX_ERR(0, 1300, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2)) __PYX_ERR(0, 1301, __pyx_L1_error);
         __Pyx_GIVEREF(__pyx_t_3);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_3)) __PYX_ERR(0, 1300, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_3)) __PYX_ERR(0, 1301, __pyx_L1_error);
         __pyx_t_2 = 0;
         __pyx_t_3 = 0;
         __pyx_r = __pyx_t_1;
         __pyx_t_1 = 0;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":1299
+        /* "pyart/map/ckdtree.pyx":1300
  * 
  *                 # no C long overlow, return array of dtype=int
  *                 if k==1:             # <<<<<<<<<<<<<<
@@ -18374,7 +18374,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":1302
+      /* "pyart/map/ckdtree.pyx":1303
  *                     return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape).astype(int)
  *                 else:
  *                     return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)).astype(int)             # <<<<<<<<<<<<<<
@@ -18383,19 +18383,19 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
       /*else*/ {
         __Pyx_XDECREF(__pyx_r);
-        __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-        __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_GIVEREF(__pyx_t_3);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3)) __PYX_ERR(0, 1302, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3)) __PYX_ERR(0, 1303, __pyx_L1_error);
         __pyx_t_3 = 0;
-        __pyx_t_3 = PyNumber_Add(__pyx_v_retshape, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_3 = PyNumber_Add(__pyx_v_retshape, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
         __pyx_t_4 = NULL;
@@ -18417,23 +18417,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-          if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1302, __pyx_L1_error)
+          if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1303, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_1);
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         }
-        __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
-        __pyx_t_29 = PyTuple_New(1); if (unlikely(!__pyx_t_29)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_29 = PyTuple_New(1); if (unlikely(!__pyx_t_29)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_29);
         __Pyx_GIVEREF(__pyx_t_4);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_29, 0, __pyx_t_4)) __PYX_ERR(0, 1302, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_29, 0, __pyx_t_4)) __PYX_ERR(0, 1303, __pyx_L1_error);
         __pyx_t_4 = 0;
-        __pyx_t_4 = PyNumber_Add(__pyx_v_retshape, __pyx_t_29); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_4 = PyNumber_Add(__pyx_v_retshape, __pyx_t_29); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_DECREF(__pyx_t_29); __pyx_t_29 = 0;
         __pyx_t_29 = NULL;
@@ -18455,11 +18455,11 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_29); __pyx_t_29 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1302, __pyx_L1_error)
+          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1303, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_3);
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         }
-        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_astype); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_astype); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
         __pyx_t_3 = NULL;
@@ -18480,16 +18480,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           PyObject *__pyx_callargs[2] = {__pyx_t_3, ((PyObject *)(&PyInt_Type))};
           __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1302, __pyx_L1_error)
+          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1303, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         }
-        __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1302, __pyx_L1_error)
+        __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1303, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_GIVEREF(__pyx_t_1);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_1)) __PYX_ERR(0, 1302, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_1)) __PYX_ERR(0, 1303, __pyx_L1_error);
         __Pyx_GIVEREF(__pyx_t_2);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1302, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2)) __PYX_ERR(0, 1303, __pyx_L1_error);
         __pyx_t_1 = 0;
         __pyx_t_2 = 0;
         __pyx_r = __pyx_t_11;
@@ -18497,7 +18497,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
         goto __pyx_L0;
       }
 
-      /* "pyart/map/ckdtree.pyx":1287
+      /* "pyart/map/ckdtree.pyx":1288
  *                 return dd[0], ii[0]
  *         else:
  *             if sizeof(long) < sizeof(np.intp_t):             # <<<<<<<<<<<<<<
@@ -18506,7 +18506,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":1306
+    /* "pyart/map/ckdtree.pyx":1307
  *             else:
  *                 # ... most other platforms
  *                 if k==1:             # <<<<<<<<<<<<<<
@@ -18517,7 +18517,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
       __pyx_t_8 = (__pyx_v_k == 1);
       if (__pyx_t_8) {
 
-        /* "pyart/map/ckdtree.pyx":1307
+        /* "pyart/map/ckdtree.pyx":1308
  *                 # ... most other platforms
  *                 if k==1:
  *                     return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)             # <<<<<<<<<<<<<<
@@ -18525,12 +18525,12 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  *                     return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))
  */
         __Pyx_XDECREF(__pyx_r);
-        __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-        __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_dd), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __pyx_t_3 = NULL;
         __pyx_t_5 = 0;
@@ -18551,16 +18551,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_11 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-          if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1307, __pyx_L1_error)
+          if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1308, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_11);
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
         }
-        __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-        __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_ii), __pyx_tuple__9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __pyx_t_4 = NULL;
         __pyx_t_5 = 0;
@@ -18581,23 +18581,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-          if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1307, __pyx_L1_error)
+          if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1308, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_1);
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
         }
-        __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1307, __pyx_L1_error)
+        __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1308, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
         __Pyx_GIVEREF(__pyx_t_11);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_11)) __PYX_ERR(0, 1307, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_11)) __PYX_ERR(0, 1308, __pyx_L1_error);
         __Pyx_GIVEREF(__pyx_t_1);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1)) __PYX_ERR(0, 1307, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1)) __PYX_ERR(0, 1308, __pyx_L1_error);
         __pyx_t_11 = 0;
         __pyx_t_1 = 0;
         __pyx_r = __pyx_t_3;
         __pyx_t_3 = 0;
         goto __pyx_L0;
 
-        /* "pyart/map/ckdtree.pyx":1306
+        /* "pyart/map/ckdtree.pyx":1307
  *             else:
  *                 # ... most other platforms
  *                 if k==1:             # <<<<<<<<<<<<<<
@@ -18606,7 +18606,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":1309
+      /* "pyart/map/ckdtree.pyx":1310
  *                     return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)
  *                 else:
  *                     return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))             # <<<<<<<<<<<<<<
@@ -18615,19 +18615,19 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
  */
       /*else*/ {
         __Pyx_XDECREF(__pyx_r);
-        __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
-        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_11);
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-        __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
-        __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_GIVEREF(__pyx_t_1);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error);
         __pyx_t_1 = 0;
-        __pyx_t_1 = PyNumber_Add(__pyx_v_retshape, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_1 = PyNumber_Add(__pyx_v_retshape, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         __pyx_t_2 = NULL;
@@ -18649,23 +18649,23 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_11, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1309, __pyx_L1_error)
+          if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1310, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_3);
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         }
-        __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
-        __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-        __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_k); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
-        __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_4);
         __Pyx_GIVEREF(__pyx_t_1);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error);
         __pyx_t_1 = 0;
-        __pyx_t_1 = PyNumber_Add(__pyx_v_retshape, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_1 = PyNumber_Add(__pyx_v_retshape, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_1);
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
         __pyx_t_4 = NULL;
@@ -18687,16 +18687,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
           __pyx_t_11 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
           __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-          if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1309, __pyx_L1_error)
+          if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1310, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_11);
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
         }
-        __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1309, __pyx_L1_error)
+        __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1310, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
         __Pyx_GIVEREF(__pyx_t_3);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1309, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 1310, __pyx_L1_error);
         __Pyx_GIVEREF(__pyx_t_11);
-        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_11)) __PYX_ERR(0, 1309, __pyx_L1_error);
+        if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_11)) __PYX_ERR(0, 1310, __pyx_L1_error);
         __pyx_t_3 = 0;
         __pyx_t_11 = 0;
         __pyx_r = __pyx_t_2;
@@ -18706,7 +18706,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
     }
   }
 
-  /* "pyart/map/ckdtree.pyx":1203
+  /* "pyart/map/ckdtree.pyx":1204
  * 
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -18749,7 +18749,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4query(struct __pyx_obj_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1314
+/* "pyart/map/ckdtree.pyx":1315
  *     # query_ball_point
  *     # ----------------
  *     cdef int __query_ball_point_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -18770,7 +18770,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":1320
+  /* "pyart/map/ckdtree.pyx":1321
  *         cdef np.intp_t i
  * 
  *         if node.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -18780,7 +18780,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_t_1 = (__pyx_v_node->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1321
+    /* "pyart/map/ckdtree.pyx":1322
  * 
  *         if node.split_dim == -1:  # leaf node
  *             lnode = <leafnode*> node             # <<<<<<<<<<<<<<
@@ -18789,7 +18789,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
  */
     __pyx_v_lnode = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node);
 
-    /* "pyart/map/ckdtree.pyx":1322
+    /* "pyart/map/ckdtree.pyx":1323
  *         if node.split_dim == -1:  # leaf node
  *             lnode = <leafnode*> node
  *             for i in range(lnode.start_idx, lnode.end_idx):             # <<<<<<<<<<<<<<
@@ -18801,17 +18801,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     for (__pyx_t_4 = __pyx_v_lnode->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
       __pyx_v_i = __pyx_t_4;
 
-      /* "pyart/map/ckdtree.pyx":1323
+      /* "pyart/map/ckdtree.pyx":1324
  *             lnode = <leafnode*> node
  *             for i in range(lnode.start_idx, lnode.end_idx):
  *                 list_append(results, self.raw_indices[i])             # <<<<<<<<<<<<<<
  *         else:
  *             self.__query_ball_point_traverse_no_checking(results, node.less)
  */
-      __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1323, __pyx_L1_error)
+      __pyx_t_5 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1324, __pyx_L1_error)
     }
 
-    /* "pyart/map/ckdtree.pyx":1320
+    /* "pyart/map/ckdtree.pyx":1321
  *         cdef np.intp_t i
  * 
  *         if node.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -18821,7 +18821,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1325
+  /* "pyart/map/ckdtree.pyx":1326
  *                 list_append(results, self.raw_indices[i])
  *         else:
  *             self.__query_ball_point_traverse_no_checking(results, node.less)             # <<<<<<<<<<<<<<
@@ -18829,20 +18829,20 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
  * 
  */
   /*else*/ {
-    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->less); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1325, __pyx_L1_error)
+    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->less); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1326, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1326
+    /* "pyart/map/ckdtree.pyx":1327
  *         else:
  *             self.__query_ball_point_traverse_no_checking(results, node.less)
  *             self.__query_ball_point_traverse_no_checking(results, node.greater)             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->greater); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1326, __pyx_L1_error)
+    __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->greater); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1327, __pyx_L1_error)
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1328
+  /* "pyart/map/ckdtree.pyx":1329
  *             self.__query_ball_point_traverse_no_checking(results, node.greater)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -18852,7 +18852,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1314
+  /* "pyart/map/ckdtree.pyx":1315
  *     # query_ball_point
  *     # ----------------
  *     cdef int __query_ball_point_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -18868,7 +18868,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1332
+/* "pyart/map/ckdtree.pyx":1333
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_ball_point_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -18891,7 +18891,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":1340
+  /* "pyart/map/ckdtree.pyx":1341
  *         cdef np.intp_t i
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -18901,7 +18901,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_t_1 = (__pyx_v_tracker->min_distance > (__pyx_v_tracker->upper_bound * __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1341
+    /* "pyart/map/ckdtree.pyx":1342
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0             # <<<<<<<<<<<<<<
@@ -18911,7 +18911,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":1340
+    /* "pyart/map/ckdtree.pyx":1341
  *         cdef np.intp_t i
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -18920,7 +18920,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1342
+  /* "pyart/map/ckdtree.pyx":1343
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -18930,16 +18930,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_t_1 = (__pyx_v_tracker->max_distance < (__pyx_v_tracker->upper_bound / __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1343
+    /* "pyart/map/ckdtree.pyx":1344
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_point_traverse_no_checking(results, node)             # <<<<<<<<<<<<<<
  *         elif node.split_dim == -1:  # leaf node
  *             lnode = <leafnode*>node
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1343, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1344, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1342
+    /* "pyart/map/ckdtree.pyx":1343
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -18949,7 +18949,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1344
+  /* "pyart/map/ckdtree.pyx":1345
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_point_traverse_no_checking(results, node)
  *         elif node.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -18959,7 +18959,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_t_1 = (__pyx_v_node->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1345
+    /* "pyart/map/ckdtree.pyx":1346
  *             self.__query_ball_point_traverse_no_checking(results, node)
  *         elif node.split_dim == -1:  # leaf node
  *             lnode = <leafnode*>node             # <<<<<<<<<<<<<<
@@ -18968,7 +18968,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
  */
     __pyx_v_lnode = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node);
 
-    /* "pyart/map/ckdtree.pyx":1347
+    /* "pyart/map/ckdtree.pyx":1348
  *             lnode = <leafnode*>node
  *             # brute-force
  *             for i in range(lnode.start_idx, lnode.end_idx):             # <<<<<<<<<<<<<<
@@ -18980,17 +18980,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     for (__pyx_t_5 = __pyx_v_lnode->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {
       __pyx_v_i = __pyx_t_5;
 
-      /* "pyart/map/ckdtree.pyx":1348
+      /* "pyart/map/ckdtree.pyx":1349
  *             # brute-force
  *             for i in range(lnode.start_idx, lnode.end_idx):
  *                 d = _distance_p(             # <<<<<<<<<<<<<<
  *                     self.raw_data + self.raw_indices[i] * self.m,
  *                     tracker.pt, tracker.p, self.m, tracker.upper_bound)
  */
-      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_tracker->pt, __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1348, __pyx_L1_error)
+      __pyx_t_6 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_tracker->pt, __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_6 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1349, __pyx_L1_error)
       __pyx_v_d = __pyx_t_6;
 
-      /* "pyart/map/ckdtree.pyx":1351
+      /* "pyart/map/ckdtree.pyx":1352
  *                     self.raw_data + self.raw_indices[i] * self.m,
  *                     tracker.pt, tracker.p, self.m, tracker.upper_bound)
  *                 if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -19000,16 +19000,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
       __pyx_t_1 = (__pyx_v_d <= __pyx_v_tracker->upper_bound);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":1352
+        /* "pyart/map/ckdtree.pyx":1353
  *                     tracker.pt, tracker.p, self.m, tracker.upper_bound)
  *                 if d <= tracker.upper_bound:
  *                     list_append(results, self.raw_indices[i])             # <<<<<<<<<<<<<<
  *         else:
  *             tracker.push_less_of(node)
  */
-        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1352, __pyx_L1_error)
+        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1353, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1351
+        /* "pyart/map/ckdtree.pyx":1352
  *                     self.raw_data + self.raw_indices[i] * self.m,
  *                     tracker.pt, tracker.p, self.m, tracker.upper_bound)
  *                 if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -19019,7 +19019,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":1344
+    /* "pyart/map/ckdtree.pyx":1345
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_point_traverse_no_checking(results, node)
  *         elif node.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -19029,7 +19029,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1354
+  /* "pyart/map/ckdtree.pyx":1355
  *                     list_append(results, self.raw_indices[i])
  *         else:
  *             tracker.push_less_of(node)             # <<<<<<<<<<<<<<
@@ -19037,56 +19037,56 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
  *                 results, node.less, tracker)
  */
   /*else*/ {
-    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push_less_of(__pyx_v_tracker, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1354, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push_less_of(__pyx_v_tracker, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1355, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1355
+    /* "pyart/map/ckdtree.pyx":1356
  *         else:
  *             tracker.push_less_of(node)
  *             self.__query_ball_point_traverse_checking(             # <<<<<<<<<<<<<<
  *                 results, node.less, tracker)
  *             tracker.pop()
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1355, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1356, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1357
+    /* "pyart/map/ckdtree.pyx":1358
  *             self.__query_ball_point_traverse_checking(
  *                 results, node.less, tracker)
  *             tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *             tracker.push_greater_of(node)
  */
-    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1357, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1358, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1359
+    /* "pyart/map/ckdtree.pyx":1360
  *             tracker.pop()
  * 
  *             tracker.push_greater_of(node)             # <<<<<<<<<<<<<<
  *             self.__query_ball_point_traverse_checking(
  *                 results, node.greater, tracker)
  */
-    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push_greater_of(__pyx_v_tracker, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1359, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push_greater_of(__pyx_v_tracker, __pyx_v_node); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1360, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1360
+    /* "pyart/map/ckdtree.pyx":1361
  * 
  *             tracker.push_greater_of(node)
  *             self.__query_ball_point_traverse_checking(             # <<<<<<<<<<<<<<
  *                 results, node.greater, tracker)
  *             tracker.pop()
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1360, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1361, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1362
+    /* "pyart/map/ckdtree.pyx":1363
  *             self.__query_ball_point_traverse_checking(
  *                 results, node.greater, tracker)
  *             tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1362, __pyx_L1_error)
+    __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1363, __pyx_L1_error)
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1364
+  /* "pyart/map/ckdtree.pyx":1365
  *             tracker.pop()
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -19096,7 +19096,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1332
+  /* "pyart/map/ckdtree.pyx":1333
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_ball_point_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -19112,7 +19112,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_point_trav
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1367
+/* "pyart/map/ckdtree.pyx":1368
  * 
  * 
  *     cdef list __query_ball_point(cKDTree self,             # <<<<<<<<<<<<<<
@@ -19133,71 +19133,71 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_poin
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__query_ball_point", 1);
 
-  /* "pyart/map/ckdtree.pyx":1373
+  /* "pyart/map/ckdtree.pyx":1374
  *                                  np.float64_t eps):
  * 
  *         tracker = PointRectDistanceTracker()             # <<<<<<<<<<<<<<
  *         tracker.init(x, Rectangle(self.mins, self.maxes),
  *                      p, eps, r)
  */
-  __pyx_t_1 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1373, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1374, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_tracker = ((struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1374
+  /* "pyart/map/ckdtree.pyx":1375
  * 
  *         tracker = PointRectDistanceTracker()
  *         tracker.init(x, Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *                      p, eps, r)
  * 
  */
-  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1374, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1375, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1374, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1375, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1374, __pyx_L1_error);
-  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1374, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1375, __pyx_L1_error);
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1375, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1375
+  /* "pyart/map/ckdtree.pyx":1376
  *         tracker = PointRectDistanceTracker()
  *         tracker.init(x, Rectangle(self.mins, self.maxes),
  *                      p, eps, r)             # <<<<<<<<<<<<<<
  * 
  *         results = []
  */
-  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_tracker->__pyx_vtab)->init(__pyx_v_tracker, __pyx_v_x, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_p, __pyx_v_eps, __pyx_v_r); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1374, __pyx_L1_error)
+  __pyx_t_1 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_PointRectDistanceTracker *)__pyx_v_tracker->__pyx_vtab)->init(__pyx_v_tracker, __pyx_v_x, ((struct __pyx_obj_5pyart_3map_7ckdtree_Rectangle *)__pyx_t_2), __pyx_v_p, __pyx_v_eps, __pyx_v_r); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1375, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1377
+  /* "pyart/map/ckdtree.pyx":1378
  *                      p, eps, r)
  * 
  *         results = []             # <<<<<<<<<<<<<<
  *         self.__query_ball_point_traverse_checking(
  *             results, self.tree, tracker)
  */
-  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1377, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1378, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_results = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1378
+  /* "pyart/map/ckdtree.pyx":1379
  * 
  *         results = []
  *         self.__query_ball_point_traverse_checking(             # <<<<<<<<<<<<<<
  *             results, self.tree, tracker)
  *         return results
  */
-  __pyx_t_3 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_tracker); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 1378, __pyx_L1_error)
+  __pyx_t_3 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_tracker); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 1379, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1380
+  /* "pyart/map/ckdtree.pyx":1381
  *         self.__query_ball_point_traverse_checking(
  *             results, self.tree, tracker)
  *         return results             # <<<<<<<<<<<<<<
@@ -19209,7 +19209,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_poin
   __pyx_r = __pyx_v_results;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1367
+  /* "pyart/map/ckdtree.pyx":1368
  * 
  * 
  *     cdef list __query_ball_point(cKDTree self,             # <<<<<<<<<<<<<<
@@ -19231,7 +19231,7 @@ static PyObject *__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_poin
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1383
+/* "pyart/map/ckdtree.pyx":1384
  * 
  * 
  *     def query_ball_point(cKDTree self, object x, np.float64_t r,             # <<<<<<<<<<<<<<
@@ -19247,7 +19247,7 @@ PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
 PyObject *__pyx_args, PyObject *__pyx_kwds
 #endif
 ); /*proto*/
-PyDoc_STRVAR(__pyx_doc_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point, "query_ball_point(self, x, r, p, eps)\n        \n        Find all points within distance r of point(s) x.\n\n        Parameters\n        ----------\n        x : array_like, shape tuple + (self.m,)\n            The point or points to search for neighbors of.\n        r : positive float\n            The radius of points to return.\n        p : float, optional\n            Which Minkowski p-norm to use.  Should be in the range [1, inf].\n        eps : nonnegative float, optional\n            Approximate search. Branches of the tree are not explored if their\n            nearest points are further than ``r / (1 + eps)``, and branches are\n            added in bulk if their furthest points are nearer than\n            ``r * (1 + eps)``.\n\n        Returns\n        -------\n        results : list or array of lists\n            If `x` is a single point, returns a list of the indices of the\n            neighbors of `x`. If `x` is an array of points, returns an object\n            array of shape tuple containing lists of neighbors.\n\n        Notes\n        -----\n        If you have many points whose neighbors you want to find, you may save\n        substantial amounts of time by putting them in a cKDTree and using\n        query_ball_tree.\n\n        Examples\n        --------\n        >>> from scipy import spatial\n        >>> x, y = np.mgrid[0:4, 0:4]\n        >>> points = zip(x.ravel(), y.ravel())\n        >>> tree = spatial.cKDTree(points)\n        >>> tree.query_ball_point([2, 0], 1)\n        [4, 8, 9, 12]\n\n        ");
+PyDoc_STRVAR(__pyx_doc_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point, "query_ball_point(self, x, r, p, eps)\n\n        Find all points within distance r of point(s) x.\n\n        Parameters\n        ----------\n        x : array_like, shape tuple + (self.m,)\n            The point or points to search for neighbors of.\n        r : positive float\n            The radius of points to return.\n        p : float, optional\n            Which Minkowski p-norm to use.  Should be in the range [1, inf].\n        eps : nonnegative float, optional\n            Approximate search. Branches of the tree are not explored if their\n            nearest points are further than ``r / (1 + eps)``, and branches are\n            added in bulk if their furthest points are nearer than\n            ``r * (1 + eps)``.\n\n        Returns\n        -------\n        results : list or array of lists\n            If `x` is a single point, returns a list of the indices of the\n            neighbors of `x`. If `x` is an array of points, returns an object\n            array of shape tuple containing lists of neighbors.\n\n        Notes\n        -----\n        If you have many points whose neighbors you want to find, you may save\n        substantial amounts of time by putting them in a cKDTree and using\n        query_ball_tree.\n\n        Examples\n        --------\n        >>> from scipy import spatial\n        >>> x, y = np.mgrid[0:4, 0:4]\n        >>> points = zip(x.ravel(), y.ravel())\n        >>> tree = spatial.cKDTree(points)\n        >>> tree.query_ball_point([2, 0], 1)\n        [4, 8, 9, 12]\n\n        ");
 static PyMethodDef __pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_7query_ball_point = {"query_ball_point", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_5pyart_3map_7ckdtree_7cKDTree_7query_ball_point, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point};
 static PyObject *__pyx_pw_5pyart_3map_7ckdtree_7cKDTree_7query_ball_point(PyObject *__pyx_v_self, 
 #if CYTHON_METH_FASTCALL
@@ -19302,7 +19302,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1383, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -19310,28 +19310,28 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1383, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("query_ball_point", 0, 2, 4, 1); __PYX_ERR(0, 1383, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("query_ball_point", 0, 2, 4, 1); __PYX_ERR(0, 1384, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1383, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_eps);
           if (value) { values[3] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1383, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_ball_point") < 0)) __PYX_ERR(0, 1383, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_ball_point") < 0)) __PYX_ERR(0, 1384, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -19346,21 +19346,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       }
     }
     __pyx_v_x = values[0];
-    __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1383, __pyx_L3_error)
+    __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
     if (values[2]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1385, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);
     }
     if (values[3]) {
-      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1384, __pyx_L3_error)
+      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1385, __pyx_L3_error)
     } else {
       __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("query_ball_point", 0, 2, 4, __pyx_nargs); __PYX_ERR(0, 1383, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("query_ball_point", 0, 2, 4, __pyx_nargs); __PYX_ERR(0, 1384, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -19422,16 +19422,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
   __pyx_pybuffernd_xx.data = NULL;
   __pyx_pybuffernd_xx.rcbuffer = &__pyx_pybuffer_xx;
 
-  /* "pyart/map/ckdtree.pyx":1428
+  /* "pyart/map/ckdtree.pyx":1429
  *         cdef np.ndarray[np.float64_t, ndim=1, mode="c"] xx
  * 
  *         x = np.asarray(x).astype(np.float64)             # <<<<<<<<<<<<<<
  *         if x.shape[-1] != self.m:
  *             raise ValueError("Searching for a %d-dimensional point in a " \
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1428, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1429, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1428, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1429, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -19452,16 +19452,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_x};
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1428, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1429, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_astype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1428, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_astype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1429, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1428, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1429, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1428, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1429, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = NULL;
@@ -19483,42 +19483,42 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1428, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1429, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
   __Pyx_DECREF_SET(__pyx_v_x, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1429
+  /* "pyart/map/ckdtree.pyx":1430
  * 
  *         x = np.asarray(x).astype(np.float64)
  *         if x.shape[-1] != self.m:             # <<<<<<<<<<<<<<
  *             raise ValueError("Searching for a %d-dimensional point in a " \
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1429, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1430, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_1, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1429, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_1, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1430, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1429, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1430, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_t_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1429, __pyx_L1_error)
+  __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_t_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1430, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1429, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1430, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (unlikely(__pyx_t_6)) {
 
-    /* "pyart/map/ckdtree.pyx":1430
+    /* "pyart/map/ckdtree.pyx":1431
  *         x = np.asarray(x).astype(np.float64)
  *         if x.shape[-1] != self.m:
  *             raise ValueError("Searching for a %d-dimensional point in a " \             # <<<<<<<<<<<<<<
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  *         if len(x.shape) == 1:
  */
-    __pyx_t_3 = PyTuple_New(5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1430, __pyx_L1_error)
+    __pyx_t_3 = PyTuple_New(5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1431, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_7 = 0;
     __pyx_t_8 = 127;
@@ -19527,22 +19527,22 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     __Pyx_GIVEREF(__pyx_kp_u_Searching_for_a);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_u_Searching_for_a);
 
-    /* "pyart/map/ckdtree.pyx":1431
+    /* "pyart/map/ckdtree.pyx":1432
  *         if x.shape[-1] != self.m:
  *             raise ValueError("Searching for a %d-dimensional point in a " \
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))             # <<<<<<<<<<<<<<
  *         if len(x.shape) == 1:
  *             xx = np.ascontiguousarray(x, dtype=np.float64)
  */
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_1, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_1, -1L, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-    __pyx_t_1 = __Pyx_PyNumber_Int(__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyNumber_Int(__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_4 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_8 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) > __pyx_t_8) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) : __pyx_t_8;
@@ -19554,12 +19554,12 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     __pyx_t_7 += 24;
     __Pyx_GIVEREF(__pyx_kp_u_dimensional_point_in_a);
     PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_kp_u_dimensional_point_in_a);
-    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_4 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1431, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_FormatAndDecref(__Pyx_PyNumber_IntOrLong(__pyx_t_1), __pyx_n_u_d); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1432, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_t_8 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) > __pyx_t_8) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_4) : __pyx_t_8;
@@ -19572,24 +19572,24 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     __Pyx_GIVEREF(__pyx_kp_u_dimensional_KDTree);
     PyTuple_SET_ITEM(__pyx_t_3, 4, __pyx_kp_u_dimensional_KDTree);
 
-    /* "pyart/map/ckdtree.pyx":1430
+    /* "pyart/map/ckdtree.pyx":1431
  *         x = np.asarray(x).astype(np.float64)
  *         if x.shape[-1] != self.m:
  *             raise ValueError("Searching for a %d-dimensional point in a " \             # <<<<<<<<<<<<<<
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  *         if len(x.shape) == 1:
  */
-    __pyx_t_4 = __Pyx_PyUnicode_Join(__pyx_t_3, 5, __pyx_t_7, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1430, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyUnicode_Join(__pyx_t_3, 5, __pyx_t_7, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1431, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1430, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1431, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(0, 1430, __pyx_L1_error)
+    __PYX_ERR(0, 1431, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1429
+    /* "pyart/map/ckdtree.pyx":1430
  * 
  *         x = np.asarray(x).astype(np.float64)
  *         if x.shape[-1] != self.m:             # <<<<<<<<<<<<<<
@@ -19598,52 +19598,52 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1432
+  /* "pyart/map/ckdtree.pyx":1433
  *             raise ValueError("Searching for a %d-dimensional point in a " \
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  *         if len(x.shape) == 1:             # <<<<<<<<<<<<<<
  *             xx = np.ascontiguousarray(x, dtype=np.float64)
  *             return self.__query_ball_point(&xx[0], r, p, eps)
  */
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1432, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1433, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_7 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1432, __pyx_L1_error)
+  __pyx_t_7 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1433, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_6 = (__pyx_t_7 == 1);
   if (__pyx_t_6) {
 
-    /* "pyart/map/ckdtree.pyx":1433
+    /* "pyart/map/ckdtree.pyx":1434
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  *         if len(x.shape) == 1:
  *             xx = np.ascontiguousarray(x, dtype=np.float64)             # <<<<<<<<<<<<<<
  *             return self.__query_ball_point(&xx[0], r, p, eps)
  *         else:
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_INCREF(__pyx_v_x);
     __Pyx_GIVEREF(__pyx_v_x);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_x)) __PYX_ERR(0, 1433, __pyx_L1_error);
-    __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_x)) __PYX_ERR(0, 1434, __pyx_L1_error);
+    __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_9) < 0) __PYX_ERR(0, 1433, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_9) < 0) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
-    __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1433, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1434, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-    if (!(likely(((__pyx_t_9) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_9, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1433, __pyx_L1_error)
+    if (!(likely(((__pyx_t_9) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_9, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1434, __pyx_L1_error)
     __pyx_t_10 = ((PyArrayObject *)__pyx_t_9);
     {
       __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -19660,13 +19660,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
         __pyx_t_11 = __pyx_t_12 = __pyx_t_13 = 0;
       }
       __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0];
-      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1433, __pyx_L1_error)
+      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1434, __pyx_L1_error)
     }
     __pyx_t_10 = 0;
     __pyx_v_xx = ((PyArrayObject *)__pyx_t_9);
     __pyx_t_9 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1434
+    /* "pyart/map/ckdtree.pyx":1435
  *         if len(x.shape) == 1:
  *             xx = np.ascontiguousarray(x, dtype=np.float64)
  *             return self.__query_ball_point(&xx[0], r, p, eps)             # <<<<<<<<<<<<<<
@@ -19682,15 +19682,15 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     } else if (unlikely(__pyx_t_14 >= __pyx_pybuffernd_xx.diminfo[0].shape)) __pyx_t_5 = 0;
     if (unlikely(__pyx_t_5 != -1)) {
       __Pyx_RaiseBufferIndexError(__pyx_t_5);
-      __PYX_ERR(0, 1434, __pyx_L1_error)
+      __PYX_ERR(0, 1435, __pyx_L1_error)
     }
-    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point(__pyx_v_self, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_14, __pyx_pybuffernd_xx.diminfo[0].strides))), __pyx_v_r, __pyx_v_p, __pyx_v_eps); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1434, __pyx_L1_error)
+    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point(__pyx_v_self, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_14, __pyx_pybuffernd_xx.diminfo[0].strides))), __pyx_v_r, __pyx_v_p, __pyx_v_eps); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1435, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __pyx_r = __pyx_t_9;
     __pyx_t_9 = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":1432
+    /* "pyart/map/ckdtree.pyx":1433
  *             raise ValueError("Searching for a %d-dimensional point in a " \
  *                              "%d-dimensional KDTree" % (int(x.shape[-1]), int(self.m)))
  *         if len(x.shape) == 1:             # <<<<<<<<<<<<<<
@@ -19699,7 +19699,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1436
+  /* "pyart/map/ckdtree.pyx":1437
  *             return self.__query_ball_point(&xx[0], r, p, eps)
  *         else:
  *             retshape = x.shape[:-1]             # <<<<<<<<<<<<<<
@@ -19707,41 +19707,41 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
  *             for c in np.ndindex(retshape):
  */
   /*else*/ {
-    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1436, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_x, __pyx_n_s_shape); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1437, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
-    __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_t_9, 0, -1L, NULL, NULL, &__pyx_slice__10, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1436, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_t_9, 0, -1L, NULL, NULL, &__pyx_slice__10, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1437, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     __pyx_v_retshape = __pyx_t_1;
     __pyx_t_1 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1437
+    /* "pyart/map/ckdtree.pyx":1438
  *         else:
  *             retshape = x.shape[:-1]
  *             result = np.empty(retshape, dtype=np.object)             # <<<<<<<<<<<<<<
  *             for c in np.ndindex(retshape):
  *                 xx = np.ascontiguousarray(x[c], dtype=np.float64)
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-    __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_INCREF(__pyx_v_retshape);
     __Pyx_GIVEREF(__pyx_v_retshape);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_retshape)) __PYX_ERR(0, 1437, __pyx_L1_error);
-    __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_retshape)) __PYX_ERR(0, 1438, __pyx_L1_error);
+    __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_object); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_object); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 1437, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1437, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1438, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -19749,16 +19749,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     __pyx_v_result = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1438
+    /* "pyart/map/ckdtree.pyx":1439
  *             retshape = x.shape[:-1]
  *             result = np.empty(retshape, dtype=np.object)
  *             for c in np.ndindex(retshape):             # <<<<<<<<<<<<<<
  *                 xx = np.ascontiguousarray(x[c], dtype=np.float64)
  *                 result[c] = self.__query_ball_point(&xx[0], r, p, eps)
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1438, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1439, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndindex); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1438, __pyx_L1_error)
+    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndindex); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1439, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_3 = NULL;
@@ -19779,7 +19779,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
       PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_retshape};
       __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
       __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1438, __pyx_L1_error)
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
@@ -19788,9 +19788,9 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
       __pyx_t_7 = 0;
       __pyx_t_15 = NULL;
     } else {
-      __pyx_t_7 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1438, __pyx_L1_error)
+      __pyx_t_7 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1439, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_1);
-      __pyx_t_15 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 1438, __pyx_L1_error)
+      __pyx_t_15 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 1439, __pyx_L1_error)
     }
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     for (;;) {
@@ -19799,28 +19799,28 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
           {
             Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_1);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1438, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1439, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 1438, __pyx_L1_error)
+          __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 1439, __pyx_L1_error)
           #else
-          __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1438, __pyx_L1_error)
+          __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           #endif
         } else {
           {
             Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_1);
             #if !CYTHON_ASSUME_SAFE_MACROS
-            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1438, __pyx_L1_error)
+            if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1439, __pyx_L1_error)
             #endif
             if (__pyx_t_7 >= __pyx_temp) break;
           }
           #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 1438, __pyx_L1_error)
+          __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely((0 < 0))) __PYX_ERR(0, 1439, __pyx_L1_error)
           #else
-          __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1438, __pyx_L1_error)
+          __pyx_t_2 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
           __Pyx_GOTREF(__pyx_t_2);
           #endif
         }
@@ -19830,7 +19830,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
           PyObject* exc_type = PyErr_Occurred();
           if (exc_type) {
             if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-            else __PYX_ERR(0, 1438, __pyx_L1_error)
+            else __PYX_ERR(0, 1439, __pyx_L1_error)
           }
           break;
         }
@@ -19839,40 +19839,40 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
       __Pyx_XDECREF_SET(__pyx_v_c, __pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "pyart/map/ckdtree.pyx":1439
+      /* "pyart/map/ckdtree.pyx":1440
  *             result = np.empty(retshape, dtype=np.object)
  *             for c in np.ndindex(retshape):
  *                 xx = np.ascontiguousarray(x[c], dtype=np.float64)             # <<<<<<<<<<<<<<
  *                 result[c] = self.__query_ball_point(&xx[0], r, p, eps)
  *             return result
  */
-      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ascontiguousarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_x, __pyx_v_c); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_x, __pyx_v_c); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_9);
       __Pyx_GIVEREF(__pyx_t_2);
-      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error);
+      if (__Pyx_PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_2)) __PYX_ERR(0, 1440, __pyx_L1_error);
       __pyx_t_2 = 0;
-      __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_16);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_16) < 0) __PYX_ERR(0, 1439, __pyx_L1_error)
+      if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_16) < 0) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
-      __pyx_t_16 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_9, __pyx_t_2); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1439, __pyx_L1_error)
+      __pyx_t_16 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_9, __pyx_t_2); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1440, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_16);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (!(likely(((__pyx_t_16) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_16, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1439, __pyx_L1_error)
+      if (!(likely(((__pyx_t_16) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_16, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1440, __pyx_L1_error)
       __pyx_t_10 = ((PyArrayObject *)__pyx_t_16);
       {
         __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -19889,13 +19889,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
           __pyx_t_13 = __pyx_t_12 = __pyx_t_11 = 0;
         }
         __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0];
-        if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1439, __pyx_L1_error)
+        if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1440, __pyx_L1_error)
       }
       __pyx_t_10 = 0;
       __Pyx_XDECREF_SET(__pyx_v_xx, ((PyArrayObject *)__pyx_t_16));
       __pyx_t_16 = 0;
 
-      /* "pyart/map/ckdtree.pyx":1440
+      /* "pyart/map/ckdtree.pyx":1441
  *             for c in np.ndindex(retshape):
  *                 xx = np.ascontiguousarray(x[c], dtype=np.float64)
  *                 result[c] = self.__query_ball_point(&xx[0], r, p, eps)             # <<<<<<<<<<<<<<
@@ -19910,14 +19910,14 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
       } else if (unlikely(__pyx_t_14 >= __pyx_pybuffernd_xx.diminfo[0].shape)) __pyx_t_5 = 0;
       if (unlikely(__pyx_t_5 != -1)) {
         __Pyx_RaiseBufferIndexError(__pyx_t_5);
-        __PYX_ERR(0, 1440, __pyx_L1_error)
+        __PYX_ERR(0, 1441, __pyx_L1_error)
       }
-      __pyx_t_16 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point(__pyx_v_self, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_14, __pyx_pybuffernd_xx.diminfo[0].strides))), __pyx_v_r, __pyx_v_p, __pyx_v_eps); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1440, __pyx_L1_error)
+      __pyx_t_16 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_point(__pyx_v_self, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_xx.rcbuffer->pybuffer.buf, __pyx_t_14, __pyx_pybuffernd_xx.diminfo[0].strides))), __pyx_v_r, __pyx_v_p, __pyx_v_eps); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 1441, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_16);
-      if (unlikely((PyObject_SetItem(__pyx_v_result, __pyx_v_c, __pyx_t_16) < 0))) __PYX_ERR(0, 1440, __pyx_L1_error)
+      if (unlikely((PyObject_SetItem(__pyx_v_result, __pyx_v_c, __pyx_t_16) < 0))) __PYX_ERR(0, 1441, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
 
-      /* "pyart/map/ckdtree.pyx":1438
+      /* "pyart/map/ckdtree.pyx":1439
  *             retshape = x.shape[:-1]
  *             result = np.empty(retshape, dtype=np.object)
  *             for c in np.ndindex(retshape):             # <<<<<<<<<<<<<<
@@ -19927,7 +19927,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     }
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1441
+    /* "pyart/map/ckdtree.pyx":1442
  *                 xx = np.ascontiguousarray(x[c], dtype=np.float64)
  *                 result[c] = self.__query_ball_point(&xx[0], r, p, eps)
  *             return result             # <<<<<<<<<<<<<<
@@ -19940,7 +19940,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
     goto __pyx_L0;
   }
 
-  /* "pyart/map/ckdtree.pyx":1383
+  /* "pyart/map/ckdtree.pyx":1384
  * 
  * 
  *     def query_ball_point(cKDTree self, object x, np.float64_t r,             # <<<<<<<<<<<<<<
@@ -19978,7 +19978,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_6query_ball_point(struct
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1446
+/* "pyart/map/ckdtree.pyx":1447
  *     # query_ball_tree
  *     # ---------------
  *     cdef int __query_ball_tree_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -20008,7 +20008,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__query_ball_tree_traverse_no_checking", 1);
 
-  /* "pyart/map/ckdtree.pyx":1456
+  /* "pyart/map/ckdtree.pyx":1457
  *         cdef np.intp_t i, j
  * 
  *         if node1.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -20018,7 +20018,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_t_1 = (__pyx_v_node1->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1457
+    /* "pyart/map/ckdtree.pyx":1458
  * 
  *         if node1.split_dim == -1:  # leaf node
  *             lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -20027,7 +20027,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
     __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-    /* "pyart/map/ckdtree.pyx":1459
+    /* "pyart/map/ckdtree.pyx":1460
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -20037,7 +20037,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1460
+      /* "pyart/map/ckdtree.pyx":1461
  * 
  *             if node2.split_dim == -1:  # leaf node
  *                 lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -20046,7 +20046,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
       __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-      /* "pyart/map/ckdtree.pyx":1462
+      /* "pyart/map/ckdtree.pyx":1463
  *                 lnode2 = <leafnode*>node2
  * 
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -20058,7 +20058,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
       for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
         __pyx_v_i = __pyx_t_4;
 
-        /* "pyart/map/ckdtree.pyx":1463
+        /* "pyart/map/ckdtree.pyx":1464
  * 
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     results_i = results[self.raw_indices[i]]             # <<<<<<<<<<<<<<
@@ -20067,15 +20067,15 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
         if (unlikely(__pyx_v_results == Py_None)) {
           PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-          __PYX_ERR(0, 1463, __pyx_L1_error)
+          __PYX_ERR(0, 1464, __pyx_L1_error)
         }
-        __pyx_t_5 = __Pyx_GetItemInt_List(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_t_5numpy_intp_t, 1, __Pyx_PyInt_From_npy_intp, 1, 1, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1463, __pyx_L1_error)
+        __pyx_t_5 = __Pyx_GetItemInt_List(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_t_5numpy_intp_t, 1, __Pyx_PyInt_From_npy_intp, 1, 1, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1464, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_5);
-        if (!(likely(PyList_CheckExact(__pyx_t_5))||((__pyx_t_5) == Py_None) || __Pyx_RaiseUnexpectedTypeError("list", __pyx_t_5))) __PYX_ERR(0, 1463, __pyx_L1_error)
+        if (!(likely(PyList_CheckExact(__pyx_t_5))||((__pyx_t_5) == Py_None) || __Pyx_RaiseUnexpectedTypeError("list", __pyx_t_5))) __PYX_ERR(0, 1464, __pyx_L1_error)
         __Pyx_XDECREF_SET(__pyx_v_results_i, ((PyObject*)__pyx_t_5));
         __pyx_t_5 = 0;
 
-        /* "pyart/map/ckdtree.pyx":1464
+        /* "pyart/map/ckdtree.pyx":1465
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     results_i = results[self.raw_indices[i]]
  *                     for j in range(lnode2.start_idx, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -20087,18 +20087,18 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
         for (__pyx_t_8 = __pyx_v_lnode2->start_idx; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) {
           __pyx_v_j = __pyx_t_8;
 
-          /* "pyart/map/ckdtree.pyx":1465
+          /* "pyart/map/ckdtree.pyx":1466
  *                     results_i = results[self.raw_indices[i]]
  *                     for j in range(lnode2.start_idx, lnode2.end_idx):
  *                         list_append(results_i, other.raw_indices[j])             # <<<<<<<<<<<<<<
  *             else:
  * 
  */
-          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results_i, (__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1465, __pyx_L1_error)
+          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results_i, (__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1466, __pyx_L1_error)
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":1459
+      /* "pyart/map/ckdtree.pyx":1460
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -20108,7 +20108,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":1468
+    /* "pyart/map/ckdtree.pyx":1469
  *             else:
  * 
  *                 self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.less)             # <<<<<<<<<<<<<<
@@ -20116,20 +20116,20 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  *         else:
  */
     /*else*/ {
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1468, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1469, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1469
+      /* "pyart/map/ckdtree.pyx":1470
  * 
  *                 self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.less)
  *                 self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.greater)             # <<<<<<<<<<<<<<
  *         else:
  * 
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1469, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1470, __pyx_L1_error)
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":1456
+    /* "pyart/map/ckdtree.pyx":1457
  *         cdef np.intp_t i, j
  * 
  *         if node1.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -20139,7 +20139,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1472
+  /* "pyart/map/ckdtree.pyx":1473
  *         else:
  * 
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1.less, node2)             # <<<<<<<<<<<<<<
@@ -20147,20 +20147,20 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  * 
  */
   /*else*/ {
-    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1472, __pyx_L1_error)
+    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1473, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1473
+    /* "pyart/map/ckdtree.pyx":1474
  * 
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1.less, node2)
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1473, __pyx_L1_error)
+    __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 1474, __pyx_L1_error)
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1475
+  /* "pyart/map/ckdtree.pyx":1476
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -20170,7 +20170,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1446
+  /* "pyart/map/ckdtree.pyx":1447
  *     # query_ball_tree
  *     # ---------------
  *     cdef int __query_ball_tree_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -20189,7 +20189,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1479
+/* "pyart/map/ckdtree.pyx":1480
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_ball_tree_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -20221,7 +20221,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_cKDTree__query_ball_tree_traverse_checking", 1);
 
-  /* "pyart/map/ckdtree.pyx":1491
+  /* "pyart/map/ckdtree.pyx":1492
  *         cdef np.intp_t i, j
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -20231,7 +20231,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_t_1 = (__pyx_v_tracker->min_distance > (__pyx_v_tracker->upper_bound * __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1492
+    /* "pyart/map/ckdtree.pyx":1493
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0             # <<<<<<<<<<<<<<
@@ -20241,7 +20241,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":1491
+    /* "pyart/map/ckdtree.pyx":1492
  *         cdef np.intp_t i, j
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -20250,7 +20250,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1493
+  /* "pyart/map/ckdtree.pyx":1494
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -20260,16 +20260,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_t_1 = (__pyx_v_tracker->max_distance < (__pyx_v_tracker->upper_bound / __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1494
+    /* "pyart/map/ckdtree.pyx":1495
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)             # <<<<<<<<<<<<<<
  *         elif node1.split_dim == -1:  # 1 is leaf node
  *             lnode1 = <leafnode*>node1
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1494, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1495, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1493
+    /* "pyart/map/ckdtree.pyx":1494
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -20279,7 +20279,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1495
+  /* "pyart/map/ckdtree.pyx":1496
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -20289,7 +20289,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_t_1 = (__pyx_v_node1->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1496
+    /* "pyart/map/ckdtree.pyx":1497
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node
  *             lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -20298,7 +20298,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
     __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-    /* "pyart/map/ckdtree.pyx":1498
+    /* "pyart/map/ckdtree.pyx":1499
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -20308,7 +20308,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1499
+      /* "pyart/map/ckdtree.pyx":1500
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves
  *                 lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -20317,7 +20317,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
       __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-      /* "pyart/map/ckdtree.pyx":1502
+      /* "pyart/map/ckdtree.pyx":1503
  * 
  *                 # brute-force
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -20329,7 +20329,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
       for (__pyx_t_5 = __pyx_v_lnode1->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {
         __pyx_v_i = __pyx_t_5;
 
-        /* "pyart/map/ckdtree.pyx":1503
+        /* "pyart/map/ckdtree.pyx":1504
  *                 # brute-force
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     results_i = results[self.raw_indices[i]]             # <<<<<<<<<<<<<<
@@ -20338,15 +20338,15 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  */
         if (unlikely(__pyx_v_results == Py_None)) {
           PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-          __PYX_ERR(0, 1503, __pyx_L1_error)
+          __PYX_ERR(0, 1504, __pyx_L1_error)
         }
-        __pyx_t_6 = __Pyx_GetItemInt_List(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_t_5numpy_intp_t, 1, __Pyx_PyInt_From_npy_intp, 1, 1, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1503, __pyx_L1_error)
+        __pyx_t_6 = __Pyx_GetItemInt_List(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_t_5numpy_intp_t, 1, __Pyx_PyInt_From_npy_intp, 1, 1, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1504, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_6);
-        if (!(likely(PyList_CheckExact(__pyx_t_6))||((__pyx_t_6) == Py_None) || __Pyx_RaiseUnexpectedTypeError("list", __pyx_t_6))) __PYX_ERR(0, 1503, __pyx_L1_error)
+        if (!(likely(PyList_CheckExact(__pyx_t_6))||((__pyx_t_6) == Py_None) || __Pyx_RaiseUnexpectedTypeError("list", __pyx_t_6))) __PYX_ERR(0, 1504, __pyx_L1_error)
         __Pyx_XDECREF_SET(__pyx_v_results_i, ((PyObject*)__pyx_t_6));
         __pyx_t_6 = 0;
 
-        /* "pyart/map/ckdtree.pyx":1504
+        /* "pyart/map/ckdtree.pyx":1505
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     results_i = results[self.raw_indices[i]]
  *                     for j in range(lnode2.start_idx, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -20358,17 +20358,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
         for (__pyx_t_9 = __pyx_v_lnode2->start_idx; __pyx_t_9 < __pyx_t_8; __pyx_t_9+=1) {
           __pyx_v_j = __pyx_t_9;
 
-          /* "pyart/map/ckdtree.pyx":1505
+          /* "pyart/map/ckdtree.pyx":1506
  *                     results_i = results[self.raw_indices[i]]
  *                     for j in range(lnode2.start_idx, lnode2.end_idx):
  *                         d = _distance_p(             # <<<<<<<<<<<<<<
  *                             self.raw_data + self.raw_indices[i] * self.m,
  *                             other.raw_data + other.raw_indices[j] * other.m,
  */
-          __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_10 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1505, __pyx_L1_error)
+          __pyx_t_10 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_10 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1506, __pyx_L1_error)
           __pyx_v_d = __pyx_t_10;
 
-          /* "pyart/map/ckdtree.pyx":1509
+          /* "pyart/map/ckdtree.pyx":1510
  *                             other.raw_data + other.raw_indices[j] * other.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -20378,16 +20378,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
           __pyx_t_1 = (__pyx_v_d <= __pyx_v_tracker->upper_bound);
           if (__pyx_t_1) {
 
-            /* "pyart/map/ckdtree.pyx":1510
+            /* "pyart/map/ckdtree.pyx":1511
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:
  *                             list_append(results_i, other.raw_indices[j])             # <<<<<<<<<<<<<<
  * 
  *             else:  # 1 is a leaf node, 2 is inner node
  */
-            __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results_i, (__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1510, __pyx_L1_error)
+            __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_list_append(__pyx_v_results_i, (__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1511, __pyx_L1_error)
 
-            /* "pyart/map/ckdtree.pyx":1509
+            /* "pyart/map/ckdtree.pyx":1510
  *                             other.raw_data + other.raw_indices[j] * other.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -20398,7 +20398,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":1498
+      /* "pyart/map/ckdtree.pyx":1499
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -20408,7 +20408,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":1514
+    /* "pyart/map/ckdtree.pyx":1515
  *             else:  # 1 is a leaf node, 2 is inner node
  * 
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
@@ -20416,56 +20416,56 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  *                     other, results, node1, node2.less, tracker)
  */
     /*else*/ {
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1514, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1515, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1515
+      /* "pyart/map/ckdtree.pyx":1516
  * 
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1515, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1516, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1517
+      /* "pyart/map/ckdtree.pyx":1518
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1517, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1518, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1519
+      /* "pyart/map/ckdtree.pyx":1520
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1519, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1520, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1520
+      /* "pyart/map/ckdtree.pyx":1521
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1520, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1521, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1522
+      /* "pyart/map/ckdtree.pyx":1523
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1522, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1523, __pyx_L1_error)
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":1495
+    /* "pyart/map/ckdtree.pyx":1496
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -20475,7 +20475,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1526
+  /* "pyart/map/ckdtree.pyx":1527
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -20486,61 +20486,61 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1527
+      /* "pyart/map/ckdtree.pyx":1528
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1527, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1528, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1528
+      /* "pyart/map/ckdtree.pyx":1529
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1528, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1529, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1530
+      /* "pyart/map/ckdtree.pyx":1531
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(1, node1)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1530, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1531, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1532
+      /* "pyart/map/ckdtree.pyx":1533
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1532, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1533, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1533
+      /* "pyart/map/ckdtree.pyx":1534
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.greater, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1533, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1534, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1535
+      /* "pyart/map/ckdtree.pyx":1536
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *             else: # 1 & 2 are inner nodes
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1535, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1536, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1526
+      /* "pyart/map/ckdtree.pyx":1527
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -20550,7 +20550,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
       goto __pyx_L10;
     }
 
-    /* "pyart/map/ckdtree.pyx":1539
+    /* "pyart/map/ckdtree.pyx":1540
  *             else: # 1 & 2 are inner nodes
  * 
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
@@ -20558,148 +20558,148 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
  *                 self.__query_ball_tree_traverse_checking(
  */
     /*else*/ {
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1539, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1540, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1540
+      /* "pyart/map/ckdtree.pyx":1541
  * 
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2.less, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1540, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1541, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1541
+      /* "pyart/map/ckdtree.pyx":1542
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1541, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1542, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1543
+      /* "pyart/map/ckdtree.pyx":1544
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1543, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1544, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1545
+      /* "pyart/map/ckdtree.pyx":1546
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1545, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1546, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1546
+      /* "pyart/map/ckdtree.pyx":1547
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1546, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1547, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1548
+      /* "pyart/map/ckdtree.pyx":1549
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1548, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1549, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1549
+      /* "pyart/map/ckdtree.pyx":1550
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1549, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1550, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1552
+      /* "pyart/map/ckdtree.pyx":1553
  * 
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1552, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1553, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1553
+      /* "pyart/map/ckdtree.pyx":1554
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2.less, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1553, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1554, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1554
+      /* "pyart/map/ckdtree.pyx":1555
  *                 tracker.push_greater_of(1, node1)
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.greater, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1554, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1555, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1556
+      /* "pyart/map/ckdtree.pyx":1557
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1556, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1557, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1558
+      /* "pyart/map/ckdtree.pyx":1559
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1558, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1559, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1559
+      /* "pyart/map/ckdtree.pyx":1560
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1559, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1560, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1561
+      /* "pyart/map/ckdtree.pyx":1562
  *                 self.__query_ball_tree_traverse_checking(
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1561, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1562, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1562
+      /* "pyart/map/ckdtree.pyx":1563
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1562, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1563, __pyx_L1_error)
     }
     __pyx_L10:;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1564
+  /* "pyart/map/ckdtree.pyx":1565
  *                 tracker.pop()
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -20709,7 +20709,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1479
+  /* "pyart/map/ckdtree.pyx":1480
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_ball_tree_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -20728,7 +20728,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_ball_tree_trave
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1567
+/* "pyart/map/ckdtree.pyx":1568
  * 
  * 
  *     def query_ball_tree(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -20799,7 +20799,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1567, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -20807,28 +20807,28 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1567, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("query_ball_tree", 0, 2, 4, 1); __PYX_ERR(0, 1567, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("query_ball_tree", 0, 2, 4, 1); __PYX_ERR(0, 1568, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1567, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  3:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_eps);
           if (value) { values[3] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1567, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_ball_tree") < 0)) __PYX_ERR(0, 1567, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_ball_tree") < 0)) __PYX_ERR(0, 1568, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -20843,21 +20843,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       }
     }
     __pyx_v_other = ((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)values[0]);
-    __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
+    __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1569, __pyx_L3_error)
     if (values[2]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1569, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);
     }
     if (values[3]) {
-      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1568, __pyx_L3_error)
+      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1569, __pyx_L3_error)
     } else {
       __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("query_ball_tree", 0, 2, 4, __pyx_nargs); __PYX_ERR(0, 1567, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("query_ball_tree", 0, 2, 4, __pyx_nargs); __PYX_ERR(0, 1568, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -20871,7 +20871,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __Pyx_RefNannyFinishContext();
   return NULL;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 1567, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 1568, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_r, __pyx_v_p, __pyx_v_eps);
 
   /* function exit code */
@@ -20911,7 +20911,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("query_ball_tree", 1);
 
-  /* "pyart/map/ckdtree.pyx":1597
+  /* "pyart/map/ckdtree.pyx":1598
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -20921,20 +20921,20 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
   __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":1598
+    /* "pyart/map/ckdtree.pyx":1599
  *         # Make sure trees are compatible
  *         if self.m != other.m:
  *             raise ValueError("Trees passed to query_ball_trees have different dimensionality")             # <<<<<<<<<<<<<<
  * 
  *         # Track node-to-node min/max distances
  */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1598, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1599, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 1598, __pyx_L1_error)
+    __PYX_ERR(0, 1599, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1597
+    /* "pyart/map/ckdtree.pyx":1598
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -20943,89 +20943,89 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1602
+  /* "pyart/map/ckdtree.pyx":1603
  *         # Track node-to-node min/max distances
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *             Rectangle(other.mins, other.maxes),
  *             p, eps, r)
  */
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1602, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1603, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1602, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1603, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1602, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1602, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1603, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1603, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1603
+  /* "pyart/map/ckdtree.pyx":1604
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),             # <<<<<<<<<<<<<<
  *             p, eps, r)
  * 
  */
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1603, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1604, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_other->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 1603, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 1604, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_other->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 1603, __pyx_L1_error);
-  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1603, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 1604, __pyx_L1_error);
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1604, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1604
+  /* "pyart/map/ckdtree.pyx":1605
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  *             p, eps, r)             # <<<<<<<<<<<<<<
  * 
  *         results = [[] for i in range(self.n)]
  */
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1604, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1605, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_eps); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1604, __pyx_L1_error)
+  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_eps); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1605, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_6 = PyFloat_FromDouble(__pyx_v_r); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1604, __pyx_L1_error)
+  __pyx_t_6 = PyFloat_FromDouble(__pyx_v_r); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1605, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
 
-  /* "pyart/map/ckdtree.pyx":1601
+  /* "pyart/map/ckdtree.pyx":1602
  * 
  *         # Track node-to-node min/max distances
  *         tracker = RectRectDistanceTracker(             # <<<<<<<<<<<<<<
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  */
-  __pyx_t_7 = PyTuple_New(5); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1601, __pyx_L1_error)
+  __pyx_t_7 = PyTuple_New(5); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1602, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3)) __PYX_ERR(0, 1601, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3)) __PYX_ERR(0, 1602, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_4)) __PYX_ERR(0, 1601, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_4)) __PYX_ERR(0, 1602, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_2)) __PYX_ERR(0, 1601, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_2)) __PYX_ERR(0, 1602, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 3, __pyx_t_5)) __PYX_ERR(0, 1601, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 3, __pyx_t_5)) __PYX_ERR(0, 1602, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_6);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 4, __pyx_t_6)) __PYX_ERR(0, 1601, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 4, __pyx_t_6)) __PYX_ERR(0, 1602, __pyx_L1_error);
   __pyx_t_3 = 0;
   __pyx_t_4 = 0;
   __pyx_t_2 = 0;
   __pyx_t_5 = 0;
   __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1601, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1602, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   __pyx_v_tracker = ((struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_t_6);
   __pyx_t_6 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1606
+  /* "pyart/map/ckdtree.pyx":1607
  *             p, eps, r)
  * 
  *         results = [[] for i in range(self.n)]             # <<<<<<<<<<<<<<
@@ -21033,31 +21033,31 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
  *             other, results, self.tree, other.tree, tracker)
  */
   { /* enter inner scope */
-    __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1606, __pyx_L1_error)
+    __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1607, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __pyx_t_8 = __pyx_v_self->n;
     __pyx_t_9 = __pyx_t_8;
     for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) {
       __pyx_7genexpr__pyx_v_i = __pyx_t_10;
-      __pyx_t_7 = PyList_New(0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1606, __pyx_L1_error)
+      __pyx_t_7 = PyList_New(0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1607, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_7);
-      if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_7))) __PYX_ERR(0, 1606, __pyx_L1_error)
+      if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_7))) __PYX_ERR(0, 1607, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     }
   } /* exit inner scope */
   __pyx_v_results = ((PyObject*)__pyx_t_6);
   __pyx_t_6 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1607
+  /* "pyart/map/ckdtree.pyx":1608
  * 
  *         results = [[] for i in range(self.n)]
  *         self.__query_ball_tree_traverse_checking(             # <<<<<<<<<<<<<<
  *             other, results, self.tree, other.tree, tracker)
  * 
  */
-  __pyx_t_11 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 1607, __pyx_L1_error)
+  __pyx_t_11 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 1608, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1610
+  /* "pyart/map/ckdtree.pyx":1611
  *             other, results, self.tree, other.tree, tracker)
  * 
  *         return results             # <<<<<<<<<<<<<<
@@ -21069,7 +21069,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
   __pyx_r = __pyx_v_results;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1567
+  /* "pyart/map/ckdtree.pyx":1568
  * 
  * 
  *     def query_ball_tree(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -21095,7 +21095,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8query_ball_tree(struct
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1616
+/* "pyart/map/ckdtree.pyx":1617
  *     # query_pairs
  *     # -----------
  *     cdef int __query_pairs_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -21122,7 +21122,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":1625
+  /* "pyart/map/ckdtree.pyx":1626
  *         cdef np.intp_t i, j, min_j
  * 
  *         if node1.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -21132,7 +21132,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_t_1 = (__pyx_v_node1->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1626
+    /* "pyart/map/ckdtree.pyx":1627
  * 
  *         if node1.split_dim == -1:  # leaf node
  *             lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -21141,7 +21141,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
     __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-    /* "pyart/map/ckdtree.pyx":1628
+    /* "pyart/map/ckdtree.pyx":1629
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -21151,7 +21151,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1629
+      /* "pyart/map/ckdtree.pyx":1630
  * 
  *             if node2.split_dim == -1:  # leaf node
  *                 lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -21160,7 +21160,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
       __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-      /* "pyart/map/ckdtree.pyx":1631
+      /* "pyart/map/ckdtree.pyx":1632
  *                 lnode2 = <leafnode*>node2
  * 
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -21172,7 +21172,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
         __pyx_v_i = __pyx_t_4;
 
-        /* "pyart/map/ckdtree.pyx":1633
+        /* "pyart/map/ckdtree.pyx":1634
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21182,7 +21182,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":1634
+          /* "pyart/map/ckdtree.pyx":1635
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:
  *                         min_j = i + 1             # <<<<<<<<<<<<<<
@@ -21191,7 +21191,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
           __pyx_v_min_j = (__pyx_v_i + 1);
 
-          /* "pyart/map/ckdtree.pyx":1633
+          /* "pyart/map/ckdtree.pyx":1634
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21201,7 +21201,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
           goto __pyx_L7;
         }
 
-        /* "pyart/map/ckdtree.pyx":1636
+        /* "pyart/map/ckdtree.pyx":1637
  *                         min_j = i + 1
  *                     else:
  *                         min_j = lnode2.start_idx             # <<<<<<<<<<<<<<
@@ -21214,7 +21214,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         }
         __pyx_L7:;
 
-        /* "pyart/map/ckdtree.pyx":1638
+        /* "pyart/map/ckdtree.pyx":1639
  *                         min_j = lnode2.start_idx
  * 
  *                     for j in range(min_j, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -21226,18 +21226,18 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         for (__pyx_t_7 = __pyx_v_min_j; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
           __pyx_v_j = __pyx_t_7;
 
-          /* "pyart/map/ckdtree.pyx":1639
+          /* "pyart/map/ckdtree.pyx":1640
  * 
  *                     for j in range(min_j, lnode2.end_idx):
  *                         set_add_ordered_pair(results,             # <<<<<<<<<<<<<<
  *                                              self.raw_indices[i],
  *                                              self.raw_indices[j])
  */
-          __pyx_t_8 = __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1639, __pyx_L1_error)
+          __pyx_t_8 = __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1640, __pyx_L1_error)
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":1628
+      /* "pyart/map/ckdtree.pyx":1629
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -21247,7 +21247,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":1644
+    /* "pyart/map/ckdtree.pyx":1645
  * 
  *             else:
  *                 self.__query_pairs_traverse_no_checking(results, node1, node2.less)             # <<<<<<<<<<<<<<
@@ -21255,20 +21255,20 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  *         else:
  */
     /*else*/ {
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1644, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1645, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1645
+      /* "pyart/map/ckdtree.pyx":1646
  *             else:
  *                 self.__query_pairs_traverse_no_checking(results, node1, node2.less)
  *                 self.__query_pairs_traverse_no_checking(results, node1, node2.greater)             # <<<<<<<<<<<<<<
  *         else:
  *             if node1 == node2:
  */
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1645, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1646, __pyx_L1_error)
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":1625
+    /* "pyart/map/ckdtree.pyx":1626
  *         cdef np.intp_t i, j, min_j
  * 
  *         if node1.split_dim == -1:  # leaf node             # <<<<<<<<<<<<<<
@@ -21278,7 +21278,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1647
+  /* "pyart/map/ckdtree.pyx":1648
  *                 self.__query_pairs_traverse_no_checking(results, node1, node2.greater)
  *         else:
  *             if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21289,34 +21289,34 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1652
+      /* "pyart/map/ckdtree.pyx":1653
  *                 # over, which is the source of the complication in the
  *                 # original KDTree.query_pairs)
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.less)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater)
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)
  */
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1652, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1653, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1653
+      /* "pyart/map/ckdtree.pyx":1654
  *                 # original KDTree.query_pairs)
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.less)
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)
  *             else:
  */
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1653, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1654, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1654
+      /* "pyart/map/ckdtree.pyx":1655
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.less)
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater)
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)             # <<<<<<<<<<<<<<
  *             else:
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2)
  */
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1654, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1655, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1647
+      /* "pyart/map/ckdtree.pyx":1648
  *                 self.__query_pairs_traverse_no_checking(results, node1, node2.greater)
  *         else:
  *             if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21326,7 +21326,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       goto __pyx_L10;
     }
 
-    /* "pyart/map/ckdtree.pyx":1656
+    /* "pyart/map/ckdtree.pyx":1657
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)
  *             else:
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2)             # <<<<<<<<<<<<<<
@@ -21334,22 +21334,22 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  * 
  */
     /*else*/ {
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1656, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1657, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1657
+      /* "pyart/map/ckdtree.pyx":1658
  *             else:
  *                 self.__query_pairs_traverse_no_checking(results, node1.less, node2)
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2)             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1657, __pyx_L1_error)
+      __pyx_t_8 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 1658, __pyx_L1_error)
     }
     __pyx_L10:;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1659
+  /* "pyart/map/ckdtree.pyx":1660
  *                 self.__query_pairs_traverse_no_checking(results, node1.greater, node2)
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -21359,7 +21359,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1616
+  /* "pyart/map/ckdtree.pyx":1617
  *     # query_pairs
  *     # -----------
  *     cdef int __query_pairs_traverse_no_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -21375,7 +21375,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1662
+/* "pyart/map/ckdtree.pyx":1663
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_pairs_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -21404,7 +21404,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":1673
+  /* "pyart/map/ckdtree.pyx":1674
  *         cdef np.intp_t i, j, min_j
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -21414,7 +21414,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_t_1 = (__pyx_v_tracker->min_distance > (__pyx_v_tracker->upper_bound * __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1674
+    /* "pyart/map/ckdtree.pyx":1675
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0             # <<<<<<<<<<<<<<
@@ -21424,7 +21424,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":1673
+    /* "pyart/map/ckdtree.pyx":1674
  *         cdef np.intp_t i, j, min_j
  * 
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -21433,7 +21433,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1675
+  /* "pyart/map/ckdtree.pyx":1676
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -21443,16 +21443,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_t_1 = (__pyx_v_tracker->max_distance < (__pyx_v_tracker->upper_bound / __pyx_v_tracker->epsfac));
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1676
+    /* "pyart/map/ckdtree.pyx":1677
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_pairs_traverse_no_checking(results, node1, node2)             # <<<<<<<<<<<<<<
  *         elif node1.split_dim == -1:  # 1 is leaf node
  *             lnode1 = <leafnode*>node1
  */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1676, __pyx_L1_error)
+    __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1677, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1675
+    /* "pyart/map/ckdtree.pyx":1676
  *         if tracker.min_distance > tracker.upper_bound * tracker.epsfac:
  *             return 0
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:             # <<<<<<<<<<<<<<
@@ -21462,7 +21462,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1677
+  /* "pyart/map/ckdtree.pyx":1678
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_pairs_traverse_no_checking(results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -21472,7 +21472,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_t_1 = (__pyx_v_node1->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1678
+    /* "pyart/map/ckdtree.pyx":1679
  *             self.__query_pairs_traverse_no_checking(results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node
  *             lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -21481,7 +21481,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
     __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-    /* "pyart/map/ckdtree.pyx":1680
+    /* "pyart/map/ckdtree.pyx":1681
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -21491,7 +21491,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1681
+      /* "pyart/map/ckdtree.pyx":1682
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves
  *                 lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -21500,7 +21500,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
       __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-      /* "pyart/map/ckdtree.pyx":1684
+      /* "pyart/map/ckdtree.pyx":1685
  * 
  *                 # brute-force
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -21512,7 +21512,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       for (__pyx_t_5 = __pyx_v_lnode1->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {
         __pyx_v_i = __pyx_t_5;
 
-        /* "pyart/map/ckdtree.pyx":1687
+        /* "pyart/map/ckdtree.pyx":1688
  * 
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21522,7 +21522,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":1688
+          /* "pyart/map/ckdtree.pyx":1689
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:
  *                         min_j = i + 1             # <<<<<<<<<<<<<<
@@ -21531,7 +21531,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
           __pyx_v_min_j = (__pyx_v_i + 1);
 
-          /* "pyart/map/ckdtree.pyx":1687
+          /* "pyart/map/ckdtree.pyx":1688
  * 
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -21541,7 +21541,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
           goto __pyx_L7;
         }
 
-        /* "pyart/map/ckdtree.pyx":1690
+        /* "pyart/map/ckdtree.pyx":1691
  *                         min_j = i + 1
  *                     else:
  *                         min_j = lnode2.start_idx             # <<<<<<<<<<<<<<
@@ -21554,7 +21554,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         }
         __pyx_L7:;
 
-        /* "pyart/map/ckdtree.pyx":1692
+        /* "pyart/map/ckdtree.pyx":1693
  *                         min_j = lnode2.start_idx
  * 
  *                     for j in range(min_j, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -21566,17 +21566,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         for (__pyx_t_8 = __pyx_v_min_j; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) {
           __pyx_v_j = __pyx_t_8;
 
-          /* "pyart/map/ckdtree.pyx":1693
+          /* "pyart/map/ckdtree.pyx":1694
  * 
  *                     for j in range(min_j, lnode2.end_idx):
  *                         d = _distance_p(             # <<<<<<<<<<<<<<
  *                             self.raw_data + self.raw_indices[i] * self.m,
  *                             self.raw_data + self.raw_indices[j] * self.m,
  */
-          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1693, __pyx_L1_error)
+          __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_9 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1694, __pyx_L1_error)
           __pyx_v_d = __pyx_t_9;
 
-          /* "pyart/map/ckdtree.pyx":1697
+          /* "pyart/map/ckdtree.pyx":1698
  *                             self.raw_data + self.raw_indices[j] * self.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -21586,16 +21586,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
           __pyx_t_1 = (__pyx_v_d <= __pyx_v_tracker->upper_bound);
           if (__pyx_t_1) {
 
-            /* "pyart/map/ckdtree.pyx":1698
+            /* "pyart/map/ckdtree.pyx":1699
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:
  *                             set_add_ordered_pair(results,             # <<<<<<<<<<<<<<
  *                                                  self.raw_indices[i],
  *                                                  self.raw_indices[j])
  */
-            __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1698, __pyx_L1_error)
+            __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_set_add_ordered_pair(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1699, __pyx_L1_error)
 
-            /* "pyart/map/ckdtree.pyx":1697
+            /* "pyart/map/ckdtree.pyx":1698
  *                             self.raw_data + self.raw_indices[j] * self.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -21606,7 +21606,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":1680
+      /* "pyart/map/ckdtree.pyx":1681
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -21616,7 +21616,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":1703
+    /* "pyart/map/ckdtree.pyx":1704
  * 
  *             else:  # 1 is a leaf node, 2 is inner node
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
@@ -21624,56 +21624,56 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  *                     results, node1, node2.less, tracker)
  */
     /*else*/ {
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1703, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1704, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1704
+      /* "pyart/map/ckdtree.pyx":1705
  *             else:  # 1 is a leaf node, 2 is inner node
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1704, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1705, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1706
+      /* "pyart/map/ckdtree.pyx":1707
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1706, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1707, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1708
+      /* "pyart/map/ckdtree.pyx":1709
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1708, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1709, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1709
+      /* "pyart/map/ckdtree.pyx":1710
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1709, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1710, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1711
+      /* "pyart/map/ckdtree.pyx":1712
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         else:  # 1 is an inner node
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1711, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1712, __pyx_L1_error)
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":1677
+    /* "pyart/map/ckdtree.pyx":1678
  *         elif tracker.max_distance < tracker.upper_bound / tracker.epsfac:
  *             self.__query_pairs_traverse_no_checking(results, node1, node2)
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -21683,7 +21683,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":1714
+  /* "pyart/map/ckdtree.pyx":1715
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -21694,61 +21694,61 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1715
+      /* "pyart/map/ckdtree.pyx":1716
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1715, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1716, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1716
+      /* "pyart/map/ckdtree.pyx":1717
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1.less, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1716, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1717, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1718
+      /* "pyart/map/ckdtree.pyx":1719
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(1, node1)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1718, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1719, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1720
+      /* "pyart/map/ckdtree.pyx":1721
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.greater, node2, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1720, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1721, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1721
+      /* "pyart/map/ckdtree.pyx":1722
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1.greater, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1721, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1722, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1723
+      /* "pyart/map/ckdtree.pyx":1724
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.greater, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *             else: # 1 and 2 are inner nodes
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1723, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1724, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1714
+      /* "pyart/map/ckdtree.pyx":1715
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -21758,7 +21758,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       goto __pyx_L11;
     }
 
-    /* "pyart/map/ckdtree.pyx":1726
+    /* "pyart/map/ckdtree.pyx":1727
  * 
  *             else: # 1 and 2 are inner nodes
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
@@ -21766,81 +21766,81 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  *                 self.__query_pairs_traverse_checking(
  */
     /*else*/ {
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1726, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1727, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1727
+      /* "pyart/map/ckdtree.pyx":1728
  *             else: # 1 and 2 are inner nodes
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2.less, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1727, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1728, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1728
+      /* "pyart/map/ckdtree.pyx":1729
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1.less, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1728, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1729, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1730
+      /* "pyart/map/ckdtree.pyx":1731
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1730, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1731, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1732
+      /* "pyart/map/ckdtree.pyx":1733
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1732, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1733, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1733
+      /* "pyart/map/ckdtree.pyx":1734
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1733, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1734, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1735
+      /* "pyart/map/ckdtree.pyx":1736
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.less, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1735, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1736, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1736
+      /* "pyart/map/ckdtree.pyx":1737
  *                     results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(1, node1)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1736, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1737, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1738
+      /* "pyart/map/ckdtree.pyx":1739
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 if node1 != node2:
  *                     # Avoid traversing (node1.less, node2.greater) and
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1738, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1739, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1739
+      /* "pyart/map/ckdtree.pyx":1740
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 if node1 != node2:             # <<<<<<<<<<<<<<
@@ -21850,34 +21850,34 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
       __pyx_t_1 = (__pyx_v_node1 != __pyx_v_node2);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":1744
+        /* "pyart/map/ckdtree.pyx":1745
  *                     # twice over, which is the source of the complication in
  *                     # the original KDTree.query_pairs)
  *                     tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__query_pairs_traverse_checking(
  *                         results, node1.greater, node2.less, tracker)
  */
-        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1744, __pyx_L1_error)
+        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1745, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1745
+        /* "pyart/map/ckdtree.pyx":1746
  *                     # the original KDTree.query_pairs)
  *                     tracker.push_less_of(2, node2)
  *                     self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                         results, node1.greater, node2.less, tracker)
  *                     tracker.pop()
  */
-        __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1745, __pyx_L1_error)
+        __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1746, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1747
+        /* "pyart/map/ckdtree.pyx":1748
  *                     self.__query_pairs_traverse_checking(
  *                         results, node1.greater, node2.less, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1747, __pyx_L1_error)
+        __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1748, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1739
+        /* "pyart/map/ckdtree.pyx":1740
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 if node1 != node2:             # <<<<<<<<<<<<<<
@@ -21886,47 +21886,47 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":1749
+      /* "pyart/map/ckdtree.pyx":1750
  *                     tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.greater, node2.greater, tracker)
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1749, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1750, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1750
+      /* "pyart/map/ckdtree.pyx":1751
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *                     results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1750, __pyx_L1_error)
+      __pyx_t_2 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1751, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1752
+      /* "pyart/map/ckdtree.pyx":1753
  *                 self.__query_pairs_traverse_checking(
  *                     results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1752, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1753, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":1753
+      /* "pyart/map/ckdtree.pyx":1754
  *                     results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1753, __pyx_L1_error)
+      __pyx_t_2 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 1754, __pyx_L1_error)
     }
     __pyx_L11:;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":1755
+  /* "pyart/map/ckdtree.pyx":1756
  *                 tracker.pop()
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -21936,7 +21936,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1662
+  /* "pyart/map/ckdtree.pyx":1663
  * 
  *     @cython.cdivision(True)
  *     cdef int __query_pairs_traverse_checking(cKDTree self,             # <<<<<<<<<<<<<<
@@ -21952,7 +21952,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__query_pairs_traverse_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1758
+/* "pyart/map/ckdtree.pyx":1759
  * 
  * 
  *     def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,             # <<<<<<<<<<<<<<
@@ -22020,26 +22020,26 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1758, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1758, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_eps);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1758, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_pairs") < 0)) __PYX_ERR(0, 1758, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "query_pairs") < 0)) __PYX_ERR(0, 1759, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -22052,21 +22052,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
         default: goto __pyx_L5_argtuple_error;
       }
     }
-    __pyx_v_r = __pyx_PyFloat_AsDouble(values[0]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1758, __pyx_L3_error)
+    __pyx_v_r = __pyx_PyFloat_AsDouble(values[0]); if (unlikely((__pyx_v_r == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
     if (values[1]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1758, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);
     }
     if (values[2]) {
-      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1759, __pyx_L3_error)
+      __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1760, __pyx_L3_error)
     } else {
       __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("query_pairs", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 1758, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("query_pairs", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 1759, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -22110,110 +22110,110 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_10query_pairs(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("query_pairs", 1);
 
-  /* "pyart/map/ckdtree.pyx":1786
+  /* "pyart/map/ckdtree.pyx":1787
  * 
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *             Rectangle(self.mins, self.maxes),
  *             p, eps, r)
  */
-  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1786, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1787, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1786, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1787, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1786, __pyx_L1_error);
-  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1786, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1787, __pyx_L1_error);
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1787, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1787
+  /* "pyart/map/ckdtree.pyx":1788
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *             p, eps, r)
  * 
  */
-  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1787, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1788, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1787, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1788, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1787, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1787, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1788, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1788, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1788
+  /* "pyart/map/ckdtree.pyx":1789
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(self.mins, self.maxes),
  *             p, eps, r)             # <<<<<<<<<<<<<<
  * 
  *         results = set()
  */
-  __pyx_t_1 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1788, __pyx_L1_error)
+  __pyx_t_1 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1789, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_eps); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1788, __pyx_L1_error)
+  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_eps); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1789, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_r); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1788, __pyx_L1_error)
+  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_r); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1789, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
 
-  /* "pyart/map/ckdtree.pyx":1785
+  /* "pyart/map/ckdtree.pyx":1786
  *         """
  * 
  *         tracker = RectRectDistanceTracker(             # <<<<<<<<<<<<<<
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(self.mins, self.maxes),
  */
-  __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1785, __pyx_L1_error)
+  __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1786, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2)) __PYX_ERR(0, 1785, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2)) __PYX_ERR(0, 1786, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3)) __PYX_ERR(0, 1785, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3)) __PYX_ERR(0, 1786, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_t_1)) __PYX_ERR(0, 1785, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_t_1)) __PYX_ERR(0, 1786, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 3, __pyx_t_4)) __PYX_ERR(0, 1785, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 3, __pyx_t_4)) __PYX_ERR(0, 1786, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 4, __pyx_t_5)) __PYX_ERR(0, 1785, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 4, __pyx_t_5)) __PYX_ERR(0, 1786, __pyx_L1_error);
   __pyx_t_2 = 0;
   __pyx_t_3 = 0;
   __pyx_t_1 = 0;
   __pyx_t_4 = 0;
   __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1785, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1786, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_v_tracker = ((struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1790
+  /* "pyart/map/ckdtree.pyx":1791
  *             p, eps, r)
  * 
  *         results = set()             # <<<<<<<<<<<<<<
  *         self.__query_pairs_traverse_checking(
  *             results, self.tree, self.tree, tracker)
  */
-  __pyx_t_5 = PySet_New(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1790, __pyx_L1_error)
+  __pyx_t_5 = PySet_New(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1791, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_v_results = ((PyObject*)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1791
+  /* "pyart/map/ckdtree.pyx":1792
  * 
  *         results = set()
  *         self.__query_pairs_traverse_checking(             # <<<<<<<<<<<<<<
  *             results, self.tree, self.tree, tracker)
  * 
  */
-  __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_self->tree, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1791, __pyx_L1_error)
+  __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_self->tree, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1792, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1794
+  /* "pyart/map/ckdtree.pyx":1795
  *             results, self.tree, self.tree, tracker)
  * 
  *         return results             # <<<<<<<<<<<<<<
@@ -22225,7 +22225,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_10query_pairs(struct __p
   __pyx_r = __pyx_v_results;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1758
+  /* "pyart/map/ckdtree.pyx":1759
  * 
  * 
  *     def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,             # <<<<<<<<<<<<<<
@@ -22251,7 +22251,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_10query_pairs(struct __p
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1800
+/* "pyart/map/ckdtree.pyx":1801
  *     # count_neighbors
  *     # ---------------
  *     cdef int __count_neighbors_traverse(cKDTree self,             # <<<<<<<<<<<<<<
@@ -22305,7 +22305,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   __pyx_pybuffernd_inner_idx.data = NULL;
   __pyx_pybuffernd_inner_idx.rcbuffer = &__pyx_pybuffer_inner_idx;
 
-  /* "pyart/map/ckdtree.pyx":1817
+  /* "pyart/map/ckdtree.pyx":1818
  *         # Speed through pairs of nodes all of whose children are close
  *         # and see if any work remains to be done
  *         old_idx = idx             # <<<<<<<<<<<<<<
@@ -22314,45 +22314,45 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
   __pyx_v_old_idx = __pyx_v_idx;
 
-  /* "pyart/map/ckdtree.pyx":1819
+  /* "pyart/map/ckdtree.pyx":1820
  *         old_idx = idx
  *         cdef np.ndarray[np.intp_t, ndim=1] inner_idx
  *         inner_idx = np.empty((n_queries,), dtype=np.intp)             # <<<<<<<<<<<<<<
  *         idx = &inner_idx[0]
  * 
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 1819, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 1820, __pyx_L1_error);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3)) __PYX_ERR(0, 1819, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3)) __PYX_ERR(0, 1820, __pyx_L1_error);
   __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_intp); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_intp); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 1819, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1819, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1820, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1819, __pyx_L1_error)
+  if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1820, __pyx_L1_error)
   __pyx_t_6 = ((PyArrayObject *)__pyx_t_5);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -22369,13 +22369,13 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       __pyx_t_8 = __pyx_t_9 = __pyx_t_10 = 0;
     }
     __pyx_pybuffernd_inner_idx.diminfo[0].strides = __pyx_pybuffernd_inner_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_inner_idx.diminfo[0].shape = __pyx_pybuffernd_inner_idx.rcbuffer->pybuffer.shape[0];
-    if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1819, __pyx_L1_error)
+    if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1820, __pyx_L1_error)
   }
   __pyx_t_6 = 0;
   __pyx_v_inner_idx = ((PyArrayObject *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1820
+  /* "pyart/map/ckdtree.pyx":1821
  *         cdef np.ndarray[np.intp_t, ndim=1] inner_idx
  *         inner_idx = np.empty((n_queries,), dtype=np.intp)
  *         idx = &inner_idx[0]             # <<<<<<<<<<<<<<
@@ -22390,11 +22390,11 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   } else if (unlikely(__pyx_t_11 >= __pyx_pybuffernd_inner_idx.diminfo[0].shape)) __pyx_t_7 = 0;
   if (unlikely(__pyx_t_7 != -1)) {
     __Pyx_RaiseBufferIndexError(__pyx_t_7);
-    __PYX_ERR(0, 1820, __pyx_L1_error)
+    __PYX_ERR(0, 1821, __pyx_L1_error)
   }
   __pyx_v_idx = (&(*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_inner_idx.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_inner_idx.diminfo[0].strides)));
 
-  /* "pyart/map/ckdtree.pyx":1822
+  /* "pyart/map/ckdtree.pyx":1823
  *         idx = &inner_idx[0]
  * 
  *         old_n_queries = n_queries             # <<<<<<<<<<<<<<
@@ -22403,7 +22403,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
   __pyx_v_old_n_queries = __pyx_v_n_queries;
 
-  /* "pyart/map/ckdtree.pyx":1823
+  /* "pyart/map/ckdtree.pyx":1824
  * 
  *         old_n_queries = n_queries
  *         n_queries = 0             # <<<<<<<<<<<<<<
@@ -22412,7 +22412,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
   __pyx_v_n_queries = 0;
 
-  /* "pyart/map/ckdtree.pyx":1824
+  /* "pyart/map/ckdtree.pyx":1825
  *         old_n_queries = n_queries
  *         n_queries = 0
  *         for i in range(old_n_queries):             # <<<<<<<<<<<<<<
@@ -22424,7 +22424,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
     __pyx_v_i = __pyx_t_14;
 
-    /* "pyart/map/ckdtree.pyx":1825
+    /* "pyart/map/ckdtree.pyx":1826
  *         n_queries = 0
  *         for i in range(old_n_queries):
  *             if tracker.max_distance < r[old_idx[i]]:             # <<<<<<<<<<<<<<
@@ -22434,7 +22434,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
     __pyx_t_15 = (__pyx_v_tracker->max_distance < (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));
     if (__pyx_t_15) {
 
-      /* "pyart/map/ckdtree.pyx":1826
+      /* "pyart/map/ckdtree.pyx":1827
  *         for i in range(old_n_queries):
  *             if tracker.max_distance < r[old_idx[i]]:
  *                 results[old_idx[i]] += node1.children * node2.children             # <<<<<<<<<<<<<<
@@ -22444,7 +22444,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       __pyx_t_16 = (__pyx_v_old_idx[__pyx_v_i]);
       (__pyx_v_results[__pyx_t_16]) = ((__pyx_v_results[__pyx_t_16]) + (__pyx_v_node1->children * __pyx_v_node2->children));
 
-      /* "pyart/map/ckdtree.pyx":1825
+      /* "pyart/map/ckdtree.pyx":1826
  *         n_queries = 0
  *         for i in range(old_n_queries):
  *             if tracker.max_distance < r[old_idx[i]]:             # <<<<<<<<<<<<<<
@@ -22454,7 +22454,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       goto __pyx_L5;
     }
 
-    /* "pyart/map/ckdtree.pyx":1827
+    /* "pyart/map/ckdtree.pyx":1828
  *             if tracker.max_distance < r[old_idx[i]]:
  *                 results[old_idx[i]] += node1.children * node2.children
  *             elif tracker.min_distance <= r[old_idx[i]]:             # <<<<<<<<<<<<<<
@@ -22464,7 +22464,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
     __pyx_t_15 = (__pyx_v_tracker->min_distance <= (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));
     if (__pyx_t_15) {
 
-      /* "pyart/map/ckdtree.pyx":1828
+      /* "pyart/map/ckdtree.pyx":1829
  *                 results[old_idx[i]] += node1.children * node2.children
  *             elif tracker.min_distance <= r[old_idx[i]]:
  *                 idx[n_queries] = old_idx[i]             # <<<<<<<<<<<<<<
@@ -22473,7 +22473,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
       (__pyx_v_idx[__pyx_v_n_queries]) = (__pyx_v_old_idx[__pyx_v_i]);
 
-      /* "pyart/map/ckdtree.pyx":1829
+      /* "pyart/map/ckdtree.pyx":1830
  *             elif tracker.min_distance <= r[old_idx[i]]:
  *                 idx[n_queries] = old_idx[i]
  *                 n_queries += 1             # <<<<<<<<<<<<<<
@@ -22482,7 +22482,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
       __pyx_v_n_queries = (__pyx_v_n_queries + 1);
 
-      /* "pyart/map/ckdtree.pyx":1827
+      /* "pyart/map/ckdtree.pyx":1828
  *             if tracker.max_distance < r[old_idx[i]]:
  *                 results[old_idx[i]] += node1.children * node2.children
  *             elif tracker.min_distance <= r[old_idx[i]]:             # <<<<<<<<<<<<<<
@@ -22493,7 +22493,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
     __pyx_L5:;
   }
 
-  /* "pyart/map/ckdtree.pyx":1831
+  /* "pyart/map/ckdtree.pyx":1832
  *                 n_queries += 1
  * 
  *         if n_queries > 0:             # <<<<<<<<<<<<<<
@@ -22503,7 +22503,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   __pyx_t_15 = (__pyx_v_n_queries > 0);
   if (__pyx_t_15) {
 
-    /* "pyart/map/ckdtree.pyx":1833
+    /* "pyart/map/ckdtree.pyx":1834
  *         if n_queries > 0:
  *             # OK, need to probe a bit deeper
  *             if node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -22513,7 +22513,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
     __pyx_t_15 = (__pyx_v_node1->split_dim == -1L);
     if (__pyx_t_15) {
 
-      /* "pyart/map/ckdtree.pyx":1834
+      /* "pyart/map/ckdtree.pyx":1835
  *             # OK, need to probe a bit deeper
  *             if node1.split_dim == -1:  # 1 is leaf node
  *                 lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -22522,7 +22522,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
       __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-      /* "pyart/map/ckdtree.pyx":1835
+      /* "pyart/map/ckdtree.pyx":1836
  *             if node1.split_dim == -1:  # 1 is leaf node
  *                 lnode1 = <leafnode*>node1
  *                 if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -22532,7 +22532,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       __pyx_t_15 = (__pyx_v_node2->split_dim == -1L);
       if (__pyx_t_15) {
 
-        /* "pyart/map/ckdtree.pyx":1836
+        /* "pyart/map/ckdtree.pyx":1837
  *                 lnode1 = <leafnode*>node1
  *                 if node2.split_dim == -1:  # 1 & 2 are leaves
  *                     lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -22541,7 +22541,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
         __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-        /* "pyart/map/ckdtree.pyx":1839
+        /* "pyart/map/ckdtree.pyx":1840
  * 
  *                     # brute-force
  *                     for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -22553,7 +22553,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
         for (__pyx_t_14 = __pyx_v_lnode1->start_idx; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
           __pyx_v_i = __pyx_t_14;
 
-          /* "pyart/map/ckdtree.pyx":1840
+          /* "pyart/map/ckdtree.pyx":1841
  *                     # brute-force
  *                     for i in range(lnode1.start_idx, lnode1.end_idx):
  *                         for j in range(lnode2.start_idx, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -22565,17 +22565,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
           for (__pyx_t_18 = __pyx_v_lnode2->start_idx; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) {
             __pyx_v_j = __pyx_t_18;
 
-            /* "pyart/map/ckdtree.pyx":1841
+            /* "pyart/map/ckdtree.pyx":1842
  *                     for i in range(lnode1.start_idx, lnode1.end_idx):
  *                         for j in range(lnode2.start_idx, lnode2.end_idx):
  *                             d = _distance_p(             # <<<<<<<<<<<<<<
  *                                 self.raw_data + self.raw_indices[i] * self.m,
  *                                 other.raw_data + other.raw_indices[j] * other.m,
  */
-            __pyx_t_19 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->max_distance); if (unlikely(__pyx_t_19 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1841, __pyx_L1_error)
+            __pyx_t_19 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->max_distance); if (unlikely(__pyx_t_19 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 1842, __pyx_L1_error)
             __pyx_v_d = __pyx_t_19;
 
-            /* "pyart/map/ckdtree.pyx":1848
+            /* "pyart/map/ckdtree.pyx":1849
  *                             # than to generate a distance array, sort it, then
  *                             # search for all r's via binary search
  *                             for l in range(n_queries):             # <<<<<<<<<<<<<<
@@ -22587,7 +22587,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
             for (__pyx_t_22 = 0; __pyx_t_22 < __pyx_t_21; __pyx_t_22+=1) {
               __pyx_v_l = __pyx_t_22;
 
-              /* "pyart/map/ckdtree.pyx":1849
+              /* "pyart/map/ckdtree.pyx":1850
  *                             # search for all r's via binary search
  *                             for l in range(n_queries):
  *                                 if d <= r[idx[l]]:             # <<<<<<<<<<<<<<
@@ -22597,7 +22597,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
               __pyx_t_15 = (__pyx_v_d <= (__pyx_v_r[(__pyx_v_idx[__pyx_v_l])]));
               if (__pyx_t_15) {
 
-                /* "pyart/map/ckdtree.pyx":1850
+                /* "pyart/map/ckdtree.pyx":1851
  *                             for l in range(n_queries):
  *                                 if d <= r[idx[l]]:
  *                                     results[idx[l]] += 1             # <<<<<<<<<<<<<<
@@ -22607,7 +22607,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
                 __pyx_t_23 = (__pyx_v_idx[__pyx_v_l]);
                 (__pyx_v_results[__pyx_t_23]) = ((__pyx_v_results[__pyx_t_23]) + 1);
 
-                /* "pyart/map/ckdtree.pyx":1849
+                /* "pyart/map/ckdtree.pyx":1850
  *                             # search for all r's via binary search
  *                             for l in range(n_queries):
  *                                 if d <= r[idx[l]]:             # <<<<<<<<<<<<<<
@@ -22619,7 +22619,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
           }
         }
 
-        /* "pyart/map/ckdtree.pyx":1835
+        /* "pyart/map/ckdtree.pyx":1836
  *             if node1.split_dim == -1:  # 1 is leaf node
  *                 lnode1 = <leafnode*>node1
  *                 if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -22629,7 +22629,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
         goto __pyx_L8;
       }
 
-      /* "pyart/map/ckdtree.pyx":1853
+      /* "pyart/map/ckdtree.pyx":1854
  * 
  *                 else:  # 1 is a leaf node, 2 is inner node
  *                     tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
@@ -22637,56 +22637,56 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  *                         other, n_queries, r, results, idx,
  */
       /*else*/ {
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1853, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1854, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1854
+        /* "pyart/map/ckdtree.pyx":1855
  *                 else:  # 1 is a leaf node, 2 is inner node
  *                     tracker.push_less_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1, node2.less, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1854, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1855, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1857
+        /* "pyart/map/ckdtree.pyx":1858
  *                         other, n_queries, r, results, idx,
  *                         node1, node2.less, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                     tracker.push_greater_of(2, node2)
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1857, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1858, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1859
+        /* "pyart/map/ckdtree.pyx":1860
  *                     tracker.pop()
  * 
  *                     tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1859, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1860, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1860
+        /* "pyart/map/ckdtree.pyx":1861
  * 
  *                     tracker.push_greater_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1, node2.greater, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1860, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1861, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1863
+        /* "pyart/map/ckdtree.pyx":1864
  *                         other, n_queries, r, results, idx,
  *                         node1, node2.greater, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *             else:  # 1 is an inner node
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1863, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1864, __pyx_L1_error)
       }
       __pyx_L8:;
 
-      /* "pyart/map/ckdtree.pyx":1833
+      /* "pyart/map/ckdtree.pyx":1834
  *         if n_queries > 0:
  *             # OK, need to probe a bit deeper
  *             if node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -22696,7 +22696,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       goto __pyx_L7;
     }
 
-    /* "pyart/map/ckdtree.pyx":1866
+    /* "pyart/map/ckdtree.pyx":1867
  * 
  *             else:  # 1 is an inner node
  *                 if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -22707,61 +22707,61 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
       __pyx_t_15 = (__pyx_v_node2->split_dim == -1L);
       if (__pyx_t_15) {
 
-        /* "pyart/map/ckdtree.pyx":1867
+        /* "pyart/map/ckdtree.pyx":1868
  *             else:  # 1 is an inner node
  *                 if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                     tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1867, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1868, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1868
+        /* "pyart/map/ckdtree.pyx":1869
  *                 if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                     tracker.push_less_of(1, node1)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1868, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1869, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1871
+        /* "pyart/map/ckdtree.pyx":1872
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                     tracker.push_greater_of(1, node1)
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1871, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1872, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1873
+        /* "pyart/map/ckdtree.pyx":1874
  *                     tracker.pop()
  * 
  *                     tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1873, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1874, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1874
+        /* "pyart/map/ckdtree.pyx":1875
  * 
  *                     tracker.push_greater_of(1, node1)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1874, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1875, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1877
+        /* "pyart/map/ckdtree.pyx":1878
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 else: # 1 and 2 are inner nodes
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1877, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1878, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1866
+        /* "pyart/map/ckdtree.pyx":1867
  * 
  *             else:  # 1 is an inner node
  *                 if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -22771,7 +22771,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
         goto __pyx_L16;
       }
 
-      /* "pyart/map/ckdtree.pyx":1880
+      /* "pyart/map/ckdtree.pyx":1881
  * 
  *                 else: # 1 and 2 are inner nodes
  *                     tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
@@ -22779,148 +22779,148 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  *                     self.__count_neighbors_traverse(
  */
       /*else*/ {
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1880, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1881, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1881
+        /* "pyart/map/ckdtree.pyx":1882
  *                 else: # 1 and 2 are inner nodes
  *                     tracker.push_less_of(1, node1)
  *                     tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1881, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1882, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1882
+        /* "pyart/map/ckdtree.pyx":1883
  *                     tracker.push_less_of(1, node1)
  *                     tracker.push_less_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2.less, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1882, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1883, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1885
+        /* "pyart/map/ckdtree.pyx":1886
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2.less, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                     tracker.push_greater_of(2, node2)
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1885, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1886, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1887
+        /* "pyart/map/ckdtree.pyx":1888
  *                     tracker.pop()
  * 
  *                     tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1887, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1888, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1888
+        /* "pyart/map/ckdtree.pyx":1889
  * 
  *                     tracker.push_greater_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2.greater, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1888, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1889, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1891
+        /* "pyart/map/ckdtree.pyx":1892
  *                         other, n_queries, r, results, idx,
  *                         node1.less, node2.greater, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  *                     tracker.pop()
  * 
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1891, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1892, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1892
+        /* "pyart/map/ckdtree.pyx":1893
  *                         node1.less, node2.greater, tracker)
  *                     tracker.pop()
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                     tracker.push_greater_of(1, node1)
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1892, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1893, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1894
+        /* "pyart/map/ckdtree.pyx":1895
  *                     tracker.pop()
  * 
  *                     tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                     tracker.push_less_of(2, node2)
  *                     self.__count_neighbors_traverse(
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1894, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1895, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1895
+        /* "pyart/map/ckdtree.pyx":1896
  * 
  *                     tracker.push_greater_of(1, node1)
  *                     tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1895, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1896, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1896
+        /* "pyart/map/ckdtree.pyx":1897
  *                     tracker.push_greater_of(1, node1)
  *                     tracker.push_less_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2.less, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1896, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1897, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1899
+        /* "pyart/map/ckdtree.pyx":1900
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2.less, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                     tracker.push_greater_of(2, node2)
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1899, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1900, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1901
+        /* "pyart/map/ckdtree.pyx":1902
  *                     tracker.pop()
  * 
  *                     tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__count_neighbors_traverse(
  *                         other, n_queries, r, results, idx,
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1901, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1902, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1902
+        /* "pyart/map/ckdtree.pyx":1903
  * 
  *                     tracker.push_greater_of(2, node2)
  *                     self.__count_neighbors_traverse(             # <<<<<<<<<<<<<<
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2.greater, tracker)
  */
-        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1902, __pyx_L1_error)
+        __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1903, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1905
+        /* "pyart/map/ckdtree.pyx":1906
  *                         other, n_queries, r, results, idx,
  *                         node1.greater, node2.greater, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  *                     tracker.pop()
  * 
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1905, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1906, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":1906
+        /* "pyart/map/ckdtree.pyx":1907
  *                         node1.greater, node2.greater, tracker)
  *                     tracker.pop()
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1906, __pyx_L1_error)
+        __pyx_t_7 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 1907, __pyx_L1_error)
       }
       __pyx_L16:;
     }
     __pyx_L7:;
 
-    /* "pyart/map/ckdtree.pyx":1831
+    /* "pyart/map/ckdtree.pyx":1832
  *                 n_queries += 1
  * 
  *         if n_queries > 0:             # <<<<<<<<<<<<<<
@@ -22929,7 +22929,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1908
+  /* "pyart/map/ckdtree.pyx":1909
  *                     tracker.pop()
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -22939,7 +22939,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1800
+  /* "pyart/map/ckdtree.pyx":1801
  *     # count_neighbors
  *     # ---------------
  *     cdef int __count_neighbors_traverse(cKDTree self,             # <<<<<<<<<<<<<<
@@ -22971,7 +22971,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_trave
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1910
+/* "pyart/map/ckdtree.pyx":1911
  *         return 0
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -23039,7 +23039,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1910, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1911, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -23047,21 +23047,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1910, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1911, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("count_neighbors", 0, 2, 3, 1); __PYX_ERR(0, 1910, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("count_neighbors", 0, 2, 3, 1); __PYX_ERR(0, 1911, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1910, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1911, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "count_neighbors") < 0)) __PYX_ERR(0, 1910, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "count_neighbors") < 0)) __PYX_ERR(0, 1911, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -23076,14 +23076,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
     __pyx_v_other = ((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)values[0]);
     __pyx_v_r = values[1];
     if (values[2]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1912, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1913, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("count_neighbors", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 1910, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("count_neighbors", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 1911, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -23097,7 +23097,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __Pyx_RefNannyFinishContext();
   return NULL;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 1912, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 1913, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_r, __pyx_v_p);
 
   /* function exit code */
@@ -23166,7 +23166,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
   __pyx_pybuffernd_idx.data = NULL;
   __pyx_pybuffernd_idx.rcbuffer = &__pyx_pybuffer_idx;
 
-  /* "pyart/map/ckdtree.pyx":1946
+  /* "pyart/map/ckdtree.pyx":1947
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -23176,20 +23176,20 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
   __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":1947
+    /* "pyart/map/ckdtree.pyx":1948
  *         # Make sure trees are compatible
  *         if self.m != other.m:
  *             raise ValueError("Trees passed to query_ball_trees have different dimensionality")             # <<<<<<<<<<<<<<
  * 
  *         # Make a copy of r array to ensure it's contiguous and to modify it
  */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1947, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1948, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 1947, __pyx_L1_error)
+    __PYX_ERR(0, 1948, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":1946
+    /* "pyart/map/ckdtree.pyx":1947
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -23198,16 +23198,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1951
+  /* "pyart/map/ckdtree.pyx":1952
  *         # Make a copy of r array to ensure it's contiguous and to modify it
  *         # below
  *         if np.shape(r) == ():             # <<<<<<<<<<<<<<
  *             real_r = np.array([r], dtype=np.float64)
  *             n_queries = 1
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1951, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1952, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1951, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = NULL;
@@ -23228,53 +23228,53 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_r};
     __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1951, __pyx_L1_error)
+    if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1952, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
-  __pyx_t_4 = PyObject_RichCompare(__pyx_t_2, __pyx_empty_tuple, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1951, __pyx_L1_error)
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_2, __pyx_empty_tuple, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 1951, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 1952, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1952
+    /* "pyart/map/ckdtree.pyx":1953
  *         # below
  *         if np.shape(r) == ():
  *             real_r = np.array([r], dtype=np.float64)             # <<<<<<<<<<<<<<
  *             n_queries = 1
  *         elif len(np.shape(r))==1:
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_INCREF(__pyx_v_r);
     __Pyx_GIVEREF(__pyx_v_r);
-    if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_v_r)) __PYX_ERR(0, 1952, __pyx_L1_error);
-    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_v_r)) __PYX_ERR(0, 1953, __pyx_L1_error);
+    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_GIVEREF(__pyx_t_4);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error);
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 1953, __pyx_L1_error);
     __pyx_t_4 = 0;
-    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 1952, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1952, __pyx_L1_error)
+    __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1953, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (!(likely(((__pyx_t_7) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_7, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1952, __pyx_L1_error)
+    if (!(likely(((__pyx_t_7) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_7, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1953, __pyx_L1_error)
     __pyx_t_8 = ((PyArrayObject *)__pyx_t_7);
     {
       __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -23291,13 +23291,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
         __pyx_t_9 = __pyx_t_10 = __pyx_t_11 = 0;
       }
       __pyx_pybuffernd_real_r.diminfo[0].strides = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_real_r.diminfo[0].shape = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.shape[0];
-      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1952, __pyx_L1_error)
+      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1953, __pyx_L1_error)
     }
     __pyx_t_8 = 0;
     __pyx_v_real_r = ((PyArrayObject *)__pyx_t_7);
     __pyx_t_7 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1953
+    /* "pyart/map/ckdtree.pyx":1954
  *         if np.shape(r) == ():
  *             real_r = np.array([r], dtype=np.float64)
  *             n_queries = 1             # <<<<<<<<<<<<<<
@@ -23306,7 +23306,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
     __pyx_v_n_queries = 1;
 
-    /* "pyart/map/ckdtree.pyx":1951
+    /* "pyart/map/ckdtree.pyx":1952
  *         # Make a copy of r array to ensure it's contiguous and to modify it
  *         # below
  *         if np.shape(r) == ():             # <<<<<<<<<<<<<<
@@ -23316,16 +23316,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     goto __pyx_L4;
   }
 
-  /* "pyart/map/ckdtree.pyx":1954
+  /* "pyart/map/ckdtree.pyx":1955
  *             real_r = np.array([r], dtype=np.float64)
  *             n_queries = 1
  *         elif len(np.shape(r))==1:             # <<<<<<<<<<<<<<
  *             real_r = np.array(r, dtype=np.float64)
  *             n_queries = r.shape[0]
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1954, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1955, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1954, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1955, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -23346,47 +23346,47 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_r};
     __pyx_t_7 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1954, __pyx_L1_error)
+    if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1955, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
-  __pyx_t_12 = PyObject_Length(__pyx_t_7); if (unlikely(__pyx_t_12 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1954, __pyx_L1_error)
+  __pyx_t_12 = PyObject_Length(__pyx_t_7); if (unlikely(__pyx_t_12 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1955, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   __pyx_t_1 = (__pyx_t_12 == 1);
   if (likely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":1955
+    /* "pyart/map/ckdtree.pyx":1956
  *             n_queries = 1
  *         elif len(np.shape(r))==1:
  *             real_r = np.array(r, dtype=np.float64)             # <<<<<<<<<<<<<<
  *             n_queries = r.shape[0]
  *         else:
  */
-    __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_array); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_array); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
     __Pyx_INCREF(__pyx_v_r);
     __Pyx_GIVEREF(__pyx_v_r);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_r)) __PYX_ERR(0, 1955, __pyx_L1_error);
-    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_r)) __PYX_ERR(0, 1956, __pyx_L1_error);
+    __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 1955, __pyx_L1_error)
+    if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1955, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1956, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1955, __pyx_L1_error)
+    if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1956, __pyx_L1_error)
     __pyx_t_8 = ((PyArrayObject *)__pyx_t_6);
     {
       __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -23403,29 +23403,29 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
         __pyx_t_11 = __pyx_t_10 = __pyx_t_9 = 0;
       }
       __pyx_pybuffernd_real_r.diminfo[0].strides = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_real_r.diminfo[0].shape = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.shape[0];
-      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1955, __pyx_L1_error)
+      if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1956, __pyx_L1_error)
     }
     __pyx_t_8 = 0;
     __pyx_v_real_r = ((PyArrayObject *)__pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "pyart/map/ckdtree.pyx":1956
+    /* "pyart/map/ckdtree.pyx":1957
  *         elif len(np.shape(r))==1:
  *             real_r = np.array(r, dtype=np.float64)
  *             n_queries = r.shape[0]             # <<<<<<<<<<<<<<
  *         else:
  *             raise ValueError("r must be either a single value or a one-dimensional array of values")
  */
-    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_r, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1956, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_r, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1957, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_6, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1956, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_6, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1957, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __pyx_t_13 = __Pyx_PyInt_As_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_13 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1956, __pyx_L1_error)
+    __pyx_t_13 = __Pyx_PyInt_As_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_13 == ((npy_intp)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1957, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_n_queries = __pyx_t_13;
 
-    /* "pyart/map/ckdtree.pyx":1954
+    /* "pyart/map/ckdtree.pyx":1955
  *             real_r = np.array([r], dtype=np.float64)
  *             n_queries = 1
  *         elif len(np.shape(r))==1:             # <<<<<<<<<<<<<<
@@ -23435,7 +23435,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     goto __pyx_L4;
   }
 
-  /* "pyart/map/ckdtree.pyx":1958
+  /* "pyart/map/ckdtree.pyx":1959
  *             n_queries = r.shape[0]
  *         else:
  *             raise ValueError("r must be either a single value or a one-dimensional array of values")             # <<<<<<<<<<<<<<
@@ -23443,15 +23443,15 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  *         # Internally, we represent all distances as distance ** p
  */
   /*else*/ {
-    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1958, __pyx_L1_error)
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1959, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(0, 1958, __pyx_L1_error)
+    __PYX_ERR(0, 1959, __pyx_L1_error)
   }
   __pyx_L4:;
 
-  /* "pyart/map/ckdtree.pyx":1961
+  /* "pyart/map/ckdtree.pyx":1962
  * 
  *         # Internally, we represent all distances as distance ** p
  *         if p != infinity:             # <<<<<<<<<<<<<<
@@ -23461,7 +23461,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
   __pyx_t_1 = (__pyx_v_p != __pyx_v_5pyart_3map_7ckdtree_infinity);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1962
+    /* "pyart/map/ckdtree.pyx":1963
  *         # Internally, we represent all distances as distance ** p
  *         if p != infinity:
  *             for i in range(n_queries):             # <<<<<<<<<<<<<<
@@ -23473,7 +23473,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_14; __pyx_t_15+=1) {
       __pyx_v_i = __pyx_t_15;
 
-      /* "pyart/map/ckdtree.pyx":1963
+      /* "pyart/map/ckdtree.pyx":1964
  *         if p != infinity:
  *             for i in range(n_queries):
  *                 if real_r[i] != infinity:             # <<<<<<<<<<<<<<
@@ -23484,7 +23484,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
       __pyx_t_1 = ((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides)) != __pyx_v_5pyart_3map_7ckdtree_infinity);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":1964
+        /* "pyart/map/ckdtree.pyx":1965
  *             for i in range(n_queries):
  *                 if real_r[i] != infinity:
  *                     real_r[i] = real_r[i] ** p             # <<<<<<<<<<<<<<
@@ -23495,7 +23495,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
         __pyx_t_17 = __pyx_v_i;
         *__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_17, __pyx_pybuffernd_real_r.diminfo[0].strides) = pow((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides)), __pyx_v_p);
 
-        /* "pyart/map/ckdtree.pyx":1963
+        /* "pyart/map/ckdtree.pyx":1964
  *         if p != infinity:
  *             for i in range(n_queries):
  *                 if real_r[i] != infinity:             # <<<<<<<<<<<<<<
@@ -23505,7 +23505,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
       }
     }
 
-    /* "pyart/map/ckdtree.pyx":1961
+    /* "pyart/map/ckdtree.pyx":1962
  * 
  *         # Internally, we represent all distances as distance ** p
  *         if p != infinity:             # <<<<<<<<<<<<<<
@@ -23514,123 +23514,123 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1968
+  /* "pyart/map/ckdtree.pyx":1969
  *         # Track node-to-node min/max distances
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *             Rectangle(other.mins, other.maxes),
  *             p, 0.0, 0.0)
  */
-  __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1968, __pyx_L1_error)
+  __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1969, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1968, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 1969, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1968, __pyx_L1_error);
-  __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_4, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1968, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 1969, __pyx_L1_error);
+  __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_4, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1969, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1969
+  /* "pyart/map/ckdtree.pyx":1970
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),             # <<<<<<<<<<<<<<
  *             p, 0.0, 0.0)
  * 
  */
-  __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1969, __pyx_L1_error)
+  __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1970, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_INCREF((PyObject *)__pyx_v_other->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 1969, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 1970, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_other->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 1969, __pyx_L1_error);
-  __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_4, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1969, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 1970, __pyx_L1_error);
+  __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_4, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1970, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1970
+  /* "pyart/map/ckdtree.pyx":1971
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  *             p, 0.0, 0.0)             # <<<<<<<<<<<<<<
  * 
  *         # Go!
  */
-  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1970, __pyx_L1_error)
+  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1971, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
 
-  /* "pyart/map/ckdtree.pyx":1967
+  /* "pyart/map/ckdtree.pyx":1968
  * 
  *         # Track node-to-node min/max distances
  *         tracker = RectRectDistanceTracker(             # <<<<<<<<<<<<<<
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  */
-  __pyx_t_3 = PyTuple_New(5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1967, __pyx_L1_error)
+  __pyx_t_3 = PyTuple_New(5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1968, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_6);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6)) __PYX_ERR(0, 1967, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6)) __PYX_ERR(0, 1968, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_7);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_7)) __PYX_ERR(0, 1967, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_7)) __PYX_ERR(0, 1968, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_4)) __PYX_ERR(0, 1967, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_4)) __PYX_ERR(0, 1968, __pyx_L1_error);
   __Pyx_INCREF(__pyx_float_0_0);
   __Pyx_GIVEREF(__pyx_float_0_0);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 3, __pyx_float_0_0)) __PYX_ERR(0, 1967, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 3, __pyx_float_0_0)) __PYX_ERR(0, 1968, __pyx_L1_error);
   __Pyx_INCREF(__pyx_float_0_0);
   __Pyx_GIVEREF(__pyx_float_0_0);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 4, __pyx_float_0_0)) __PYX_ERR(0, 1967, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 4, __pyx_float_0_0)) __PYX_ERR(0, 1968, __pyx_L1_error);
   __pyx_t_6 = 0;
   __pyx_t_7 = 0;
   __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1967, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1968, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_tracker = ((struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1973
+  /* "pyart/map/ckdtree.pyx":1974
  * 
  *         # Go!
  *         results = np.zeros((n_queries,), dtype=np.intp)             # <<<<<<<<<<<<<<
  *         idx = np.arange(n_queries, dtype=np.intp)
  *         self.__count_neighbors_traverse(other, n_queries,
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4)) __PYX_ERR(0, 1973, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4)) __PYX_ERR(0, 1974, __pyx_L1_error);
   __pyx_t_4 = 0;
-  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_GIVEREF(__pyx_t_7);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_7)) __PYX_ERR(0, 1973, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_7)) __PYX_ERR(0, 1974, __pyx_L1_error);
   __pyx_t_7 = 0;
-  __pyx_t_7 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_intp); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_intp); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 1973, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1973, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1973, __pyx_L1_error)
+  if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1974, __pyx_L1_error)
   __pyx_t_18 = ((PyArrayObject *)__pyx_t_2);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -23647,46 +23647,46 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
       __pyx_t_9 = __pyx_t_10 = __pyx_t_11 = 0;
     }
     __pyx_pybuffernd_results.diminfo[0].strides = __pyx_pybuffernd_results.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_results.diminfo[0].shape = __pyx_pybuffernd_results.rcbuffer->pybuffer.shape[0];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1973, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1974, __pyx_L1_error)
   }
   __pyx_t_18 = 0;
   __pyx_v_results = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1974
+  /* "pyart/map/ckdtree.pyx":1975
  *         # Go!
  *         results = np.zeros((n_queries,), dtype=np.intp)
  *         idx = np.arange(n_queries, dtype=np.intp)             # <<<<<<<<<<<<<<
  *         self.__count_neighbors_traverse(other, n_queries,
  *                                         &real_r[0], &results[0], &idx[0],
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_arange); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_arange); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyInt_From_npy_intp(__pyx_v_n_queries); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2)) __PYX_ERR(0, 1975, __pyx_L1_error);
   __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_intp); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_intp); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 1974, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1974, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1975, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1974, __pyx_L1_error)
+  if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(0, 1975, __pyx_L1_error)
   __pyx_t_18 = ((PyArrayObject *)__pyx_t_6);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
@@ -23703,13 +23703,13 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
       __pyx_t_11 = __pyx_t_10 = __pyx_t_9 = 0;
     }
     __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0];
-    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1974, __pyx_L1_error)
+    if (unlikely((__pyx_t_5 < 0))) __PYX_ERR(0, 1975, __pyx_L1_error)
   }
   __pyx_t_18 = 0;
   __pyx_v_idx = ((PyArrayObject *)__pyx_t_6);
   __pyx_t_6 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1976
+  /* "pyart/map/ckdtree.pyx":1977
  *         idx = np.arange(n_queries, dtype=np.intp)
  *         self.__count_neighbors_traverse(other, n_queries,
  *                                         &real_r[0], &results[0], &idx[0],             # <<<<<<<<<<<<<<
@@ -23720,25 +23720,25 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
   __pyx_t_17 = 0;
   __pyx_t_19 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1975
+  /* "pyart/map/ckdtree.pyx":1976
  *         results = np.zeros((n_queries,), dtype=np.intp)
  *         idx = np.arange(n_queries, dtype=np.intp)
  *         self.__count_neighbors_traverse(other, n_queries,             # <<<<<<<<<<<<<<
  *                                         &real_r[0], &results[0], &idx[0],
  *                                         self.tree, other.tree,
  */
-  __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides))), (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_17, __pyx_pybuffernd_results.diminfo[0].strides))), (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_idx.diminfo[0].strides))), __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1975, __pyx_L1_error)
+  __pyx_t_5 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides))), (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_17, __pyx_pybuffernd_results.diminfo[0].strides))), (&(*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_idx.diminfo[0].strides))), __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 1976, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1980
+  /* "pyart/map/ckdtree.pyx":1981
  *                                         tracker)
  * 
  *         if np.shape(r) == ():             # <<<<<<<<<<<<<<
  *             if results[0] <= <np.intp_t> LONG_MAX:
  *                 return int(results[0])
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1980, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1981, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1980, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1981, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = NULL;
@@ -23759,17 +23759,17 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_r};
     __pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1980, __pyx_L1_error)
+    if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1981, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
-  __pyx_t_4 = PyObject_RichCompare(__pyx_t_6, __pyx_empty_tuple, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1980, __pyx_L1_error)
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_6, __pyx_empty_tuple, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1981, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 1980, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 1981, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1981
+    /* "pyart/map/ckdtree.pyx":1982
  * 
  *         if np.shape(r) == ():
  *             if results[0] <= <np.intp_t> LONG_MAX:             # <<<<<<<<<<<<<<
@@ -23780,7 +23780,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     __pyx_t_1 = ((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides)) <= ((__pyx_t_5numpy_intp_t)LONG_MAX));
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":1982
+      /* "pyart/map/ckdtree.pyx":1983
  *         if np.shape(r) == ():
  *             if results[0] <= <np.intp_t> LONG_MAX:
  *                 return int(results[0])             # <<<<<<<<<<<<<<
@@ -23789,16 +23789,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
       __Pyx_XDECREF(__pyx_r);
       __pyx_t_19 = 0;
-      __pyx_t_4 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1982, __pyx_L1_error)
+      __pyx_t_4 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1983, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1982, __pyx_L1_error)
+      __pyx_t_6 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyInt_Type)), __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1983, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_r = __pyx_t_6;
       __pyx_t_6 = 0;
       goto __pyx_L0;
 
-      /* "pyart/map/ckdtree.pyx":1981
+      /* "pyart/map/ckdtree.pyx":1982
  * 
  *         if np.shape(r) == ():
  *             if results[0] <= <np.intp_t> LONG_MAX:             # <<<<<<<<<<<<<<
@@ -23807,7 +23807,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
     }
 
-    /* "pyart/map/ckdtree.pyx":1984
+    /* "pyart/map/ckdtree.pyx":1985
  *                 return int(results[0])
  *             else:
  *                 return results[0]             # <<<<<<<<<<<<<<
@@ -23817,14 +23817,14 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     /*else*/ {
       __Pyx_XDECREF(__pyx_r);
       __pyx_t_19 = 0;
-      __pyx_t_6 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1984, __pyx_L1_error)
+      __pyx_t_6 = __Pyx_PyInt_From_npy_intp((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_intp_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1985, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_6);
       __pyx_r = __pyx_t_6;
       __pyx_t_6 = 0;
       goto __pyx_L0;
     }
 
-    /* "pyart/map/ckdtree.pyx":1980
+    /* "pyart/map/ckdtree.pyx":1981
  *                                         tracker)
  * 
  *         if np.shape(r) == ():             # <<<<<<<<<<<<<<
@@ -23833,16 +23833,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1985
+  /* "pyart/map/ckdtree.pyx":1986
  *             else:
  *                 return results[0]
  *         elif len(np.shape(r))==1:             # <<<<<<<<<<<<<<
  *             return results
  * 
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1985, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1986, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1985, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1986, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __pyx_t_4 = NULL;
@@ -23863,16 +23863,16 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_r};
     __pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
     __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1985, __pyx_L1_error)
+    if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1986, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
-  __pyx_t_12 = PyObject_Length(__pyx_t_6); if (unlikely(__pyx_t_12 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1985, __pyx_L1_error)
+  __pyx_t_12 = PyObject_Length(__pyx_t_6); if (unlikely(__pyx_t_12 == ((Py_ssize_t)-1))) __PYX_ERR(0, 1986, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_t_1 = (__pyx_t_12 == 1);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":1986
+    /* "pyart/map/ckdtree.pyx":1987
  *                 return results[0]
  *         elif len(np.shape(r))==1:
  *             return results             # <<<<<<<<<<<<<<
@@ -23884,7 +23884,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
     __pyx_r = ((PyObject *)__pyx_v_results);
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":1985
+    /* "pyart/map/ckdtree.pyx":1986
  *             else:
  *                 return results[0]
  *         elif len(np.shape(r))==1:             # <<<<<<<<<<<<<<
@@ -23893,7 +23893,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":1910
+  /* "pyart/map/ckdtree.pyx":1911
  *         return 0
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
@@ -23935,7 +23935,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_12count_neighbors(struct
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":1991
+/* "pyart/map/ckdtree.pyx":1992
  *     # sparse_distance_matrix
  *     # ----------------------
  *     cdef int __sparse_distance_matrix_traverse(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -23964,7 +23964,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "pyart/map/ckdtree.pyx":2001
+  /* "pyart/map/ckdtree.pyx":2002
  *         cdef np.intp_t i, j, min_j
  * 
  *         if tracker.min_distance > tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -23974,7 +23974,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
   __pyx_t_1 = (__pyx_v_tracker->min_distance > __pyx_v_tracker->upper_bound);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":2002
+    /* "pyart/map/ckdtree.pyx":2003
  * 
  *         if tracker.min_distance > tracker.upper_bound:
  *             return 0             # <<<<<<<<<<<<<<
@@ -23984,7 +23984,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "pyart/map/ckdtree.pyx":2001
+    /* "pyart/map/ckdtree.pyx":2002
  *         cdef np.intp_t i, j, min_j
  * 
  *         if tracker.min_distance > tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -23993,7 +23993,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":2003
+  /* "pyart/map/ckdtree.pyx":2004
  *         if tracker.min_distance > tracker.upper_bound:
  *             return 0
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -24003,7 +24003,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
   __pyx_t_1 = (__pyx_v_node1->split_dim == -1L);
   if (__pyx_t_1) {
 
-    /* "pyart/map/ckdtree.pyx":2004
+    /* "pyart/map/ckdtree.pyx":2005
  *             return 0
  *         elif node1.split_dim == -1:  # 1 is leaf node
  *             lnode1 = <leafnode*>node1             # <<<<<<<<<<<<<<
@@ -24012,7 +24012,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
     __pyx_v_lnode1 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node1);
 
-    /* "pyart/map/ckdtree.pyx":2006
+    /* "pyart/map/ckdtree.pyx":2007
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -24022,7 +24022,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":2007
+      /* "pyart/map/ckdtree.pyx":2008
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves
  *                 lnode2 = <leafnode*>node2             # <<<<<<<<<<<<<<
@@ -24031,7 +24031,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
       __pyx_v_lnode2 = ((struct __pyx_t_5pyart_3map_7ckdtree_leafnode *)__pyx_v_node2);
 
-      /* "pyart/map/ckdtree.pyx":2010
+      /* "pyart/map/ckdtree.pyx":2011
  * 
  *                 # brute-force
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):             # <<<<<<<<<<<<<<
@@ -24043,7 +24043,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
       for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
         __pyx_v_i = __pyx_t_4;
 
-        /* "pyart/map/ckdtree.pyx":2012
+        /* "pyart/map/ckdtree.pyx":2013
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -24053,7 +24053,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
         __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);
         if (__pyx_t_1) {
 
-          /* "pyart/map/ckdtree.pyx":2013
+          /* "pyart/map/ckdtree.pyx":2014
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:
  *                         min_j = i+1             # <<<<<<<<<<<<<<
@@ -24062,7 +24062,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
           __pyx_v_min_j = (__pyx_v_i + 1);
 
-          /* "pyart/map/ckdtree.pyx":2012
+          /* "pyart/map/ckdtree.pyx":2013
  *                 for i in range(lnode1.start_idx, lnode1.end_idx):
  *                     # Special care here to avoid duplicate pairs
  *                     if node1 == node2:             # <<<<<<<<<<<<<<
@@ -24072,7 +24072,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
           goto __pyx_L7;
         }
 
-        /* "pyart/map/ckdtree.pyx":2015
+        /* "pyart/map/ckdtree.pyx":2016
  *                         min_j = i+1
  *                     else:
  *                         min_j = lnode2.end_idx             # <<<<<<<<<<<<<<
@@ -24085,7 +24085,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
         }
         __pyx_L7:;
 
-        /* "pyart/map/ckdtree.pyx":2017
+        /* "pyart/map/ckdtree.pyx":2018
  *                         min_j = lnode2.end_idx
  * 
  *                     for j in range(min_j, lnode2.end_idx):             # <<<<<<<<<<<<<<
@@ -24097,17 +24097,17 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
         for (__pyx_t_7 = __pyx_v_min_j; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
           __pyx_v_j = __pyx_t_7;
 
-          /* "pyart/map/ckdtree.pyx":2018
+          /* "pyart/map/ckdtree.pyx":2019
  * 
  *                     for j in range(min_j, lnode2.end_idx):
  *                         d = _distance_p(             # <<<<<<<<<<<<<<
  *                             self.raw_data + self.raw_indices[i] * self.m,
  *                             other.raw_data + other.raw_indices[j] * self.m,
  */
-          __pyx_t_8 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_8 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 2018, __pyx_L1_error)
+          __pyx_t_8 = __pyx_f_5pyart_3map_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_tracker->p, __pyx_v_self->m, __pyx_v_tracker->upper_bound); if (unlikely(__pyx_t_8 == ((__pyx_t_5numpy_float64_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 2019, __pyx_L1_error)
           __pyx_v_d = __pyx_t_8;
 
-          /* "pyart/map/ckdtree.pyx":2022
+          /* "pyart/map/ckdtree.pyx":2023
  *                             other.raw_data + other.raw_indices[j] * self.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -24117,16 +24117,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
           __pyx_t_1 = (__pyx_v_d <= __pyx_v_tracker->upper_bound);
           if (__pyx_t_1) {
 
-            /* "pyart/map/ckdtree.pyx":2023
+            /* "pyart/map/ckdtree.pyx":2024
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:
  *                             results.add(self.raw_indices[i],             # <<<<<<<<<<<<<<
  *                                         self.raw_indices[j], d)
  *                             if node1 == node2:
  */
-            ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j]), __pyx_v_d); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2023, __pyx_L1_error)
+            ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j]), __pyx_v_d); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2024, __pyx_L1_error)
 
-            /* "pyart/map/ckdtree.pyx":2025
+            /* "pyart/map/ckdtree.pyx":2026
  *                             results.add(self.raw_indices[i],
  *                                         self.raw_indices[j], d)
  *                             if node1 == node2:             # <<<<<<<<<<<<<<
@@ -24136,16 +24136,16 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
             __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);
             if (__pyx_t_1) {
 
-              /* "pyart/map/ckdtree.pyx":2026
+              /* "pyart/map/ckdtree.pyx":2027
  *                                         self.raw_indices[j], d)
  *                             if node1 == node2:
  *                                 results.add(self.raw_indices[j],             # <<<<<<<<<<<<<<
  *                                             self.raw_indices[i], d)
  * 
  */
-              ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_j]), (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_v_d); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2026, __pyx_L1_error)
+              ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_j]), (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_v_d); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2027, __pyx_L1_error)
 
-              /* "pyart/map/ckdtree.pyx":2025
+              /* "pyart/map/ckdtree.pyx":2026
  *                             results.add(self.raw_indices[i],
  *                                         self.raw_indices[j], d)
  *                             if node1 == node2:             # <<<<<<<<<<<<<<
@@ -24154,7 +24154,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
             }
 
-            /* "pyart/map/ckdtree.pyx":2022
+            /* "pyart/map/ckdtree.pyx":2023
  *                             other.raw_data + other.raw_indices[j] * self.m,
  *                             tracker.p, self.m, tracker.upper_bound)
  *                         if d <= tracker.upper_bound:             # <<<<<<<<<<<<<<
@@ -24165,7 +24165,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
         }
       }
 
-      /* "pyart/map/ckdtree.pyx":2006
+      /* "pyart/map/ckdtree.pyx":2007
  *             lnode1 = <leafnode*>node1
  * 
  *             if node2.split_dim == -1:  # 1 & 2 are leaves             # <<<<<<<<<<<<<<
@@ -24175,7 +24175,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
       goto __pyx_L4;
     }
 
-    /* "pyart/map/ckdtree.pyx":2030
+    /* "pyart/map/ckdtree.pyx":2031
  * 
  *             else:  # 1 is a leaf node, 2 is inner node
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
@@ -24183,56 +24183,56 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  *                     other, results, node1, node2.less, tracker)
  */
     /*else*/ {
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2030, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2031, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2031
+      /* "pyart/map/ckdtree.pyx":2032
  *             else:  # 1 is a leaf node, 2 is inner node
  *                 tracker.push_less_of(2, node2)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2031, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2032, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2033
+      /* "pyart/map/ckdtree.pyx":2034
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2033, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2034, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2035
+      /* "pyart/map/ckdtree.pyx":2036
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1, node2.greater, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2035, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2036, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2036
+      /* "pyart/map/ckdtree.pyx":2037
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2036, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2037, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2038
+      /* "pyart/map/ckdtree.pyx":2039
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         else:  # 1 is an inner node
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2038, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2039, __pyx_L1_error)
     }
     __pyx_L4:;
 
-    /* "pyart/map/ckdtree.pyx":2003
+    /* "pyart/map/ckdtree.pyx":2004
  *         if tracker.min_distance > tracker.upper_bound:
  *             return 0
  *         elif node1.split_dim == -1:  # 1 is leaf node             # <<<<<<<<<<<<<<
@@ -24242,7 +24242,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
     goto __pyx_L3;
   }
 
-  /* "pyart/map/ckdtree.pyx":2041
+  /* "pyart/map/ckdtree.pyx":2042
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -24253,61 +24253,61 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
     __pyx_t_1 = (__pyx_v_node2->split_dim == -1L);
     if (__pyx_t_1) {
 
-      /* "pyart/map/ckdtree.pyx":2042
+      /* "pyart/map/ckdtree.pyx":2043
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2042, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2043, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2043
+      /* "pyart/map/ckdtree.pyx":2044
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
  *                 tracker.push_less_of(1, node1)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2043, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2044, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2045
+      /* "pyart/map/ckdtree.pyx":2046
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(1, node1)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2045, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2046, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2047
+      /* "pyart/map/ckdtree.pyx":2048
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.greater, node2, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2047, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2048, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2048
+      /* "pyart/map/ckdtree.pyx":2049
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1.greater, node2, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2048, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2049, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2050
+      /* "pyart/map/ckdtree.pyx":2051
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.greater, node2, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *             else: # 1 and 2 are inner nodes
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2050, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2051, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2041
+      /* "pyart/map/ckdtree.pyx":2042
  * 
  *         else:  # 1 is an inner node
  *             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node             # <<<<<<<<<<<<<<
@@ -24317,7 +24317,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
       goto __pyx_L12;
     }
 
-    /* "pyart/map/ckdtree.pyx":2053
+    /* "pyart/map/ckdtree.pyx":2054
  * 
  *             else: # 1 and 2 are inner nodes
  *                 tracker.push_less_of(1, node1)             # <<<<<<<<<<<<<<
@@ -24325,81 +24325,81 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  *                 self.__sparse_distance_matrix_traverse(
  */
     /*else*/ {
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2053, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2054, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2054
+      /* "pyart/map/ckdtree.pyx":2055
  *             else: # 1 and 2 are inner nodes
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2.less, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2054, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2055, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2055
+      /* "pyart/map/ckdtree.pyx":2056
  *                 tracker.push_less_of(1, node1)
  *                 tracker.push_less_of(2, node2)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2.less, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2055, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2056, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2057
+      /* "pyart/map/ckdtree.pyx":2058
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2.less, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2057, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2058, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2059
+      /* "pyart/map/ckdtree.pyx":2060
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2.greater, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2059, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2060, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2060
+      /* "pyart/map/ckdtree.pyx":2061
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2060, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2061, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2062
+      /* "pyart/map/ckdtree.pyx":2063
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2062, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2063, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2063
+      /* "pyart/map/ckdtree.pyx":2064
  *                     other, results, node1.less, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(1, node1)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2063, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2064, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2065
+      /* "pyart/map/ckdtree.pyx":2066
  *                 tracker.pop()
  * 
  *                 tracker.push_greater_of(1, node1)             # <<<<<<<<<<<<<<
  *                 if node1 != node2:
  *                     # Avoid traversing (node1.less, node2.greater) and
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2065, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 1, __pyx_v_node1); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2066, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2066
+      /* "pyart/map/ckdtree.pyx":2067
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 if node1 != node2:             # <<<<<<<<<<<<<<
@@ -24409,34 +24409,34 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
       __pyx_t_1 = (__pyx_v_node1 != __pyx_v_node2);
       if (__pyx_t_1) {
 
-        /* "pyart/map/ckdtree.pyx":2071
+        /* "pyart/map/ckdtree.pyx":2072
  *                     # twice over, which is the source of the complication in
  *                     # the original KDTree.sparse_distance_matrix)
  *                     tracker.push_less_of(2, node2)             # <<<<<<<<<<<<<<
  *                     self.__sparse_distance_matrix_traverse(
  *                         other, results, node1.greater, node2.less, tracker)
  */
-        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2071, __pyx_L1_error)
+        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_less_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2072, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":2072
+        /* "pyart/map/ckdtree.pyx":2073
  *                     # the original KDTree.sparse_distance_matrix)
  *                     tracker.push_less_of(2, node2)
  *                     self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                         other, results, node1.greater, node2.less, tracker)
  *                     tracker.pop()
  */
-        __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2072, __pyx_L1_error)
+        __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2073, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":2074
+        /* "pyart/map/ckdtree.pyx":2075
  *                     self.__sparse_distance_matrix_traverse(
  *                         other, results, node1.greater, node2.less, tracker)
  *                     tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *                 tracker.push_greater_of(2, node2)
  */
-        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2074, __pyx_L1_error)
+        __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2075, __pyx_L1_error)
 
-        /* "pyart/map/ckdtree.pyx":2066
+        /* "pyart/map/ckdtree.pyx":2067
  * 
  *                 tracker.push_greater_of(1, node1)
  *                 if node1 != node2:             # <<<<<<<<<<<<<<
@@ -24445,47 +24445,47 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
  */
       }
 
-      /* "pyart/map/ckdtree.pyx":2076
+      /* "pyart/map/ckdtree.pyx":2077
  *                     tracker.pop()
  * 
  *                 tracker.push_greater_of(2, node2)             # <<<<<<<<<<<<<<
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.greater, node2.greater, tracker)
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2076, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of(__pyx_v_tracker, 2, __pyx_v_node2); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2077, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2077
+      /* "pyart/map/ckdtree.pyx":2078
  * 
  *                 tracker.push_greater_of(2, node2)
  *                 self.__sparse_distance_matrix_traverse(             # <<<<<<<<<<<<<<
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  */
-      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2077, __pyx_L1_error)
+      __pyx_t_9 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2078, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2079
+      /* "pyart/map/ckdtree.pyx":2080
  *                 self.__sparse_distance_matrix_traverse(
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  *                 tracker.pop()
  * 
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2079, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2080, __pyx_L1_error)
 
-      /* "pyart/map/ckdtree.pyx":2080
+      /* "pyart/map/ckdtree.pyx":2081
  *                     other, results, node1.greater, node2.greater, tracker)
  *                 tracker.pop()
  *                 tracker.pop()             # <<<<<<<<<<<<<<
  * 
  *         return 0
  */
-      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2080, __pyx_L1_error)
+      __pyx_t_9 = __pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop(__pyx_v_tracker); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 2081, __pyx_L1_error)
     }
     __pyx_L12:;
   }
   __pyx_L3:;
 
-  /* "pyart/map/ckdtree.pyx":2082
+  /* "pyart/map/ckdtree.pyx":2083
  *                 tracker.pop()
  * 
  *         return 0             # <<<<<<<<<<<<<<
@@ -24495,7 +24495,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":1991
+  /* "pyart/map/ckdtree.pyx":1992
  *     # sparse_distance_matrix
  *     # ----------------------
  *     cdef int __sparse_distance_matrix_traverse(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -24511,7 +24511,7 @@ static int __pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matri
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":2084
+/* "pyart/map/ckdtree.pyx":2085
  *         return 0
  * 
  *     def sparse_distance_matrix(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -24579,7 +24579,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2084, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2085, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
         CYTHON_FALLTHROUGH;
         case  1:
@@ -24587,21 +24587,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
           (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2084, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2085, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("sparse_distance_matrix", 0, 2, 3, 1); __PYX_ERR(0, 2084, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("sparse_distance_matrix", 0, 2, 3, 1); __PYX_ERR(0, 2085, __pyx_L3_error)
         }
         CYTHON_FALLTHROUGH;
         case  2:
         if (kw_args > 0) {
           PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_p);
           if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2084, __pyx_L3_error)
+          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 2085, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "sparse_distance_matrix") < 0)) __PYX_ERR(0, 2084, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "sparse_distance_matrix") < 0)) __PYX_ERR(0, 2085, __pyx_L3_error)
       }
     } else {
       switch (__pyx_nargs) {
@@ -24614,16 +24614,16 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
       }
     }
     __pyx_v_other = ((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)values[0]);
-    __pyx_v_max_distance = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_max_distance == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 2085, __pyx_L3_error)
+    __pyx_v_max_distance = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_max_distance == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 2086, __pyx_L3_error)
     if (values[2]) {
-      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 2086, __pyx_L3_error)
+      __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 2087, __pyx_L3_error)
     } else {
       __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);
     }
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("sparse_distance_matrix", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 2084, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("sparse_distance_matrix", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 2085, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -24637,7 +24637,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
   __Pyx_RefNannyFinishContext();
   return NULL;
   __pyx_L4_argument_unpacking_done:;
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 2084, __pyx_L1_error)
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5pyart_3map_7ckdtree_cKDTree, 1, "other", 0))) __PYX_ERR(0, 2085, __pyx_L1_error)
   __pyx_r = __pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix(((struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_max_distance, __pyx_v_p);
 
   /* function exit code */
@@ -24673,7 +24673,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("sparse_distance_matrix", 1);
 
-  /* "pyart/map/ckdtree.pyx":2110
+  /* "pyart/map/ckdtree.pyx":2111
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -24683,20 +24683,20 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
   __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);
   if (unlikely(__pyx_t_1)) {
 
-    /* "pyart/map/ckdtree.pyx":2111
+    /* "pyart/map/ckdtree.pyx":2112
  *         # Make sure trees are compatible
  *         if self.m != other.m:
  *             raise ValueError("Trees passed to query_ball_trees have different dimensionality")             # <<<<<<<<<<<<<<
  * 
  *         # Calculate mins and maxes to outer box
  */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2111, __pyx_L1_error)
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2112, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 2111, __pyx_L1_error)
+    __PYX_ERR(0, 2112, __pyx_L1_error)
 
-    /* "pyart/map/ckdtree.pyx":2110
+    /* "pyart/map/ckdtree.pyx":2111
  * 
  *         # Make sure trees are compatible
  *         if self.m != other.m:             # <<<<<<<<<<<<<<
@@ -24705,136 +24705,136 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
  */
   }
 
-  /* "pyart/map/ckdtree.pyx":2115
+  /* "pyart/map/ckdtree.pyx":2116
  *         # Calculate mins and maxes to outer box
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),             # <<<<<<<<<<<<<<
  *             Rectangle(other.mins, other.maxes),
  *             p, 0, max_distance)
  */
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2115, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2116, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_self->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 2115, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->mins))) __PYX_ERR(0, 2116, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_self->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_self->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 2115, __pyx_L1_error);
-  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2115, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->maxes))) __PYX_ERR(0, 2116, __pyx_L1_error);
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2116, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":2116
+  /* "pyart/map/ckdtree.pyx":2117
  *         tracker = RectRectDistanceTracker(
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),             # <<<<<<<<<<<<<<
  *             p, 0, max_distance)
  * 
  */
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2116, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2117, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF((PyObject *)__pyx_v_other->mins);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->mins);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 2116, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_other->mins))) __PYX_ERR(0, 2117, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_other->maxes);
   __Pyx_GIVEREF((PyObject *)__pyx_v_other->maxes);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 2116, __pyx_L1_error);
-  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 2116, __pyx_L1_error)
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_other->maxes))) __PYX_ERR(0, 2117, __pyx_L1_error);
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_Rectangle), __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 2117, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":2117
+  /* "pyart/map/ckdtree.pyx":2118
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  *             p, 0, max_distance)             # <<<<<<<<<<<<<<
  * 
  *         results = coo_entries()
  */
-  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2117, __pyx_L1_error)
+  __pyx_t_2 = PyFloat_FromDouble(__pyx_v_p); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2118, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_max_distance); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2117, __pyx_L1_error)
+  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_max_distance); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2118, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
 
-  /* "pyart/map/ckdtree.pyx":2114
+  /* "pyart/map/ckdtree.pyx":2115
  * 
  *         # Calculate mins and maxes to outer box
  *         tracker = RectRectDistanceTracker(             # <<<<<<<<<<<<<<
  *             Rectangle(self.mins, self.maxes),
  *             Rectangle(other.mins, other.maxes),
  */
-  __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 2114, __pyx_L1_error)
+  __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 2115, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3)) __PYX_ERR(0, 2114, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3)) __PYX_ERR(0, 2115, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4)) __PYX_ERR(0, 2114, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4)) __PYX_ERR(0, 2115, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_2);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_t_2)) __PYX_ERR(0, 2114, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 2, __pyx_t_2)) __PYX_ERR(0, 2115, __pyx_L1_error);
   __Pyx_INCREF(__pyx_int_0);
   __Pyx_GIVEREF(__pyx_int_0);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 3, __pyx_int_0)) __PYX_ERR(0, 2114, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 3, __pyx_int_0)) __PYX_ERR(0, 2115, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_5);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 4, __pyx_t_5)) __PYX_ERR(0, 2114, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 4, __pyx_t_5)) __PYX_ERR(0, 2115, __pyx_L1_error);
   __pyx_t_3 = 0;
   __pyx_t_4 = 0;
   __pyx_t_2 = 0;
   __pyx_t_5 = 0;
-  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2114, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2115, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_v_tracker = ((struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":2119
+  /* "pyart/map/ckdtree.pyx":2120
  *             p, 0, max_distance)
  * 
  *         results = coo_entries()             # <<<<<<<<<<<<<<
  *         self.__sparse_distance_matrix_traverse(other, results,
  *                                                self.tree, other.tree,
  */
-  __pyx_t_5 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_coo_entries)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2119, __pyx_L1_error)
+  __pyx_t_5 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_coo_entries)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2120, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_v_results = ((struct __pyx_obj_5pyart_3map_7ckdtree_coo_entries *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "pyart/map/ckdtree.pyx":2120
+  /* "pyart/map/ckdtree.pyx":2121
  * 
  *         results = coo_entries()
  *         self.__sparse_distance_matrix_traverse(other, results,             # <<<<<<<<<<<<<<
  *                                                self.tree, other.tree,
  *                                                tracker)
  */
-  __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 2120, __pyx_L1_error)
+  __pyx_t_7 = ((struct __pyx_vtabstruct_5pyart_3map_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->_cKDTree__sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_tracker); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 2121, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":2124
+  /* "pyart/map/ckdtree.pyx":2125
  *                                                tracker)
  * 
  *         return results.to_matrix(shape=(self.n, other.n)).todok()             # <<<<<<<<<<<<<<
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_results), __pyx_n_s_to_matrix); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_results), __pyx_n_s_to_matrix); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_other->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyInt_From_npy_intp(__pyx_v_other->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_8);
   __Pyx_GIVEREF(__pyx_t_4);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_4)) __PYX_ERR(0, 2124, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_4)) __PYX_ERR(0, 2125, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_3)) __PYX_ERR(0, 2124, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_3)) __PYX_ERR(0, 2125, __pyx_L1_error);
   __pyx_t_4 = 0;
   __pyx_t_3 = 0;
-  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_shape, __pyx_t_8) < 0) __PYX_ERR(0, 2124, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_shape, __pyx_t_8) < 0) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-  __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_8);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_todok); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2124, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_todok); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 2125, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   __pyx_t_8 = NULL;
@@ -24855,7 +24855,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
     PyObject *__pyx_callargs[2] = {__pyx_t_8, NULL};
     __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_7, 0+__pyx_t_7);
     __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2124, __pyx_L1_error)
+    if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 2125, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
@@ -24863,7 +24863,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
   __pyx_t_5 = 0;
   goto __pyx_L0;
 
-  /* "pyart/map/ckdtree.pyx":2084
+  /* "pyart/map/ckdtree.pyx":2085
  *         return 0
  * 
  *     def sparse_distance_matrix(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
@@ -24889,7 +24889,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_14sparse_distance_matrix
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":834
+/* "pyart/map/ckdtree.pyx":835
  * 
  *     cdef innernode* tree
  *     cdef readonly np.ndarray data             # <<<<<<<<<<<<<<
@@ -24928,7 +24928,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_4data___get__(struct __p
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":836
+/* "pyart/map/ckdtree.pyx":837
  *     cdef readonly np.ndarray data
  *     cdef np.float64_t* raw_data
  *     cdef readonly np.intp_t n, m             # <<<<<<<<<<<<<<
@@ -24960,7 +24960,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_1n___get__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 836, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 837, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -25001,7 +25001,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_1m___get__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 836, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 837, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -25018,7 +25018,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_1m___get__(struct __pyx_
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":837
+/* "pyart/map/ckdtree.pyx":838
  *     cdef np.float64_t* raw_data
  *     cdef readonly np.intp_t n, m
  *     cdef readonly np.intp_t leafsize             # <<<<<<<<<<<<<<
@@ -25050,7 +25050,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8leafsize___get__(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 1);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->leafsize); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 837, __pyx_L1_error)
+  __pyx_t_1 = __Pyx_PyInt_From_npy_intp(__pyx_v_self->leafsize); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 838, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
@@ -25067,7 +25067,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_8leafsize___get__(struct
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":838
+/* "pyart/map/ckdtree.pyx":839
  *     cdef readonly np.intp_t n, m
  *     cdef readonly np.intp_t leafsize
  *     cdef readonly np.ndarray maxes             # <<<<<<<<<<<<<<
@@ -25106,7 +25106,7 @@ static PyObject *__pyx_pf_5pyart_3map_7ckdtree_7cKDTree_5maxes___get__(struct __
   return __pyx_r;
 }
 
-/* "pyart/map/ckdtree.pyx":840
+/* "pyart/map/ckdtree.pyx":841
  *     cdef readonly np.ndarray maxes
  *     cdef np.float64_t* raw_maxes
  *     cdef readonly np.ndarray mins             # <<<<<<<<<<<<<<
@@ -26359,7 +26359,7 @@ static struct PyGetSetDef __pyx_getsets_5pyart_3map_7ckdtree_cKDTree[] = {
 #if CYTHON_USE_TYPE_SPECS
 static PyType_Slot __pyx_type_5pyart_3map_7ckdtree_cKDTree_slots[] = {
   {Py_tp_dealloc, (void *)__pyx_tp_dealloc_5pyart_3map_7ckdtree_cKDTree},
-  {Py_tp_doc, (void *)PyDoc_STR("\n    cKDTree(data, int leafsize=10)\n\n    kd-tree for quick nearest-neighbor lookup\n\n    This class provides an index into a set of k-dimensional points\n    which can be used to rapidly look up the nearest neighbors of any\n    point. \n\n    The algorithm used is described in Maneewongvatana and Mount 1999. \n    The general idea is that the kd-tree is a binary trie, each of whose\n    nodes represents an axis-aligned hyperrectangle. Each node specifies\n    an axis and splits the set of points based on whether their coordinate\n    along that axis is greater than or less than a particular value. \n\n    During construction, the axis and splitting point are chosen by the \n    \"sliding midpoint\" rule, which ensures that the cells do not all\n    become long and thin. \n\n    The tree can be queried for the r closest neighbors of any given point \n    (optionally returning only those within some maximum distance of the \n    point). It can also be queried, with a substantial gain in efficiency, \n    for the r approximate closest neighbors.\n\n    For large dimensions (20 is already large) do not expect this to run \n    significantly faster than brute force. High-dimensional nearest-neighbor\n    queries are a substantial open problem in computer science.\n\n    Parameters\n    ----------\n    data : array-like, shape (n,m)\n        The n data points of dimension mto be indexed. This array is \n        not copied unless this is necessary to produce a contiguous \n        array of doubles, and so modifying this data will result in \n        bogus results.\n    leafsize : positive integer\n        The number of points at which the algorithm switches over to\n        brute-force.\n\n    ")},
+  {Py_tp_doc, (void *)PyDoc_STR("\n    cKDTree(data, int leafsize=10)\n\n    kd-tree for quick nearest-neighbor lookup\n\n    This class provides an index into a set of k-dimensional points\n    which can be used to rapidly look up the nearest neighbors of any\n    point.\n\n    The algorithm used is described in Maneewongvatana and Mount 1999.\n    The general idea is that the kd-tree is a binary trie, each of whose\n    nodes represents an axis-aligned hyperrectangle. Each node specifies\n    an axis and splits the set of points based on whether their coordinate\n    along that axis is greater than or less than a particular value.\n\n    During construction, the axis and splitting point are chosen by the\n    \"sliding midpoint\" rule, which ensures that the cells do not all\n    become long and thin.\n\n    The tree can be queried for the r closest neighbors of any given point\n    (optionally returning only those within some maximum distance of the\n    point). It can also be queried, with a substantial gain in efficiency,\n    for the r approximate closest neighbors.\n\n    For large dimensions (20 is already large) do not expect this to run\n    significantly faster than brute force. High-dimensional nearest-neighbor\n    queries are a substantial open problem in computer science.\n\n    Parameters\n    ----------\n    data : array-like, shape (n,m)\n        The n data points of dimension mto be indexed. This array is\n        not copied unless this is necessary to produce a contiguous\n        array of doubles, and so modifying this data will result in\n        bogus results.\n    leafsize : positive integer\n        The number of points at which the algorithm switches over to\n        brute-force.\n\n    ")},
   {Py_tp_traverse, (void *)__pyx_tp_traverse_5pyart_3map_7ckdtree_cKDTree},
   {Py_tp_clear, (void *)__pyx_tp_clear_5pyart_3map_7ckdtree_cKDTree},
   {Py_tp_methods, (void *)__pyx_methods_5pyart_3map_7ckdtree_cKDTree},
@@ -26408,7 +26408,7 @@ static PyTypeObject __pyx_type_5pyart_3map_7ckdtree_cKDTree = {
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-  PyDoc_STR("\n    cKDTree(data, int leafsize=10)\n\n    kd-tree for quick nearest-neighbor lookup\n\n    This class provides an index into a set of k-dimensional points\n    which can be used to rapidly look up the nearest neighbors of any\n    point. \n\n    The algorithm used is described in Maneewongvatana and Mount 1999. \n    The general idea is that the kd-tree is a binary trie, each of whose\n    nodes represents an axis-aligned hyperrectangle. Each node specifies\n    an axis and splits the set of points based on whether their coordinate\n    along that axis is greater than or less than a particular value. \n\n    During construction, the axis and splitting point are chosen by the \n    \"sliding midpoint\" rule, which ensures that the cells do not all\n    become long and thin. \n\n    The tree can be queried for the r closest neighbors of any given point \n    (optionally returning only those within some maximum distance of the \n    point). It can also be queried, with a substantial gain in efficiency, \n    for the r approximate closest neighbors.\n\n    For large dimensions (20 is already large) do not expect this to run \n    significantly faster than brute force. High-dimensional nearest-neighbor\n    queries are a substantial open problem in computer science.\n\n    Parameters\n    ----------\n    data : array-like, shape (n,m)\n        The n data points of dimension mto be indexed. This array is \n        not copied unless this is necessary to produce a contiguous \n        array of doubles, and so modifying this data will result in \n        bogus results.\n    leafsize : positive integer\n        The number of points at which the algorithm switches over to\n        brute-force.\n\n    "), /*tp_doc*/
+  PyDoc_STR("\n    cKDTree(data, int leafsize=10)\n\n    kd-tree for quick nearest-neighbor lookup\n\n    This class provides an index into a set of k-dimensional points\n    which can be used to rapidly look up the nearest neighbors of any\n    point.\n\n    The algorithm used is described in Maneewongvatana and Mount 1999.\n    The general idea is that the kd-tree is a binary trie, each of whose\n    nodes represents an axis-aligned hyperrectangle. Each node specifies\n    an axis and splits the set of points based on whether their coordinate\n    along that axis is greater than or less than a particular value.\n\n    During construction, the axis and splitting point are chosen by the\n    \"sliding midpoint\" rule, which ensures that the cells do not all\n    become long and thin.\n\n    The tree can be queried for the r closest neighbors of any given point\n    (optionally returning only those within some maximum distance of the\n    point). It can also be queried, with a substantial gain in efficiency,\n    for the r approximate closest neighbors.\n\n    For large dimensions (20 is already large) do not expect this to run\n    significantly faster than brute force. High-dimensional nearest-neighbor\n    queries are a substantial open problem in computer science.\n\n    Parameters\n    ----------\n    data : array-like, shape (n,m)\n        The n data points of dimension mto be indexed. This array is\n        not copied unless this is necessary to produce a contiguous\n        array of doubles, and so modifying this data will result in\n        bogus results.\n    leafsize : positive integer\n        The number of points at which the algorithm switches over to\n        brute-force.\n\n    "), /*tp_doc*/
   __pyx_tp_traverse_5pyart_3map_7ckdtree_cKDTree, /*tp_traverse*/
   __pyx_tp_clear_5pyart_3map_7ckdtree_cKDTree, /*tp_clear*/
   0, /*tp_richcompare*/
@@ -26635,11 +26635,11 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
 }
 /* #### Code section: cached_builtins ### */
 static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(0, 143, __pyx_L1_error)
-  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 154, __pyx_L1_error)
+  __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(0, 144, __pyx_L1_error)
+  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 155, __pyx_L1_error)
   __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 300, __pyx_L1_error)
-  __pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_n_s_AssertionError); if (!__pyx_builtin_AssertionError) __PYX_ERR(0, 589, __pyx_L1_error)
+  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 301, __pyx_L1_error)
+  __pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_n_s_AssertionError); if (!__pyx_builtin_AssertionError) __PYX_ERR(0, 590, __pyx_L1_error)
   __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(2, 1026, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
@@ -26651,7 +26651,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -26662,7 +26662,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -26673,102 +26673,102 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__2);
   __Pyx_GIVEREF(__pyx_tuple__2);
 
-  /* "pyart/map/ckdtree.pyx":497
+  /* "pyart/map/ckdtree.pyx":498
  * 
  *         if rect1.m != rect2.m:
  *             raise ValueError("rect1 and rect2 have different dimensions")             # <<<<<<<<<<<<<<
  * 
  *         self.rect1 = rect1
  */
-  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_rect1_and_rect2_have_different_d); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 497, __pyx_L1_error)
+  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_rect1_and_rect2_have_different_d); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 498, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__3);
   __Pyx_GIVEREF(__pyx_tuple__3);
 
-  /* "pyart/map/ckdtree.pyx":850
+  /* "pyart/map/ckdtree.pyx":851
  *         self.leafsize = leafsize
  *         if self.leafsize<1:
  *             raise ValueError("leafsize must be at least 1")             # <<<<<<<<<<<<<<
  *         self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)
  *         self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)
  */
-  __pyx_tuple__4 = PyTuple_Pack(1, __pyx_kp_u_leafsize_must_be_at_least_1); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 850, __pyx_L1_error)
+  __pyx_tuple__4 = PyTuple_Pack(1, __pyx_kp_u_leafsize_must_be_at_least_1); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 851, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__4);
   __Pyx_GIVEREF(__pyx_tuple__4);
 
-  /* "pyart/map/ckdtree.pyx":1028
+  /* "pyart/map/ckdtree.pyx":1029
  *         #  distances between the nearest side of the cell and the target
  *         #  the head node of the cell
  *         q = heap(12)             # <<<<<<<<<<<<<<
  * 
  *         # priority queue for the nearest neighbors
  */
-  __pyx_tuple__5 = PyTuple_Pack(1, __pyx_int_12); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 1028, __pyx_L1_error)
+  __pyx_tuple__5 = PyTuple_Pack(1, __pyx_int_12); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 1029, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__5);
   __Pyx_GIVEREF(__pyx_tuple__5);
 
-  /* "pyart/map/ckdtree.pyx":1254
+  /* "pyart/map/ckdtree.pyx":1255
  *                              "shape %s" % (int(self.m), np.shape(x)))
  *         if p < 1:
  *             raise ValueError("Only p-norms with 1<=p<=infinity permitted")             # <<<<<<<<<<<<<<
  *         if len(x.shape)==1:
  *             single = True
  */
-  __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_u_Only_p_norms_with_1_p_infinity_p); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 1254, __pyx_L1_error)
+  __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_u_Only_p_norms_with_1_p_infinity_p); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 1255, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__7);
   __Pyx_GIVEREF(__pyx_tuple__7);
 
-  /* "pyart/map/ckdtree.pyx":1257
+  /* "pyart/map/ckdtree.pyx":1258
  *         if len(x.shape)==1:
  *             single = True
  *             x = x[np.newaxis,:]             # <<<<<<<<<<<<<<
  *         else:
  *             single = False
  */
-  __pyx_slice__8 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__8)) __PYX_ERR(0, 1257, __pyx_L1_error)
+  __pyx_slice__8 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__8)) __PYX_ERR(0, 1258, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_slice__8);
   __Pyx_GIVEREF(__pyx_slice__8);
 
-  /* "pyart/map/ckdtree.pyx":1294
+  /* "pyart/map/ckdtree.pyx":1295
  *                             # C long overlow, return array of dtype=np.int_p
  *                             if k==1:
  *                                 return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)             # <<<<<<<<<<<<<<
  *                             else:
  *                                 return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))
  */
-  __pyx_tuple__9 = PyTuple_Pack(2, Py_Ellipsis, __pyx_int_0); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 1294, __pyx_L1_error)
+  __pyx_tuple__9 = PyTuple_Pack(2, Py_Ellipsis, __pyx_int_0); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 1295, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
 
-  /* "pyart/map/ckdtree.pyx":1436
+  /* "pyart/map/ckdtree.pyx":1437
  *             return self.__query_ball_point(&xx[0], r, p, eps)
  *         else:
  *             retshape = x.shape[:-1]             # <<<<<<<<<<<<<<
  *             result = np.empty(retshape, dtype=np.object)
  *             for c in np.ndindex(retshape):
  */
-  __pyx_slice__10 = PySlice_New(Py_None, __pyx_int_neg_1, Py_None); if (unlikely(!__pyx_slice__10)) __PYX_ERR(0, 1436, __pyx_L1_error)
+  __pyx_slice__10 = PySlice_New(Py_None, __pyx_int_neg_1, Py_None); if (unlikely(!__pyx_slice__10)) __PYX_ERR(0, 1437, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_slice__10);
   __Pyx_GIVEREF(__pyx_slice__10);
 
-  /* "pyart/map/ckdtree.pyx":1598
+  /* "pyart/map/ckdtree.pyx":1599
  *         # Make sure trees are compatible
  *         if self.m != other.m:
  *             raise ValueError("Trees passed to query_ball_trees have different dimensionality")             # <<<<<<<<<<<<<<
  * 
  *         # Track node-to-node min/max distances
  */
-  __pyx_tuple__11 = PyTuple_Pack(1, __pyx_kp_u_Trees_passed_to_query_ball_trees); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 1598, __pyx_L1_error)
+  __pyx_tuple__11 = PyTuple_Pack(1, __pyx_kp_u_Trees_passed_to_query_ball_trees); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 1599, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__11);
   __Pyx_GIVEREF(__pyx_tuple__11);
 
-  /* "pyart/map/ckdtree.pyx":1958
+  /* "pyart/map/ckdtree.pyx":1959
  *             n_queries = r.shape[0]
  *         else:
  *             raise ValueError("r must be either a single value or a one-dimensional array of values")             # <<<<<<<<<<<<<<
  * 
  *         # Internally, we represent all distances as distance ** p
  */
-  __pyx_tuple__12 = PyTuple_Pack(1, __pyx_kp_u_r_must_be_either_a_single_value); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 1958, __pyx_L1_error)
+  __pyx_tuple__12 = PyTuple_Pack(1, __pyx_kp_u_r_must_be_either_a_single_value); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 1959, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__12);
   __Pyx_GIVEREF(__pyx_tuple__12);
 
@@ -26777,7 +26777,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  * import numpy as np
  * import scipy.sparse             # <<<<<<<<<<<<<<
  * 
- * cimport numpy as np
+ * cimport cython
  */
   __pyx_tuple__14 = PyTuple_Pack(2, __pyx_n_s_scipy, __pyx_n_s_sparse); if (unlikely(!__pyx_tuple__14)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__14);
@@ -26804,18 +26804,18 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GIVEREF(__pyx_tuple__17);
   __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__17, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(1, 3, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":272
+  /* "pyart/map/ckdtree.pyx":273
  *         self.n += 1
  * 
  *     def to_matrix(coo_entries self, shape=None):             # <<<<<<<<<<<<<<
  *         # Shrink arrays to size
  *         self.i.resize(self.n)
  */
-  __pyx_tuple__19 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_shape); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 272, __pyx_L1_error)
+  __pyx_tuple__19 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_shape); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__19);
   __Pyx_GIVEREF(__pyx_tuple__19);
-  __pyx_codeobj__20 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__19, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_to_matrix, 272, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__20)) __PYX_ERR(0, 272, __pyx_L1_error)
-  __pyx_tuple__21 = PyTuple_Pack(1, Py_None); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(0, 272, __pyx_L1_error)
+  __pyx_codeobj__20 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__19, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_to_matrix, 273, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__20)) __PYX_ERR(0, 273, __pyx_L1_error)
+  __pyx_tuple__21 = PyTuple_Pack(1, Py_None); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__21);
   __Pyx_GIVEREF(__pyx_tuple__21);
 
@@ -26879,83 +26879,83 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
  */
   __pyx_codeobj__29 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__17, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__29)) __PYX_ERR(1, 3, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1203
+  /* "pyart/map/ckdtree.pyx":1204
  * 
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def query(cKDTree self, object x, np.intp_t k=1, np.float64_t eps=0,
  */
-  __pyx_tuple__30 = PyTuple_Pack(16, __pyx_n_s_self, __pyx_n_s_x, __pyx_n_s_k, __pyx_n_s_eps, __pyx_n_s_p, __pyx_n_s_distance_upper_bound, __pyx_n_s_ii, __pyx_n_s_dd, __pyx_n_s_xx, __pyx_n_s_c, __pyx_n_s_n, __pyx_n_s_i, __pyx_n_s_j, __pyx_n_s_sh, __pyx_n_s_single, __pyx_n_s_retshape); if (unlikely(!__pyx_tuple__30)) __PYX_ERR(0, 1203, __pyx_L1_error)
+  __pyx_tuple__30 = PyTuple_Pack(16, __pyx_n_s_self, __pyx_n_s_x, __pyx_n_s_k, __pyx_n_s_eps, __pyx_n_s_p, __pyx_n_s_distance_upper_bound, __pyx_n_s_ii, __pyx_n_s_dd, __pyx_n_s_xx, __pyx_n_s_c, __pyx_n_s_n, __pyx_n_s_i, __pyx_n_s_j, __pyx_n_s_sh, __pyx_n_s_single, __pyx_n_s_retshape); if (unlikely(!__pyx_tuple__30)) __PYX_ERR(0, 1204, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__30);
   __Pyx_GIVEREF(__pyx_tuple__30);
-  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(6, 0, 0, 16, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__30, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query, 1203, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 1203, __pyx_L1_error)
+  __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(6, 0, 0, 16, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__30, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query, 1204, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 1204, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1383
+  /* "pyart/map/ckdtree.pyx":1384
  * 
  * 
  *     def query_ball_point(cKDTree self, object x, np.float64_t r,             # <<<<<<<<<<<<<<
  *                          np.float64_t p=2., np.float64_t eps=0):
  *         """query_ball_point(self, x, r, p, eps)
  */
-  __pyx_tuple__32 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_x, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_xx, __pyx_n_s_retshape, __pyx_n_s_result, __pyx_n_s_c); if (unlikely(!__pyx_tuple__32)) __PYX_ERR(0, 1383, __pyx_L1_error)
+  __pyx_tuple__32 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_x, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_xx, __pyx_n_s_retshape, __pyx_n_s_result, __pyx_n_s_c); if (unlikely(!__pyx_tuple__32)) __PYX_ERR(0, 1384, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__32);
   __Pyx_GIVEREF(__pyx_tuple__32);
-  __pyx_codeobj__33 = (PyObject*)__Pyx_PyCode_New(5, 0, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__32, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_ball_point, 1383, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__33)) __PYX_ERR(0, 1383, __pyx_L1_error)
-  __pyx_tuple__34 = PyTuple_Pack(2, __pyx_float_2_, __pyx_float_0_0); if (unlikely(!__pyx_tuple__34)) __PYX_ERR(0, 1383, __pyx_L1_error)
+  __pyx_codeobj__33 = (PyObject*)__Pyx_PyCode_New(5, 0, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__32, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_ball_point, 1384, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__33)) __PYX_ERR(0, 1384, __pyx_L1_error)
+  __pyx_tuple__34 = PyTuple_Pack(2, __pyx_float_2_, __pyx_float_0_0); if (unlikely(!__pyx_tuple__34)) __PYX_ERR(0, 1384, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__34);
   __Pyx_GIVEREF(__pyx_tuple__34);
 
-  /* "pyart/map/ckdtree.pyx":1567
+  /* "pyart/map/ckdtree.pyx":1568
  * 
  * 
  *     def query_ball_tree(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
  *                         np.float64_t r, np.float64_t p=2., np.float64_t eps=0):
  *         """query_ball_tree(self, other, r, p, eps)
  */
-  __pyx_tuple__35 = PyTuple_Pack(8, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_tracker, __pyx_n_s_results, __pyx_n_s_i); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 1567, __pyx_L1_error)
+  __pyx_tuple__35 = PyTuple_Pack(8, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_tracker, __pyx_n_s_results, __pyx_n_s_i); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 1568, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__35);
   __Pyx_GIVEREF(__pyx_tuple__35);
-  __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(5, 0, 0, 8, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_ball_tree, 1567, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 1567, __pyx_L1_error)
+  __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(5, 0, 0, 8, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_ball_tree, 1568, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 1568, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1758
+  /* "pyart/map/ckdtree.pyx":1759
  * 
  * 
  *     def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,             # <<<<<<<<<<<<<<
  *                     np.float64_t eps=0):
  *         """query_pairs(self, r, p, eps)
  */
-  __pyx_tuple__37 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_tracker, __pyx_n_s_results); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 1758, __pyx_L1_error)
+  __pyx_tuple__37 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_eps, __pyx_n_s_tracker, __pyx_n_s_results); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 1759, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__37);
   __Pyx_GIVEREF(__pyx_tuple__37);
-  __pyx_codeobj__38 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__37, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_pairs, 1758, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__38)) __PYX_ERR(0, 1758, __pyx_L1_error)
+  __pyx_codeobj__38 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__37, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_query_pairs, 1759, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__38)) __PYX_ERR(0, 1759, __pyx_L1_error)
 
-  /* "pyart/map/ckdtree.pyx":1910
+  /* "pyart/map/ckdtree.pyx":1911
  *         return 0
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def count_neighbors(cKDTree self, cKDTree other, object r, np.float64_t p=2.):
  */
-  __pyx_tuple__39 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_n_queries, __pyx_n_s_i, __pyx_n_s_real_r, __pyx_n_s_results, __pyx_n_s_idx, __pyx_n_s_tracker); if (unlikely(!__pyx_tuple__39)) __PYX_ERR(0, 1910, __pyx_L1_error)
+  __pyx_tuple__39 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_r, __pyx_n_s_p, __pyx_n_s_n_queries, __pyx_n_s_i, __pyx_n_s_real_r, __pyx_n_s_results, __pyx_n_s_idx, __pyx_n_s_tracker); if (unlikely(!__pyx_tuple__39)) __PYX_ERR(0, 1911, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__39);
   __Pyx_GIVEREF(__pyx_tuple__39);
-  __pyx_codeobj__40 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__39, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_count_neighbors, 1910, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__40)) __PYX_ERR(0, 1910, __pyx_L1_error)
-  __pyx_tuple__41 = PyTuple_Pack(1, __pyx_float_2_); if (unlikely(!__pyx_tuple__41)) __PYX_ERR(0, 1910, __pyx_L1_error)
+  __pyx_codeobj__40 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__39, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_count_neighbors, 1911, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__40)) __PYX_ERR(0, 1911, __pyx_L1_error)
+  __pyx_tuple__41 = PyTuple_Pack(1, __pyx_float_2_); if (unlikely(!__pyx_tuple__41)) __PYX_ERR(0, 1911, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__41);
   __Pyx_GIVEREF(__pyx_tuple__41);
 
-  /* "pyart/map/ckdtree.pyx":2084
+  /* "pyart/map/ckdtree.pyx":2085
  *         return 0
  * 
  *     def sparse_distance_matrix(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
  *                                np.float64_t max_distance,
  *                                np.float64_t p=2.):
  */
-  __pyx_tuple__42 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_max_distance, __pyx_n_s_p, __pyx_n_s_tracker, __pyx_n_s_results); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 2084, __pyx_L1_error)
+  __pyx_tuple__42 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_other, __pyx_n_s_max_distance, __pyx_n_s_p, __pyx_n_s_tracker, __pyx_n_s_results); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 2085, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__42);
   __Pyx_GIVEREF(__pyx_tuple__42);
-  __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_sparse_distance_matrix, 2084, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 2084, __pyx_L1_error)
+  __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_pyart_map_ckdtree_pyx, __pyx_n_s_sparse_distance_matrix, 2085, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 2085, __pyx_L1_error)
 
   /* "(tree fragment)":1
  * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
@@ -27071,15 +27071,15 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtable_5pyart_3map_7ckdtree_heap.remove = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_heap *))__pyx_f_5pyart_3map_7ckdtree_4heap_remove;
   __pyx_vtable_5pyart_3map_7ckdtree_heap.pop = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_heap *, struct __pyx_t_5pyart_3map_7ckdtree_heapitem *))__pyx_f_5pyart_3map_7ckdtree_4heap_pop;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_heap = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_heap_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_heap)) __PYX_ERR(0, 132, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_heap_spec, __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_heap = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_heap_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_heap)) __PYX_ERR(0, 133, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_heap_spec, __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_heap = &__pyx_type_5pyart_3map_7ckdtree_heap;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_heap->tp_print = 0;
@@ -27089,26 +27089,26 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_heap->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_heap, __pyx_vtabptr_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_heap, __pyx_vtabptr_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_heap, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_heap, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_heap) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_7ckdtree_coo_entries = &__pyx_vtable_5pyart_3map_7ckdtree_coo_entries;
   __pyx_vtable_5pyart_3map_7ckdtree_coo_entries.add = (void (*)(struct __pyx_obj_5pyart_3map_7ckdtree_coo_entries *, __pyx_t_5numpy_intp_t, __pyx_t_5numpy_intp_t, __pyx_t_5numpy_float64_t))__pyx_f_5pyart_3map_7ckdtree_11coo_entries_add;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_coo_entries = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_coo_entries_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_coo_entries)) __PYX_ERR(0, 237, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_coo_entries_spec, __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_coo_entries = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_coo_entries_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_coo_entries)) __PYX_ERR(0, 238, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_coo_entries_spec, __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_coo_entries = &__pyx_type_5pyart_3map_7ckdtree_coo_entries;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_coo_entries->tp_print = 0;
@@ -27118,24 +27118,24 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_coo_entries->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries, __pyx_vtabptr_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries, __pyx_vtabptr_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_coo_entries, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_coo_entries, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 237, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_coo_entries) < 0) __PYX_ERR(0, 238, __pyx_L1_error)
   #endif
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_Rectangle = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_Rectangle_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_Rectangle)) __PYX_ERR(0, 326, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_Rectangle_spec, __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 326, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_Rectangle = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_Rectangle_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_Rectangle)) __PYX_ERR(0, 327, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_Rectangle_spec, __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 327, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_Rectangle = &__pyx_type_5pyart_3map_7ckdtree_Rectangle;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 326, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 327, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_Rectangle->tp_print = 0;
@@ -27145,9 +27145,9 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_Rectangle->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Rectangle, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 326, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Rectangle, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 327, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 326, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_Rectangle) < 0) __PYX_ERR(0, 327, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_7ckdtree_RectRectDistanceTracker = &__pyx_vtable_5pyart_3map_7ckdtree_RectRectDistanceTracker;
   __pyx_vtable_5pyart_3map_7ckdtree_RectRectDistanceTracker._init_stack = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker__init_stack;
@@ -27158,15 +27158,15 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtable_5pyart_3map_7ckdtree_RectRectDistanceTracker.push_greater_of = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *, __pyx_t_5numpy_intp_t, struct __pyx_t_5pyart_3map_7ckdtree_innernode *))__pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_push_greater_of;
   __pyx_vtable_5pyart_3map_7ckdtree_RectRectDistanceTracker.pop = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_23RectRectDistanceTracker_pop;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_RectRectDistanceTracker_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker)) __PYX_ERR(0, 457, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_RectRectDistanceTracker_spec, __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_RectRectDistanceTracker_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker)) __PYX_ERR(0, 458, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_RectRectDistanceTracker_spec, __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker = &__pyx_type_5pyart_3map_7ckdtree_RectRectDistanceTracker;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker->tp_print = 0;
@@ -27176,13 +27176,13 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker, __pyx_vtabptr_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker, __pyx_vtabptr_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RectRectDistanceTracker, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RectRectDistanceTracker, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 457, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_RectRectDistanceTracker) < 0) __PYX_ERR(0, 458, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_7ckdtree_PointRectDistanceTracker = &__pyx_vtable_5pyart_3map_7ckdtree_PointRectDistanceTracker;
   __pyx_vtable_5pyart_3map_7ckdtree_PointRectDistanceTracker._init_stack = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker__init_stack;
@@ -27194,15 +27194,15 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtable_5pyart_3map_7ckdtree_PointRectDistanceTracker.push_greater_of = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker *, struct __pyx_t_5pyart_3map_7ckdtree_innernode *))__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_push_greater_of;
   __pyx_vtable_5pyart_3map_7ckdtree_PointRectDistanceTracker.pop = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_PointRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_24PointRectDistanceTracker_pop;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_PointRectDistanceTracker_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker)) __PYX_ERR(0, 636, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_PointRectDistanceTracker_spec, __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_PointRectDistanceTracker_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker)) __PYX_ERR(0, 637, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_PointRectDistanceTracker_spec, __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker = &__pyx_type_5pyart_3map_7ckdtree_PointRectDistanceTracker;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker->tp_print = 0;
@@ -27212,13 +27212,13 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker, __pyx_vtabptr_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker, __pyx_vtabptr_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_PointRectDistanceTracker, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_PointRectDistanceTracker, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 636, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_PointRectDistanceTracker) < 0) __PYX_ERR(0, 637, __pyx_L1_error)
   #endif
   __pyx_vtabptr_5pyart_3map_7ckdtree_cKDTree = &__pyx_vtable_5pyart_3map_7ckdtree_cKDTree;
   __pyx_vtable_5pyart_3map_7ckdtree_cKDTree._cKDTree__build = (struct __pyx_t_5pyart_3map_7ckdtree_innernode *(*)(struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *, __pyx_t_5numpy_intp_t, __pyx_t_5numpy_intp_t, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *))__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__build;
@@ -27234,15 +27234,15 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtable_5pyart_3map_7ckdtree_cKDTree._cKDTree__count_neighbors_traverse = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *, struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *, __pyx_t_5numpy_intp_t, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_intp_t *, __pyx_t_5numpy_intp_t *, struct __pyx_t_5pyart_3map_7ckdtree_innernode *, struct __pyx_t_5pyart_3map_7ckdtree_innernode *, struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__count_neighbors_traverse;
   __pyx_vtable_5pyart_3map_7ckdtree_cKDTree._cKDTree__sparse_distance_matrix_traverse = (int (*)(struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *, struct __pyx_obj_5pyart_3map_7ckdtree_cKDTree *, struct __pyx_obj_5pyart_3map_7ckdtree_coo_entries *, struct __pyx_t_5pyart_3map_7ckdtree_innernode *, struct __pyx_t_5pyart_3map_7ckdtree_innernode *, struct __pyx_obj_5pyart_3map_7ckdtree_RectRectDistanceTracker *))__pyx_f_5pyart_3map_7ckdtree_7cKDTree__cKDTree__sparse_distance_matrix_traverse;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_5pyart_3map_7ckdtree_cKDTree = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_cKDTree_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_cKDTree)) __PYX_ERR(0, 791, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_cKDTree_spec, __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  __pyx_ptype_5pyart_3map_7ckdtree_cKDTree = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5pyart_3map_7ckdtree_cKDTree_spec, NULL); if (unlikely(!__pyx_ptype_5pyart_3map_7ckdtree_cKDTree)) __PYX_ERR(0, 792, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5pyart_3map_7ckdtree_cKDTree_spec, __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #else
   __pyx_ptype_5pyart_3map_7ckdtree_cKDTree = &__pyx_type_5pyart_3map_7ckdtree_cKDTree;
   #endif
   #if !CYTHON_COMPILING_IN_LIMITED_API
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_5pyart_3map_7ckdtree_cKDTree->tp_print = 0;
@@ -27252,13 +27252,13 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_5pyart_3map_7ckdtree_cKDTree->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_vtabptr_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_vtabptr_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_cKDTree, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_cKDTree, (PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 791, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_5pyart_3map_7ckdtree_cKDTree) < 0) __PYX_ERR(0, 792, __pyx_L1_error)
   #endif
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -27626,42 +27626,42 @@ if (!__Pyx_RefNanny) {
  * import numpy as np
  * import scipy.sparse             # <<<<<<<<<<<<<<
  * 
- * cimport numpy as np
+ * cimport cython
  */
   __pyx_t_2 = __Pyx_Import(__pyx_n_s_scipy_sparse, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_scipy, __pyx_t_2) < 0) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "pyart/map/ckdtree.pyx":49
+  /* "pyart/map/ckdtree.pyx":50
  * cdef extern from "limits.h":
  *     long LONG_MAX
  * cdef np.float64_t infinity = np.inf             # <<<<<<<<<<<<<<
  * 
  * __all__ = ['cKDTree']
  */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 49, __pyx_L1_error)
+  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_inf); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 49, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_inf); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 50, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_4 == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 49, __pyx_L1_error)
+  __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_4 == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(0, 50, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_5pyart_3map_7ckdtree_infinity = __pyx_t_4;
 
-  /* "pyart/map/ckdtree.pyx":51
+  /* "pyart/map/ckdtree.pyx":52
  * cdef np.float64_t infinity = np.inf
  * 
  * __all__ = ['cKDTree']             # <<<<<<<<<<<<<<
  * 
  * 
  */
-  __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 51, __pyx_L1_error)
+  __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 52, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_INCREF(__pyx_n_u_cKDTree);
   __Pyx_GIVEREF(__pyx_n_u_cKDTree);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_n_u_cKDTree)) __PYX_ERR(0, 51, __pyx_L1_error);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_all, __pyx_t_3) < 0) __PYX_ERR(0, 51, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_n_u_cKDTree)) __PYX_ERR(0, 52, __pyx_L1_error);
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_all, __pyx_t_3) < 0) __PYX_ERR(0, 52, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "(tree fragment)":1
@@ -27685,17 +27685,17 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_3) < 0) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyart/map/ckdtree.pyx":272
+  /* "pyart/map/ckdtree.pyx":273
  *         self.n += 1
  * 
  *     def to_matrix(coo_entries self, shape=None):             # <<<<<<<<<<<<<<
  *         # Shrink arrays to size
  *         self.i.resize(self.n)
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_11coo_entries_3to_matrix, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_coo_entries_to_matrix, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__20)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 272, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_11coo_entries_3to_matrix, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_coo_entries_to_matrix, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__20)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__21);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_coo_entries, __pyx_n_s_to_matrix, __pyx_t_3) < 0) __PYX_ERR(0, 272, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_coo_entries, __pyx_n_s_to_matrix, __pyx_t_3) < 0) __PYX_ERR(0, 273, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_coo_entries);
 
@@ -27741,7 +27741,7 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_3) < 0) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyart/map/ckdtree.pyx":454
+  /* "pyart/map/ckdtree.pyx":455
  *     np.float64_t min_distance, max_distance
  * 
  * cdef np.intp_t LESS = 1             # <<<<<<<<<<<<<<
@@ -27750,7 +27750,7 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_v_5pyart_3map_7ckdtree_LESS = 1;
 
-  /* "pyart/map/ckdtree.pyx":455
+  /* "pyart/map/ckdtree.pyx":456
  * 
  * cdef np.intp_t LESS = 1
  * cdef np.intp_t GREATER = 2             # <<<<<<<<<<<<<<
@@ -27801,7 +27801,7 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_3) < 0) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "pyart/map/ckdtree.pyx":1206
+  /* "pyart/map/ckdtree.pyx":1207
  *     @cython.wraparound(False)
  *     def query(cKDTree self, object x, np.intp_t k=1, np.float64_t eps=0,
  *               np.float64_t p=2, np.float64_t distance_upper_bound=infinity):             # <<<<<<<<<<<<<<
@@ -27810,104 +27810,104 @@ if (!__Pyx_RefNanny) {
  */
   __pyx_k__6 = __pyx_v_5pyart_3map_7ckdtree_infinity;
 
-  /* "pyart/map/ckdtree.pyx":1203
+  /* "pyart/map/ckdtree.pyx":1204
  * 
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def query(cKDTree self, object x, np.intp_t k=1, np.float64_t eps=0,
  */
-  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_5pyart_3map_7ckdtree_infinity); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1206, __pyx_L1_error)
+  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_5pyart_3map_7ckdtree_infinity); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1207, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1203, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1204, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF(__pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_1)) __PYX_ERR(0, 1203, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_1)) __PYX_ERR(0, 1204, __pyx_L1_error);
   __Pyx_INCREF(__pyx_float_0_0);
   __Pyx_GIVEREF(__pyx_float_0_0);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_float_0_0)) __PYX_ERR(0, 1203, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_float_0_0)) __PYX_ERR(0, 1204, __pyx_L1_error);
   __Pyx_INCREF(__pyx_float_2_0);
   __Pyx_GIVEREF(__pyx_float_2_0);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_float_2_0)) __PYX_ERR(0, 1203, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_float_2_0)) __PYX_ERR(0, 1204, __pyx_L1_error);
   __Pyx_GIVEREF(__pyx_t_3);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_t_3)) __PYX_ERR(0, 1203, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_t_3)) __PYX_ERR(0, 1204, __pyx_L1_error);
   __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_5query, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1203, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_5query, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1204, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query, __pyx_t_3) < 0) __PYX_ERR(0, 1203, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query, __pyx_t_3) < 0) __PYX_ERR(0, 1204, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
-  /* "pyart/map/ckdtree.pyx":1383
+  /* "pyart/map/ckdtree.pyx":1384
  * 
  * 
  *     def query_ball_point(cKDTree self, object x, np.float64_t r,             # <<<<<<<<<<<<<<
  *                          np.float64_t p=2., np.float64_t eps=0):
  *         """query_ball_point(self, x, r, p, eps)
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_7query_ball_point, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_ball_point, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__33)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1383, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_7query_ball_point, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_ball_point, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__33)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1384, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__34);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_ball_point, __pyx_t_3) < 0) __PYX_ERR(0, 1383, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_ball_point, __pyx_t_3) < 0) __PYX_ERR(0, 1384, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
-  /* "pyart/map/ckdtree.pyx":1567
+  /* "pyart/map/ckdtree.pyx":1568
  * 
  * 
  *     def query_ball_tree(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
  *                         np.float64_t r, np.float64_t p=2., np.float64_t eps=0):
  *         """query_ball_tree(self, other, r, p, eps)
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_9query_ball_tree, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_ball_tree, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__36)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1567, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_9query_ball_tree, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_ball_tree, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__36)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1568, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__34);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_ball_tree, __pyx_t_3) < 0) __PYX_ERR(0, 1567, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_ball_tree, __pyx_t_3) < 0) __PYX_ERR(0, 1568, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
-  /* "pyart/map/ckdtree.pyx":1758
+  /* "pyart/map/ckdtree.pyx":1759
  * 
  * 
  *     def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,             # <<<<<<<<<<<<<<
  *                     np.float64_t eps=0):
  *         """query_pairs(self, r, p, eps)
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_11query_pairs, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_pairs, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__38)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1758, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_11query_pairs, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_query_pairs, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__38)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1759, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__34);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_pairs, __pyx_t_3) < 0) __PYX_ERR(0, 1758, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_query_pairs, __pyx_t_3) < 0) __PYX_ERR(0, 1759, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
-  /* "pyart/map/ckdtree.pyx":1910
+  /* "pyart/map/ckdtree.pyx":1911
  *         return 0
  * 
  *     @cython.boundscheck(False)             # <<<<<<<<<<<<<<
  *     @cython.wraparound(False)
  *     def count_neighbors(cKDTree self, cKDTree other, object r, np.float64_t p=2.):
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_13count_neighbors, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_count_neighbors, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__40)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1910, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_13count_neighbors, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_count_neighbors, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__40)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1911, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__41);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_count_neighbors, __pyx_t_3) < 0) __PYX_ERR(0, 1910, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_count_neighbors, __pyx_t_3) < 0) __PYX_ERR(0, 1911, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
-  /* "pyart/map/ckdtree.pyx":2084
+  /* "pyart/map/ckdtree.pyx":2085
  *         return 0
  * 
  *     def sparse_distance_matrix(cKDTree self, cKDTree other,             # <<<<<<<<<<<<<<
  *                                np.float64_t max_distance,
  *                                np.float64_t p=2.):
  */
-  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_15sparse_distance_matrix, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_sparse_distance_matrix, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__43)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2084, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5pyart_3map_7ckdtree_7cKDTree_15sparse_distance_matrix, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_cKDTree_sparse_distance_matrix, NULL, __pyx_n_s_pyart_map_ckdtree, __pyx_d, ((PyObject *)__pyx_codeobj__43)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 2085, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__41);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_sparse_distance_matrix, __pyx_t_3) < 0) __PYX_ERR(0, 2084, __pyx_L1_error)
+  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5pyart_3map_7ckdtree_cKDTree, __pyx_n_s_sparse_distance_matrix, __pyx_t_3) < 0) __PYX_ERR(0, 2085, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   PyType_Modified(__pyx_ptype_5pyart_3map_7ckdtree_cKDTree);
 
diff --git a/pyart/map/ckdtree.pyx b/pyart/map/ckdtree.pyx
index 955fd7da4..c0c82a539 100644
--- a/pyart/map/ckdtree.pyx
+++ b/pyart/map/ckdtree.pyx
@@ -40,9 +40,10 @@ DAMAGE.
 import numpy as np
 import scipy.sparse
 
-cimport numpy as np
-cimport libc.stdlib as stdlib
 cimport cython
+cimport libc.stdlib as stdlib
+cimport numpy as np
+
 
 cdef extern from "limits.h":
     long LONG_MAX
@@ -116,12 +117,12 @@ cdef inline int list_append(list results, np.intp_t i) except -1:
         # Other platforms
         results.append(i)
     return 0
-    
+
 
 
 # Priority queue
 # ==============
-cdef union heapcontents:    # FIXME: Unions are not always portable, verify this 
+cdef union heapcontents:    # FIXME: Unions are not always portable, verify this
     np.intp_t intdata     # union is never used in an ABI dependent way.
     char* ptrdata
 
@@ -133,7 +134,7 @@ cdef class heap(object):
     cdef np.intp_t n
     cdef heapitem* heap
     cdef np.intp_t space
-    
+
     def __init__(heap self, np.intp_t initial_size):
         cdef void *tmp
         self.space = initial_size
@@ -141,7 +142,7 @@ cdef class heap(object):
         tmp = stdlib.malloc(sizeof(heapitem)*self.space)
         if tmp == NULL:
             raise MemoryError
-        self.heap = <heapitem*> tmp  
+        self.heap = <heapitem*> tmp
         self.n = 0
 
     def __dealloc__(heap self):
@@ -167,27 +168,27 @@ cdef class heap(object):
         self.n += 1
         if self.n > self.space:
             self._resize(2 * self.space + 1)
-            
+
         i = self.n - 1
         self.heap[i] = item
-        
+
         while i > 0 and self.heap[i].priority < self.heap[(i - 1) // 2].priority:
             t = self.heap[(i - 1) // 2]
             self.heap[(i - 1) // 2] = self.heap[i]
             self.heap[i] = t
             i = (i - 1) // 2
         return 0
-    
-    
+
+
     cdef heapitem peek(heap self):
         return self.heap[0]
-    
-    
+
+
     @cython.cdivision(True)
     cdef int remove(heap self) except -1:
         cdef heapitem t
         cdef np.intp_t i, j, k, l
-    
+
         self.heap[0] = self.heap[self.n-1]
         self.n -= 1
         # No point in freeing up space as the heap empties.
@@ -197,9 +198,9 @@ cdef class heap(object):
         i=0
         j=1
         k=2
-        while ((j<self.n and 
+        while ((j<self.n and
                     self.heap[i].priority > self.heap[j].priority or
-                k<self.n and 
+                k<self.n and
                     self.heap[i].priority > self.heap[k].priority)):
             if k<self.n and self.heap[j].priority>self.heap[k].priority:
                 l = k
@@ -212,7 +213,7 @@ cdef class heap(object):
             j = 2*i+1
             k = 2*i+2
         return 0
-    
+
     cdef int pop(heap self, heapitem *it) except -1:
         it[0] = self.peek()
         self.remove()
@@ -226,13 +227,13 @@ cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):
         return x
     else:
         return y
-        
+
 cdef inline np.float64_t dabs(np.float64_t x):
     if x>0:
         return x
     else:
         return -x
-        
+
 # Utility for building a coo matrix incrementally
 cdef class coo_entries:
     cdef:
@@ -242,7 +243,7 @@ cdef class coo_entries:
         np.intp_t *i_data
         np.intp_t *j_data
         np.float64_t *v_data
-    
+
     def __init__(self):
         self.n = 0
         self.n_max = 10
@@ -301,7 +302,7 @@ cdef inline np.float64_t _distance_p(np.float64_t *x, np.float64_t *y,
             z = x[i] - y[i]
             r += z*z
             if r>upperbound:
-                return r 
+                return r
     elif p==infinity:
         for i in range(k):
             r = dmax(r,dabs(x[i]-y[i]))
@@ -342,7 +343,7 @@ cdef class Rectangle:
 cdef inline np.float64_t min_dist_point_interval_p(np.float64_t* x,
                                                    Rectangle rect,
                                                    np.intp_t k,
-                                                   np.float64_t p):    
+                                                   np.float64_t p):
     """Compute the minimum distance along dimension k between x and
     a point in the hyperrectangle.
     """
@@ -483,23 +484,23 @@ cdef class RectRectDistanceTracker(object):
             raise MemoryError
         self.stack = <RR_stack_item*> tmp
         return 0
-    
+
     cdef int _free_stack(self) except -1:
         if self.stack != <RR_stack_item*> NULL:
             stdlib.free(self.stack)
         return 0
-    
+
 
     def __init__(self, Rectangle rect1, Rectangle rect2,
                  np.float64_t p, np.float64_t eps, np.float64_t upper_bound):
-        
+
         if rect1.m != rect2.m:
             raise ValueError("rect1 and rect2 have different dimensions")
 
         self.rect1 = rect1
         self.rect2 = rect2
         self.p = p
-        
+
         # internally we represent all distances as distance ** p
         if p != infinity and upper_bound != infinity:
             self.upper_bound = upper_bound ** p
@@ -543,7 +544,7 @@ cdef class RectRectDistanceTracker(object):
         # Push onto stack
         if self.stack_size == self.stack_max_size:
             self._resize_stack(self.stack_max_size * 2)
-            
+
         cdef RR_stack_item *item = &self.stack[self.stack_size]
         self.stack_size += 1
         item.which = which
@@ -569,25 +570,25 @@ cdef class RectRectDistanceTracker(object):
         else:
             self.min_distance = min_dist_rect_rect_p_inf(self.rect1, self.rect2)
             self.max_distance = max_dist_rect_rect_p_inf(self.rect1, self.rect2)
-            
+
         return 0
 
-    
+
     cdef inline int push_less_of(self, np.intp_t which,
                                  innernode *node) except -1:
         return self.push(which, LESS, node.split_dim, node.split)
 
-    
+
     cdef inline int push_greater_of(self, np.intp_t which,
                                     innernode *node) except -1:
         return self.push(which, GREATER, node.split_dim, node.split)
 
-    
+
     cdef inline int pop(self) except -1:
         # Pop from stack
         self.stack_size -= 1
         assert self.stack_size >= 0
-        
+
         cdef RR_stack_item* item = &self.stack[self.stack_size]
         self.min_distance = item.min_distance
         self.max_distance = item.max_distance
@@ -598,7 +599,7 @@ cdef class RectRectDistanceTracker(object):
         else:
             self.rect2.mins[item.split_dim] = item.min_along_dim
             self.rect2.maxes[item.split_dim] = item.max_along_dim
-        
+
         return 0
 
 # Point-to-rectangle distance tracker
@@ -663,7 +664,7 @@ cdef class PointRectDistanceTracker(object):
             raise MemoryError
         self.stack = <RP_stack_item*> tmp
         return 0
-    
+
     cdef int _free_stack(self) except -1:
         if self.stack != <RP_stack_item*> NULL:
             stdlib.free(self.stack)
@@ -675,7 +676,7 @@ cdef class PointRectDistanceTracker(object):
         self.pt = pt
         self.rect = rect
         self.p = p
-        
+
         # internally we represent all distances as distance ** p
         if p != infinity and upper_bound != infinity:
             self.upper_bound = upper_bound ** p
@@ -713,16 +714,16 @@ cdef class PointRectDistanceTracker(object):
         # Push onto stack
         if self.stack_size == self.stack_max_size:
             self._resize_stack(self.stack_max_size * 2)
-            
+
         cdef RP_stack_item *item = &self.stack[self.stack_size]
         self.stack_size += 1
-        
+
         item.split_dim = split_dim
         item.min_distance = self.min_distance
         item.max_distance = self.max_distance
         item.min_along_dim = self.rect.mins[split_dim]
         item.max_along_dim = self.rect.maxes[split_dim]
-            
+
         if self.p != infinity:
             self.min_distance -= min_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
             self.max_distance -= max_dist_point_interval_p(self.pt, self.rect, split_dim, self.p)
@@ -738,28 +739,28 @@ cdef class PointRectDistanceTracker(object):
         else:
             self.min_distance = min_dist_point_rect_p_inf(self.pt, self.rect)
             self.max_distance = max_dist_point_rect_p_inf(self.pt, self.rect)
-            
+
         return 0
 
-    
+
     cdef inline int push_less_of(self, innernode* node) except -1:
         return self.push(LESS, node.split_dim, node.split)
 
-    
+
     cdef inline int push_greater_of(self, innernode* node) except -1:
         return self.push(GREATER, node.split_dim, node.split)
 
-    
+
     cdef inline int pop(self) except -1:
         self.stack_size -= 1
         assert self.stack_size >= 0
-        
+
         cdef RP_stack_item* item = &self.stack[self.stack_size]
         self.min_distance = item.min_distance
         self.max_distance = item.max_distance
         self.rect.mins[item.split_dim] = item.min_along_dim
         self.rect.maxes[item.split_dim] = item.max_along_dim
-        
+
         return 0
 
 # Tree structure
@@ -770,7 +771,7 @@ cdef struct innernode:
     np.float64_t split
     innernode* less
     innernode* greater
-    
+
 cdef struct leafnode:
     np.intp_t split_dim
     np.intp_t children
@@ -796,33 +797,33 @@ cdef class cKDTree:
 
     This class provides an index into a set of k-dimensional points
     which can be used to rapidly look up the nearest neighbors of any
-    point. 
+    point.
 
-    The algorithm used is described in Maneewongvatana and Mount 1999. 
+    The algorithm used is described in Maneewongvatana and Mount 1999.
     The general idea is that the kd-tree is a binary trie, each of whose
     nodes represents an axis-aligned hyperrectangle. Each node specifies
     an axis and splits the set of points based on whether their coordinate
-    along that axis is greater than or less than a particular value. 
+    along that axis is greater than or less than a particular value.
 
-    During construction, the axis and splitting point are chosen by the 
+    During construction, the axis and splitting point are chosen by the
     "sliding midpoint" rule, which ensures that the cells do not all
-    become long and thin. 
+    become long and thin.
 
-    The tree can be queried for the r closest neighbors of any given point 
-    (optionally returning only those within some maximum distance of the 
-    point). It can also be queried, with a substantial gain in efficiency, 
+    The tree can be queried for the r closest neighbors of any given point
+    (optionally returning only those within some maximum distance of the
+    point). It can also be queried, with a substantial gain in efficiency,
     for the r approximate closest neighbors.
 
-    For large dimensions (20 is already large) do not expect this to run 
+    For large dimensions (20 is already large) do not expect this to run
     significantly faster than brute force. High-dimensional nearest-neighbor
     queries are a substantial open problem in computer science.
 
     Parameters
     ----------
     data : array-like, shape (n,m)
-        The n data points of dimension mto be indexed. This array is 
-        not copied unless this is necessary to produce a contiguous 
-        array of doubles, and so modifying this data will result in 
+        The n data points of dimension mto be indexed. This array is
+        not copied unless this is necessary to produce a contiguous
+        array of doubles, and so modifying this data will result in
         bogus results.
     leafsize : positive integer
         The number of points at which the algorithm switches over to
@@ -830,7 +831,7 @@ cdef class cKDTree:
 
     """
 
-    cdef innernode* tree 
+    cdef innernode* tree
     cdef readonly np.ndarray data
     cdef np.float64_t* raw_data
     cdef readonly np.intp_t n, m
@@ -868,7 +869,7 @@ cdef class cKDTree:
         cdef np.float64_t*mids
         if end_idx-start_idx<=self.leafsize:
             n = <leafnode*>stdlib.malloc(sizeof(leafnode))
-            if n == <leafnode*> NULL: 
+            if n == <leafnode*> NULL:
                 raise MemoryError
             n.split_dim = -1
             n.children = end_idx - start_idx
@@ -876,7 +877,7 @@ cdef class cKDTree:
             n.end_idx = end_idx
             return <innernode*>n
         else:
-            d = 0 
+            d = 0
             size = 0
             for i in range(self.m):
                 if maxes[i]-mins[i] > size:
@@ -887,7 +888,7 @@ cdef class cKDTree:
             if maxval==minval:
                 # all points are identical; warn user?
                 n = <leafnode*>stdlib.malloc(sizeof(leafnode))
-                if n == <leafnode*> NULL: 
+                if n == <leafnode*> NULL:
                     raise MemoryError
                 n.split_dim = -1
                 n.children = end_idx - start_idx
@@ -948,7 +949,7 @@ cdef class cKDTree:
                 mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)
                 if mids == <np.float64_t*> NULL:
                     raise MemoryError
-                        
+
                 for i in range(self.m):
                     mids[i] = maxes[i]
                 mids[d] = split
@@ -960,7 +961,7 @@ cdef class cKDTree:
                 ni.greater = self.__build(p,end_idx,maxes,mids)
 
                 ni.children = ni.less.children + ni.greater.children
-            
+
             except:
                 # free ni if it cannot be returned
                 if ni !=  <innernode*> NULL:
@@ -975,7 +976,7 @@ cdef class cKDTree:
             ni.split_dim = d
             ni.split = split
             return ni
-                    
+
     cdef __free_tree(cKDTree self, innernode* node):
         if node.split_dim!=-1:
             self.__free_tree(node.less)
@@ -992,13 +993,13 @@ cdef class cKDTree:
     # query
     # -----
 
-    cdef int __query(cKDTree self, 
-            np.float64_t*result_distances, 
-            np.intp_t*result_indices, 
-            np.float64_t*x, 
-            np.intp_t k, 
-            np.float64_t eps, 
-            np.float64_t p, 
+    cdef int __query(cKDTree self,
+            np.float64_t*result_distances,
+            np.intp_t*result_indices,
+            np.float64_t*x,
+            np.intp_t k,
+            np.float64_t eps,
+            np.float64_t p,
             np.float64_t distance_upper_bound) except -1:
 
         cdef heap q
@@ -1032,7 +1033,7 @@ cdef class cKDTree:
         # entries are (-distance**p, i)
         neighbors = heap(k)
 
-        inf = inf2 = <nodeinfo*> NULL    
+        inf = inf2 = <nodeinfo*> NULL
 
         try:
             # set up first nodeinfo
@@ -1081,7 +1082,7 @@ cdef class cKDTree:
                         d = _distance_p(
                                 self.raw_data+self.raw_indices[i]*self.m,
                                 x,p,self.m,distance_upper_bound)
-                            
+
                         if d<distance_upper_bound:
                             # replace furthest neighbor
                             if neighbors.n==k:
@@ -1093,7 +1094,7 @@ cdef class cKDTree:
                             # adjust upper bound for efficiency
                             if neighbors.n==k:
                                 distance_upper_bound = -neighbors.peek().priority
-                    
+
                     # done with this node, get another
                     stdlib.free(inf)
                     inf = <nodeinfo*> NULL
@@ -1109,7 +1110,7 @@ cdef class cKDTree:
                     inode = <innernode*>inf.node
 
                     # we don't push cells that are too far onto the queue at all,
-                    # but since the distance_upper_bound decreases, we might get 
+                    # but since the distance_upper_bound decreases, we might get
                     # here even if the cell's too far
                     if min_distance>distance_upper_bound*epsfac:
 
@@ -1142,7 +1143,7 @@ cdef class cKDTree:
                     inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))
                     if inf2 == <nodeinfo*> NULL:
                         raise MemoryError
-            
+
                     it2.contents.ptrdata = <char*> inf2
                     inf2.node = far
                     # most side distances unchanged
@@ -1161,7 +1162,7 @@ cdef class cKDTree:
                             inf.side_distances[inode.split_dim] + \
                             inf2.side_distances[inode.split_dim]
                     else:
-                        inf2.side_distances[inode.split_dim] = dabs(inode.split - 
+                        inf2.side_distances[inode.split_dim] = dabs(inode.split -
                                                                     x[inode.split_dim])**p
                         far_min_distance = min_distance - \
                             inf.side_distances[inode.split_dim] + \
@@ -1179,7 +1180,7 @@ cdef class cKDTree:
                         # just in case
                         it2.contents.ptrdata = <char*> NULL
 
-            # fill output arrays with sorted neighbors 
+            # fill output arrays with sorted neighbors
             for i in range(neighbors.n-1,-1,-1):
                 neighbors.pop(&neighbor)
                 result_indices[i] = neighbor.contents.intdata
@@ -1205,7 +1206,7 @@ cdef class cKDTree:
     def query(cKDTree self, object x, np.intp_t k=1, np.float64_t eps=0,
               np.float64_t p=2, np.float64_t distance_upper_bound=infinity):
         """query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)
-        
+
         Query the kd-tree for nearest neighbors
 
         Parameters
@@ -1215,11 +1216,11 @@ cdef class cKDTree:
         k : integer
             The number of nearest neighbors to return.
         eps : non-negative float
-            Return approximate nearest neighbors; the kth returned value 
-            is guaranteed to be no further than (1+eps) times the 
+            Return approximate nearest neighbors; the kth returned value
+            is guaranteed to be no further than (1+eps) times the
             distance to the real k-th nearest neighbor.
         p : float, 1<=p<=infinity
-            Which Minkowski p-norm to use. 
+            Which Minkowski p-norm to use.
             1 is the sum-of-absolute-values "Manhattan" distance
             2 is the usual Euclidean distance
             infinity is the maximum-coordinate-difference distance
@@ -1232,7 +1233,7 @@ cdef class cKDTree:
         Returns
         -------
         d : array of floats
-            The distances to the nearest neighbors. 
+            The distances to the nearest neighbors.
             If x has shape tuple+(self.m,), then d has shape tuple+(k,).
             Missing neighbors are indicated with infinite distances.
         i : ndarray of ints
@@ -1299,7 +1300,7 @@ cdef class cKDTree:
                 if k==1:
                     return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape).astype(int)
                 else:
-                    return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)).astype(int)     
+                    return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)).astype(int)
 
             else:
                 # ... most other platforms
@@ -1355,12 +1356,12 @@ cdef class cKDTree:
             self.__query_ball_point_traverse_checking(
                 results, node.less, tracker)
             tracker.pop()
-            
+
             tracker.push_greater_of(node)
             self.__query_ball_point_traverse_checking(
                 results, node.greater, tracker)
             tracker.pop()
-            
+
         return 0
 
 
@@ -1373,7 +1374,7 @@ cdef class cKDTree:
         tracker = PointRectDistanceTracker()
         tracker.init(x, Rectangle(self.mins, self.maxes),
                      p, eps, r)
-        
+
         results = []
         self.__query_ball_point_traverse_checking(
             results, self.tree, tracker)
@@ -1383,7 +1384,7 @@ cdef class cKDTree:
     def query_ball_point(cKDTree self, object x, np.float64_t r,
                          np.float64_t p=2., np.float64_t eps=0):
         """query_ball_point(self, x, r, p, eps)
-        
+
         Find all points within distance r of point(s) x.
 
         Parameters
@@ -1424,7 +1425,7 @@ cdef class cKDTree:
 
         """
         cdef np.ndarray[np.float64_t, ndim=1, mode="c"] xx
-        
+
         x = np.asarray(x).astype(np.float64)
         if x.shape[-1] != self.m:
             raise ValueError("Searching for a %d-dimensional point in a " \
@@ -1452,23 +1453,23 @@ cdef class cKDTree:
         cdef leafnode *lnode2
         cdef list results_i
         cdef np.intp_t i, j
-        
+
         if node1.split_dim == -1:  # leaf node
             lnode1 = <leafnode*>node1
-            
+
             if node2.split_dim == -1:  # leaf node
                 lnode2 = <leafnode*>node2
-                
+
                 for i in range(lnode1.start_idx, lnode1.end_idx):
                     results_i = results[self.raw_indices[i]]
                     for j in range(lnode2.start_idx, lnode2.end_idx):
                         list_append(results_i, other.raw_indices[j])
             else:
-                
+
                 self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.less)
                 self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.greater)
         else:
-            
+
             self.__query_ball_tree_traverse_no_checking(other, results, node1.less, node2)
             self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)
 
@@ -1494,10 +1495,10 @@ cdef class cKDTree:
             self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)
         elif node1.split_dim == -1:  # 1 is leaf node
             lnode1 = <leafnode*>node1
-            
+
             if node2.split_dim == -1:  # 1 & 2 are leaves
                 lnode2 = <leafnode*>node2
-                
+
                 # brute-force
                 for i in range(lnode1.start_idx, lnode1.end_idx):
                     results_i = results[self.raw_indices[i]]
@@ -1508,61 +1509,61 @@ cdef class cKDTree:
                             tracker.p, self.m, tracker.upper_bound)
                         if d <= tracker.upper_bound:
                             list_append(results_i, other.raw_indices[j])
-                            
+
             else:  # 1 is a leaf node, 2 is inner node
 
                 tracker.push_less_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1, node2.greater, tracker)
                 tracker.pop()
-            
-                
+
+
         else:  # 1 is an inner node
             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
                 tracker.push_less_of(1, node1)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.less, node2, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(1, node1)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.greater, node2, tracker)
                 tracker.pop()
-                
+
             else: # 1 & 2 are inner nodes
-                
+
                 tracker.push_less_of(1, node1)
                 tracker.push_less_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.less, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.less, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
 
-                
+
                 tracker.push_greater_of(1, node1)
                 tracker.push_less_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.greater, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_ball_tree_traverse_checking(
                     other, results, node1.greater, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
-            
+
         return 0
-            
+
 
     def query_ball_tree(cKDTree self, cKDTree other,
                         np.float64_t r, np.float64_t p=2., np.float64_t eps=0):
@@ -1602,7 +1603,7 @@ cdef class cKDTree:
             Rectangle(self.mins, self.maxes),
             Rectangle(other.mins, other.maxes),
             p, eps, r)
-        
+
         results = [[] for i in range(self.n)]
         self.__query_ball_tree_traverse_checking(
             other, results, self.tree, other.tree, tracker)
@@ -1621,10 +1622,10 @@ cdef class cKDTree:
         cdef leafnode *lnode2
         cdef list results_i
         cdef np.intp_t i, j, min_j
-        
+
         if node1.split_dim == -1:  # leaf node
             lnode1 = <leafnode*>node1
-            
+
             if node2.split_dim == -1:  # leaf node
                 lnode2 = <leafnode*>node2
 
@@ -1634,12 +1635,12 @@ cdef class cKDTree:
                         min_j = i + 1
                     else:
                         min_j = lnode2.start_idx
-                        
+
                     for j in range(min_j, lnode2.end_idx):
                         set_add_ordered_pair(results,
                                              self.raw_indices[i],
                                              self.raw_indices[j])
-                            
+
             else:
                 self.__query_pairs_traverse_no_checking(results, node1, node2.less)
                 self.__query_pairs_traverse_no_checking(results, node1, node2.greater)
@@ -1676,19 +1677,19 @@ cdef class cKDTree:
             self.__query_pairs_traverse_no_checking(results, node1, node2)
         elif node1.split_dim == -1:  # 1 is leaf node
             lnode1 = <leafnode*>node1
-            
+
             if node2.split_dim == -1:  # 1 & 2 are leaves
                 lnode2 = <leafnode*>node2
-                
+
                 # brute-force
                 for i in range(lnode1.start_idx, lnode1.end_idx):
-                    
+
                     # Special care here to avoid duplicate pairs
                     if node1 == node2:
                         min_j = i + 1
                     else:
                         min_j = lnode2.start_idx
-                        
+
                     for j in range(min_j, lnode2.end_idx):
                         d = _distance_p(
                             self.raw_data + self.raw_indices[i] * self.m,
@@ -1698,43 +1699,43 @@ cdef class cKDTree:
                             set_add_ordered_pair(results,
                                                  self.raw_indices[i],
                                                  self.raw_indices[j])
-                            
+
             else:  # 1 is a leaf node, 2 is inner node
                 tracker.push_less_of(2, node2)
                 self.__query_pairs_traverse_checking(
                     results, node1, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_pairs_traverse_checking(
                     results, node1, node2.greater, tracker)
                 tracker.pop()
-                
+
         else:  # 1 is an inner node
             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
                 tracker.push_less_of(1, node1)
                 self.__query_pairs_traverse_checking(
                     results, node1.less, node2, tracker)
                 tracker.pop()
-                
+
                 tracker.push_greater_of(1, node1)
                 self.__query_pairs_traverse_checking(
                     results, node1.greater, node2, tracker)
                 tracker.pop()
-                
+
             else: # 1 and 2 are inner nodes
                 tracker.push_less_of(1, node1)
                 tracker.push_less_of(2, node2)
                 self.__query_pairs_traverse_checking(
                     results, node1.less, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_pairs_traverse_checking(
                     results, node1.less, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(1, node1)
                 if node1 != node2:
                     # Avoid traversing (node1.less, node2.greater) and
@@ -1745,15 +1746,15 @@ cdef class cKDTree:
                     self.__query_pairs_traverse_checking(
                         results, node1.greater, node2.less, tracker)
                     tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__query_pairs_traverse_checking(
                     results, node1.greater, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
-                
+
         return 0
-            
+
 
     def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,
                     np.float64_t eps=0):
@@ -1781,16 +1782,16 @@ cdef class cKDTree:
             positions are close.
 
         """
-        
+
         tracker = RectRectDistanceTracker(
             Rectangle(self.mins, self.maxes),
             Rectangle(self.mins, self.maxes),
             p, eps, r)
-        
+
         results = set()
         self.__query_pairs_traverse_checking(
             results, self.tree, self.tree, tracker)
-        
+
         return results
 
 
@@ -1834,7 +1835,7 @@ cdef class cKDTree:
                 lnode1 = <leafnode*>node1
                 if node2.split_dim == -1:  # 1 & 2 are leaves
                     lnode2 = <leafnode*>node2
-                    
+
                     # brute-force
                     for i in range(lnode1.start_idx, lnode1.end_idx):
                         for j in range(lnode2.start_idx, lnode2.end_idx):
@@ -1848,7 +1849,7 @@ cdef class cKDTree:
                             for l in range(n_queries):
                                 if d <= r[idx[l]]:
                                     results[idx[l]] += 1
-                                
+
                 else:  # 1 is a leaf node, 2 is inner node
                     tracker.push_less_of(2, node2)
                     self.__count_neighbors_traverse(
@@ -1861,7 +1862,7 @@ cdef class cKDTree:
                         other, n_queries, r, results, idx,
                         node1, node2.greater, tracker)
                     tracker.pop()
-                
+
             else:  # 1 is an inner node
                 if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
                     tracker.push_less_of(1, node1)
@@ -1869,13 +1870,13 @@ cdef class cKDTree:
                         other, n_queries, r, results, idx,
                         node1.less, node2, tracker)
                     tracker.pop()
-                    
+
                     tracker.push_greater_of(1, node1)
                     self.__count_neighbors_traverse(
                         other, n_queries, r, results, idx,
                         node1.greater, node2, tracker)
                     tracker.pop()
-                    
+
                 else: # 1 and 2 are inner nodes
                     tracker.push_less_of(1, node1)
                     tracker.push_less_of(2, node2)
@@ -1883,28 +1884,28 @@ cdef class cKDTree:
                         other, n_queries, r, results, idx,
                         node1.less, node2.less, tracker)
                     tracker.pop()
-                        
+
                     tracker.push_greater_of(2, node2)
                     self.__count_neighbors_traverse(
                         other, n_queries, r, results, idx,
                         node1.less, node2.greater, tracker)
                     tracker.pop()
                     tracker.pop()
-                        
+
                     tracker.push_greater_of(1, node1)
                     tracker.push_less_of(2, node2)
                     self.__count_neighbors_traverse(
                         other, n_queries, r, results, idx,
                         node1.greater, node2.less, tracker)
                     tracker.pop()
-                        
+
                     tracker.push_greater_of(2, node2)
                     self.__count_neighbors_traverse(
                         other, n_queries, r, results, idx,
                         node1.greater, node2.greater, tracker)
                     tracker.pop()
                     tracker.pop()
-                    
+
         return 0
 
     @cython.boundscheck(False)
@@ -1968,7 +1969,7 @@ cdef class cKDTree:
             Rectangle(self.mins, self.maxes),
             Rectangle(other.mins, other.maxes),
             p, 0.0, 0.0)
-        
+
         # Go!
         results = np.zeros((n_queries,), dtype=np.intp)
         idx = np.arange(n_queries, dtype=np.intp)
@@ -1976,7 +1977,7 @@ cdef class cKDTree:
                                         &real_r[0], &results[0], &idx[0],
                                         self.tree, other.tree,
                                         tracker)
-        
+
         if np.shape(r) == ():
             if results[0] <= <np.intp_t> LONG_MAX:
                 return int(results[0])
@@ -1997,15 +1998,15 @@ cdef class cKDTree:
         cdef list results_i
         cdef np.float64_t d
         cdef np.intp_t i, j, min_j
-                
+
         if tracker.min_distance > tracker.upper_bound:
             return 0
         elif node1.split_dim == -1:  # 1 is leaf node
             lnode1 = <leafnode*>node1
-            
+
             if node2.split_dim == -1:  # 1 & 2 are leaves
                 lnode2 = <leafnode*>node2
-                
+
                 # brute-force
                 for i in range(lnode1.start_idx, lnode1.end_idx):
                     # Special care here to avoid duplicate pairs
@@ -2013,7 +2014,7 @@ cdef class cKDTree:
                         min_j = i+1
                     else:
                         min_j = lnode2.end_idx
-                        
+
                     for j in range(min_j, lnode2.end_idx):
                         d = _distance_p(
                             self.raw_data + self.raw_indices[i] * self.m,
@@ -2031,37 +2032,37 @@ cdef class cKDTree:
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1, node2.greater, tracker)
                 tracker.pop()
-                
+
         else:  # 1 is an inner node
             if node2.split_dim == -1:  # 1 is an inner node, 2 is a leaf node
                 tracker.push_less_of(1, node1)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1.less, node2, tracker)
                 tracker.pop()
-                
+
                 tracker.push_greater_of(1, node1)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1.greater, node2, tracker)
                 tracker.pop()
-                
+
             else: # 1 and 2 are inner nodes
                 tracker.push_less_of(1, node1)
                 tracker.push_less_of(2, node2)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1.less, node2.less, tracker)
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1.less, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
-                    
+
                 tracker.push_greater_of(1, node1)
                 if node1 != node2:
                     # Avoid traversing (node1.less, node2.greater) and
@@ -2072,15 +2073,15 @@ cdef class cKDTree:
                     self.__sparse_distance_matrix_traverse(
                         other, results, node1.greater, node2.less, tracker)
                     tracker.pop()
-                    
+
                 tracker.push_greater_of(2, node2)
                 self.__sparse_distance_matrix_traverse(
                     other, results, node1.greater, node2.greater, tracker)
                 tracker.pop()
                 tracker.pop()
-                
+
         return 0
-            
+
     def sparse_distance_matrix(cKDTree self, cKDTree other,
                                np.float64_t max_distance,
                                np.float64_t p=2.):
@@ -2115,10 +2116,10 @@ cdef class cKDTree:
             Rectangle(self.mins, self.maxes),
             Rectangle(other.mins, other.maxes),
             p, 0, max_distance)
-        
+
         results = coo_entries()
         self.__sparse_distance_matrix_traverse(other, results,
                                                self.tree, other.tree,
                                                tracker)
-        
+
         return results.to_matrix(shape=(self.n, other.n)).todok()
diff --git a/pyart/map/gate_mapper.py b/pyart/map/gate_mapper.py
index 50626cab7..f1bfb6c9b 100644
--- a/pyart/map/gate_mapper.py
+++ b/pyart/map/gate_mapper.py
@@ -1,6 +1,5 @@
 """
-Utilities for finding gates with equivalent locations between radars for easy
-comparison.
+Utilities for finding gates with equivalent locations between radars for easy comparison.
 
 """
 
@@ -16,26 +15,22 @@
 
 class GateMapper:
     """
-    The GateMapper class will, given one radar's gate, find the gate in another
-    radar's volume that is closest in location to the specified gate.
-    GateMapper will use a kd-tree in order to generate a mapping function that
-    provides the sweep and ray index in the other radar that is closest in
-    physical location to the first radar's gate. This functionality provides
-    easy mapping of equivalent locations between radar objects with simple indexing.
-    In addition, returning a mapped radar object is also supported.
+    The GateMapper class will, given one radar's gate, find the gate in another radar's volume
+    that is closest in location to the specified gate. GateMapper will use a kd-tree in order to generate a
+    mapping function that provides the sweep and ray index in the other radar that is closest in physical
+    location to the first radar's gate. This functionality provides easy mapping of equivalent locations between
+    radar objects with simple indexing. In addition, returning a mapped radar object is also supported.
 
     Attributes
     ----------
     src_radar_x, src_radar_y: float
-        The source radar's x and y location in the the destination
-        radar's Cartesian coordinates.
+        The source radar's x and y location in the the destination radar's Cartesian coordinates.
     distance_tolerance: float
         The distance tolerance in meters for each gate in meters.
     time_tolerance: float
         The time tolerance in meters for each gate in seconds.
     gatefilter_src: pyart.filters.GateFilter
-        The gatefilter to apply to the source radar data when mapping
-        to the destination.
+        The gatefilter to apply to the source radar data when mapping to the destination.
     src_radar: pyart.core.Radar
         The source radar data.
     dest_radar: pyart.core.Radar
@@ -48,8 +43,7 @@ class GateMapper:
     Examples
     --------
     >>> gate_mapper = pyart.map.GateMapper(src, dest)
-    >>> # Get the destination radar's equivalent of (2, 2) in the source
-        radar's coordinates
+    >>> # Get the destination radar's equivalent of (2, 2) in the source radar's coordinates
     >>> dest_index = gate_mapper[2, 2]
     >>> radar_mapped = gate_mapper.mapped_radar(['reflectivity'])
 
@@ -62,8 +56,7 @@ class GateMapper:
     gatefilter_src: pyart.filters.GateFilter, or None
         The gatefilter to apply to the source radar data before mapping
     distance_tolerance: float
-        The difference in meters between the source and destination gate
-        allowed for an adequate match.
+        The difference in meters between the source and destination gate allowed for an adequate match.
     time_tolerance: float
         The difference in time between the source and destination radar rays.
     """
@@ -209,8 +202,8 @@ def distance_tolerance(self, distance_tolerance):
 
     def mapped_radar(self, field_list):
         """
-        This returns a version of the destination radar with the fields in field_list
-        from the source radar mapped into the destination radar's coordinate system.
+        This returns a version of the destination radar with the fields in field_list from the source radar
+        mapped into the destination radar's coordinate system.
 
         Parameters
         ----------
@@ -220,8 +213,8 @@ def mapped_radar(self, field_list):
         Returns
         -------
         mapped_radar:
-            The destination radar with the fields from the source radar mapped
-            into the destination radar's coordinate system.
+            The destination radar with the fields from the source radar mapped into the destination radar's
+            coordinate system.
         """
         mapped_radar = deepcopy(self.dest_radar)
         if isinstance(field_list, str):
diff --git a/pyart/map/gates_to_grid.py b/pyart/map/gates_to_grid.py
index df3b7cff8..bcc470d55 100644
--- a/pyart/map/gates_to_grid.py
+++ b/pyart/map/gates_to_grid.py
@@ -1,23 +1,7 @@
 """
-pyart.map.gates_to_grid
-=======================
-
 Generate a Cartesian grid by mapping from radar gates onto the grid.
 
-.. autosummary::
-    :toctree: generated/
-
-    map_gates_to_grid
-    _detemine_cy_weighting_func
-    _find_projparams
-    _parse_gatefilters
-    _determine_fields
-    _find_offsets
-    _find_grid_params
-    _parse_roi_func
-
 """
-
 import gc
 import warnings
 
@@ -51,11 +35,12 @@ def map_gates_to_grid(
     constant_roi=None,
     z_factor=0.05,
     xy_factor=0.02,
-    min_radius=500.0,
-    h_factor=1.0,
-    nb=1.5,
+    min_radius=250.0,
+    h_factor=(1.0, 1.0, 1.0),
+    nb=1.0,
     bsp=1.0,
-    **kwargs
+    dist_factor=(1.0, 1.0, 1.0),
+    **kwargs,
 ):
     """
     Map gates from one or more radars to a Cartesian grid.
@@ -110,6 +95,19 @@ def map_gates_to_grid(
     if len(radars) == 0:
         raise ValueError("Length of radars tuple cannot be zero")
 
+    # set min_radius depending on whether processing ARM radars
+    try:
+        if "platform_id" in radars[0].metadata.keys():
+            if np.any(
+                [
+                    x in radars[0].metadata["platform_id"].lower()
+                    for x in ["sacr", "sapr"]
+                ]
+            ):
+                min_radius = 100.0
+    except AttributeError:
+        pass
+
     skip_transform = False
     if len(radars) == 1 and grid_origin_alt is None and grid_origin is None:
         skip_transform = True
@@ -120,6 +118,16 @@ def map_gates_to_grid(
         except TypeError:
             grid_origin_alt = np.mean(radars[0].altitude["data"])
 
+    # convert input h_factor and dist_factor from scalar, tuple, or list to array
+    if isinstance(h_factor, (tuple, list)):
+        h_factor = np.array(h_factor, dtype="float32")
+    elif isinstance(h_factor, float):
+        h_factor = np.full(3, h_factor, dtype="float32")
+    if isinstance(dist_factor, (tuple, list)):
+        dist_factor = np.array(dist_factor, dtype="float32")
+    elif isinstance(dist_factor, float):
+        dist_factor = np.full(3, dist_factor, dtype="float32")
+
     gatefilters = _parse_gatefilters(gatefilters, radars)
     cy_weighting_function = _detemine_cy_weighting_func(weighting_function)
     projparams = _find_projparams(grid_origin, radars, grid_projection)
@@ -188,9 +196,9 @@ def map_gates_to_grid(
             field_data,
             field_mask,
             excluded_gates,
-            toa,
             roi_func,
             cy_weighting_function,
+            dist_factor,
         )
 
     # create and return the grid dictionary
@@ -205,65 +213,69 @@ def map_gates_to_grid(
     gc.collect()
     return grids
 
+
 def _detemine_cy_weighting_func(weighting_function):
-    """ Determine cython weight function value. """
-    if weighting_function.upper() == 'BARNES2':
+    """Determine cython weight function value."""
+    if weighting_function.upper() == "BARNES2":
         cy_weighting_function = 3
-    elif weighting_function.upper() == 'NEAREST':
+    elif weighting_function.upper() == "NEAREST":
         cy_weighting_function = 2
-    elif weighting_function.upper() == 'CRESSMAN':
+    elif weighting_function.upper() == "CRESSMAN":
         cy_weighting_function = 1
-    elif weighting_function.upper() == 'BARNES':
-        warnings.warn("Barnes weighting function is deprecated."
-                      " Please use Barnes 2 to be consistent with"
-                      " Pauley and Wu 1990.", DeprecationWarning)
+    elif weighting_function.upper() == "BARNES":
+        warnings.warn(
+            "Barnes weighting function is deprecated."
+            " Please use Barnes 2 to be consistent with"
+            " Pauley and Wu 1990. Default will be switched"
+            " to Barnes2 on June 1st.",
+            DeprecationWarning,
+        )
         cy_weighting_function = 0
     else:
-        raise ValueError('unknown weighting_function')
+        raise ValueError("unknown weighting_function")
     return cy_weighting_function
 
 
 def _find_projparams(grid_origin, radars, grid_projection):
-    """ Determine the projection parameter. """
+    """Determine the projection parameter."""
 
     # parse grid_origin
     if grid_origin is None:
         try:
-            lat = float(radars[0].latitude['data'])
-            lon = float(radars[0].longitude['data'])
+            lat = float(radars[0].latitude["data"])
+            lon = float(radars[0].longitude["data"])
         except TypeError:
-            lat = np.mean(radars[0].latitude['data'])
-            lon = np.mean(radars[0].longitude['data'])
+            lat = np.mean(radars[0].latitude["data"])
+            lon = np.mean(radars[0].longitude["data"])
         grid_origin = (lat, lon)
 
     grid_origin_lat, grid_origin_lon = grid_origin
 
     # parse grid_projection
     if grid_projection is None:
-        grid_projection = {
-            'proj': 'pyart_aeqd', '_include_lon_0_lat_0': True}
+        grid_projection = {"proj": "pyart_aeqd", "_include_lon_0_lat_0": True}
     projparams = grid_projection.copy()
-    if projparams.pop('_include_lon_0_lat_0', False):
-        projparams['lon_0'] = grid_origin_lon
-        projparams['lat_0'] = grid_origin_lat
+    if projparams.pop("_include_lon_0_lat_0", False):
+        projparams["lon_0"] = grid_origin_lon
+        projparams["lat_0"] = grid_origin_lat
     return projparams
 
 
 def _parse_gatefilters(gatefilters, radars):
-    """ Parse the gatefilters parameter. """
+    """Parse the gatefilters parameter."""
     if isinstance(gatefilters, GateFilter):
-        gatefilters = (gatefilters, )  # make tuple if single filter passed
+        gatefilters = (gatefilters,)  # make tuple if single filter passed
     if gatefilters is False:
-        gatefilters = (False, ) * len(radars)
+        gatefilters = (False,) * len(radars)
     if gatefilters is None:
-        gatefilters = (None, ) * len(radars)
+        gatefilters = (None,) * len(radars)
     if len(gatefilters) != len(radars):
-        raise ValueError('Length of gatefilters must match length of radars')
+        raise ValueError("Length of gatefilters must match length of radars")
     return gatefilters
 
 
 def _determine_fields(fields, radars):
-    """ Determine which field should be mapped to the grid. """
+    """Determine which field should be mapped to the grid."""
     if fields is None:
         fields = set(radars[0].fields.keys())
         for radar in radars[1:]:
@@ -273,23 +285,24 @@ def _determine_fields(fields, radars):
 
 
 def _find_offsets(radars, projparams, grid_origin_alt):
-    """ Find offset between radars and grid origin. """
+    """Find offset between radars and grid origin."""
     # loop over the radars finding offsets from the origin
     offsets = []  # offsets from the grid origin, in meters, for each radar
     for radar in radars:
         x_disp, y_disp = geographic_to_cartesian(
-            radar.longitude['data'], radar.latitude['data'], projparams)
+            radar.longitude["data"], radar.latitude["data"], projparams
+        )
         try:
-            z_disp = float(radar.altitude['data']) - grid_origin_alt
+            z_disp = float(radar.altitude["data"]) - grid_origin_alt
             offsets.append((z_disp, float(y_disp), float(x_disp)))
         except TypeError:
-            z_disp = np.mean(radar.altitude['data']) - grid_origin_alt
+            z_disp = np.mean(radar.altitude["data"]) - grid_origin_alt
             offsets.append((z_disp, np.mean(y_disp), np.mean(x_disp)))
     return offsets
 
 
 def _find_grid_params(grid_shape, grid_limits):
-    """ Find the starting points and step size of the grid. """
+    """Find the starting points and step size of the grid."""
     nz, ny, nx = grid_shape
     zr, yr, xr = grid_limits
     z_start, z_stop = zr
@@ -297,37 +310,38 @@ def _find_grid_params(grid_shape, grid_limits):
     x_start, x_stop = xr
 
     if nz == 1:
-        z_step = 0.
+        z_step = 0.0
     else:
-        z_step = (z_stop - z_start) / (nz - 1.)
+        z_step = (z_stop - z_start) / (nz - 1.0)
     if ny == 1:
-        y_step = 0.
+        y_step = 0.0
     else:
-        y_step = (y_stop - y_start) / (ny - 1.)
+        y_step = (y_stop - y_start) / (ny - 1.0)
     if nx == 1:
-        x_step = 0.
+        x_step = 0.0
     else:
-        x_step = (x_stop - x_start) / (nx - 1.)
+        x_step = (x_stop - x_start) / (nx - 1.0)
 
     grid_starts = (z_start, y_start, x_start)
     grid_steps = (z_step, y_step, x_step)
     return grid_starts, grid_steps
 
 
-def _parse_roi_func(roi_func, constant_roi, z_factor, xy_factor, min_radius,
-                    h_factor, nb, bsp, offsets):
-    """ Return the Radius of influence object. """
+def _parse_roi_func(
+    roi_func, constant_roi, z_factor, xy_factor, min_radius, h_factor, nb, bsp, offsets
+):
+    """Return the Radius of influence object."""
     if not isinstance(roi_func, RoIFunction):
         if constant_roi is not None:
-            roi_func = 'constant'
+            roi_func = "constant"
         else:
             constant_roi = 500.0
-        if roi_func == 'constant':
+        if roi_func == "constant":
             roi_func = ConstantRoI(constant_roi)
-        elif roi_func == 'dist':
+        elif roi_func == "dist":
             roi_func = DistRoI(z_factor, xy_factor, min_radius, offsets)
-        elif roi_func == 'dist_beam':
+        elif roi_func == "dist_beam":
             roi_func = DistBeamRoI(h_factor, nb, bsp, min_radius, offsets)
         else:
-            raise ValueError(f'unknown roi_func: {roi_func}')
+            raise ValueError(f"unknown roi_func: {roi_func}")
     return roi_func
diff --git a/pyart/map/grid_mapper.py b/pyart/map/grid_mapper.py
index 9e95f8551..b95b4143c 100644
--- a/pyart/map/grid_mapper.py
+++ b/pyart/map/grid_mapper.py
@@ -1,28 +1,6 @@
 """
-pyart.map.grid_mapper
-=====================
-
 Utilities for mapping radar objects to Cartesian grids.
 
-.. autosummary::
-    :toctree: generated/
-
-    grid_from_radars
-    map_to_grid
-    example_roi_func_constant
-    example_roi_func_dist
-    _unify_times_for_radars
-    _load_nn_field_data
-    _gen_roi_func_constant
-    _gen_roi_func_dist
-    _gen_roi_func_dist_beam
-
-.. autosummary::
-    :toctree: generated/
-    :template: dev_template.rst
-
-    NNLocator
-
 """
 
 import warnings
@@ -30,6 +8,7 @@
 import netCDF4
 import numpy as np
 import scipy.spatial
+import xarray as xr
 
 from ..config import get_fillvalue, get_metadata
 from ..core.grid import Grid
@@ -42,8 +21,14 @@
 from .gates_to_grid import map_gates_to_grid
 
 
-def grid_from_radars(radars, grid_shape, grid_limits,
-                     gridding_algo='map_gates_to_grid', **kwargs):
+def grid_from_radars(
+    radars,
+    grid_shape,
+    grid_limits,
+    gridding_algo="map_gates_to_grid",
+    copy_field_dtypes=True,
+    **kwargs,
+):
     """
     Map one or more radars to a Cartesian grid returning a Grid object.
 
@@ -64,6 +49,9 @@ def grid_from_radars(radars, grid_shape, grid_limits,
         a radius of influence for each grid point, 'map_gates_to_grid' maps
         each radar gate onto the grid using a radius of influence and is
         typically significantly faster.
+    copy_field_dtypes : bool
+        Whether or not to maintain the original dtypes found in the radar
+        fields, which will then be used in the grid fields.
 
     Returns
     -------
@@ -93,112 +81,135 @@ def grid_from_radars(radars, grid_shape, grid_limits,
     """
     # make a tuple if passed a radar object as the first argument
     if isinstance(radars, Radar):
-        radars = (radars, )
+        radars = (radars,)
+
+    if len(radars) == 0:
+        raise ValueError("Length of radars tuple cannot be zero")
 
     # map the radar(s) to a cartesian grid
-    if gridding_algo == 'map_to_grid':
+    if gridding_algo == "map_to_grid":
         grids = map_to_grid(radars, grid_shape, grid_limits, **kwargs)
-    elif gridding_algo == 'map_gates_to_grid':
+    elif gridding_algo == "map_gates_to_grid":
         grids = map_gates_to_grid(radars, grid_shape, grid_limits, **kwargs)
     else:
-        raise ValueError('invalid gridding_algo')
+        raise ValueError("invalid gridding_algo")
 
     # create and populate the field dictionary
     fields = {}
     first_radar = radars[0]
 
     for field in grids.keys():
-        if field == 'ROI':
-            fields['ROI'] = {
-                'data': grids['ROI'],
-                'standard_name': 'radius_of_influence',
-                'long_name': 'Radius of influence for mapping',
-                'units': 'm',
-                'least_significant_digit': 1,
-                '_FillValue': get_fillvalue()}
+        if field == "ROI":
+            fields["ROI"] = {
+                "data": grids["ROI"],
+                "standard_name": "radius_of_influence",
+                "long_name": "Radius of influence for mapping",
+                "units": "m",
+                "least_significant_digit": 1,
+                "_FillValue": get_fillvalue(),
+            }
         else:
-            fields[field] = {'data': grids[field]}
+            fields[field] = {"data": grids[field]}
             # copy the metadata from the radar to the grid
             for key in first_radar.fields[field].keys():
-                if key == 'data':
+                if key == "data":
                     continue
                 fields[field][key] = first_radar.fields[field][key]
 
     # time dictionaries
-    time = get_metadata('grid_time')
-    time['data'] = np.array([first_radar.time['data'][0]])
-    time['units'] = first_radar.time['units']
+    time = get_metadata("grid_time")
+    time["data"] = np.array([first_radar.time["data"][0]])
+    time["units"] = first_radar.time["units"]
 
     # grid coordinate dictionaries
     nz, ny, nx = grid_shape
     (z0, z1), (y0, y1), (x0, x1) = grid_limits
 
-    x = get_metadata('x')
-    x['data'] = np.linspace(x0, x1, nx)
+    x = get_metadata("x")
+    x["data"] = np.linspace(x0, x1, nx)
 
-    y = get_metadata('y')
-    y['data'] = np.linspace(y0, y1, ny)
+    y = get_metadata("y")
+    y["data"] = np.linspace(y0, y1, ny)
 
-    z = get_metadata('z')
-    z['data'] = np.linspace(z0, z1, nz)
+    z = get_metadata("z")
+    z["data"] = np.linspace(z0, z1, nz)
 
     # grid origin location dictionaries
-    origin_latitude = get_metadata('origin_latitude')
-    origin_longitude = get_metadata('origin_longitude')
-    if 'grid_origin' in kwargs:
-        origin_latitude['data'] = np.array([kwargs['grid_origin'][0]])
-        origin_longitude['data'] = np.array([kwargs['grid_origin'][1]])
+    origin_latitude = get_metadata("origin_latitude")
+    origin_longitude = get_metadata("origin_longitude")
+    if "grid_origin" in kwargs:
+        origin_latitude["data"] = np.array([kwargs["grid_origin"][0]])
+        origin_longitude["data"] = np.array([kwargs["grid_origin"][1]])
     else:
-        origin_latitude['data'] = first_radar.latitude['data']
-        origin_longitude['data'] = first_radar.longitude['data']
+        origin_latitude["data"] = first_radar.latitude["data"][:1]
+        origin_longitude["data"] = first_radar.longitude["data"][:1]
 
-    origin_altitude = get_metadata('origin_altitude')
-    if 'grid_origin_alt' in kwargs:
-        origin_altitude['data'] = np.array([kwargs['grid_origin_alt']])
+    origin_altitude = get_metadata("origin_altitude")
+    if "grid_origin_alt" in kwargs:
+        origin_altitude["data"] = np.array([kwargs["grid_origin_alt"]])
     else:
-        origin_altitude['data'] = first_radar.altitude['data']
+        origin_altitude["data"] = first_radar.altitude["data"][:1]
 
     # metadata dictionary
     metadata = dict(first_radar.metadata)
 
     # create radar_ dictionaries
-    radar_latitude = get_metadata('radar_latitude')
-    radar_latitude['data'] = np.array(
-        [r.latitude['data'][0] for r in radars])
+    radar_latitude = get_metadata("radar_latitude")
+    radar_latitude["data"] = np.array([r.latitude["data"][0] for r in radars])
 
-    radar_longitude = get_metadata('radar_longitude')
-    radar_longitude['data'] = np.array(
-        [radar.longitude['data'][0] for radar in radars])
+    radar_longitude = get_metadata("radar_longitude")
+    radar_longitude["data"] = np.array([radar.longitude["data"][0] for radar in radars])
 
-    radar_altitude = get_metadata('radar_altitude')
-    radar_altitude['data'] = np.array(
-        [radar.altitude['data'][0] for radar in radars])
+    radar_altitude = get_metadata("radar_altitude")
+    radar_altitude["data"] = np.array([radar.altitude["data"][0] for radar in radars])
 
-    radar_time = get_metadata('radar_time')
+    radar_time = get_metadata("radar_time")
     times, units = _unify_times_for_radars(radars)
-    radar_time['units'] = units
-    radar_time['data'] = times
-
-    radar_name = get_metadata('radar_name')
-    name_key = 'instrument_name'
-    names = [radar.metadata[name_key] if name_key in radar.metadata else ''
-             for radar in radars]
-    radar_name['data'] = np.array(names)
-
-    projection = kwargs.pop('grid_projection', None)
+    radar_time["units"] = units
+    radar_time["data"] = times
+
+    radar_name = get_metadata("radar_name")
+    name_key = "instrument_name"
+    names = [
+        radar.metadata[name_key] if name_key in radar.metadata else ""
+        for radar in radars
+    ]
+    radar_name["data"] = np.array(names)
+
+    projection = kwargs.pop("grid_projection", None)
+
+    # Copies radar field dtypes to grid field dtypes if True.
+    if copy_field_dtypes:
+        for field in fields.keys():
+            if field == "ROI":
+                continue
+            dtype = first_radar.fields[field]["data"].dtype
+            fields[field]["data"] = fields[field]["data"].astype(dtype)
 
     return Grid(
-        time, fields, metadata,
-        origin_latitude, origin_longitude, origin_altitude, x, y, z,
-        radar_latitude=radar_latitude, radar_longitude=radar_longitude,
-        radar_altitude=radar_altitude, radar_name=radar_name,
-        radar_time=radar_time, projection=projection)
+        time,
+        fields,
+        metadata,
+        origin_latitude,
+        origin_longitude,
+        origin_altitude,
+        x,
+        y,
+        z,
+        radar_latitude=radar_latitude,
+        radar_longitude=radar_longitude,
+        radar_altitude=radar_altitude,
+        radar_name=radar_name,
+        radar_time=radar_time,
+        projection=projection,
+    )
 
 
 def _unify_times_for_radars(radars):
-    """ Return unified start times and units for a number of radars. """
-    dates = [netCDF4.num2date(radar.time['data'][0], radar.time['units'])
-             for radar in radars]
+    """Return unified start times and units for a number of radars."""
+    dates = [
+        netCDF4.num2date(radar.time["data"][0], radar.time["units"]) for radar in radars
+    ]
     units = make_time_unit_str(min(dates))
     times = netCDF4.date2num(dates, units)
     return times, units
@@ -226,14 +237,14 @@ class NNLocator:
 
     """
 
-    def __init__(self, data, leafsize=10, algorithm='kd_tree'):
-        """ initalize. """
+    def __init__(self, data, leafsize=10, algorithm="kd_tree"):
+        """initalize."""
         self._algorithm = algorithm
 
-        if algorithm == 'kd_tree':
+        if algorithm == "kd_tree":
             self.tree = cKDTree(data, leafsize=leafsize)
         else:
-            raise ValueError('invalid algorithm')
+            raise ValueError("invalid algorithm")
 
     def find_neighbors_and_dists(self, q, r):
         """
@@ -254,23 +265,40 @@ def find_neighbors_and_dists(self, q, r):
             Distances to the neighbors.
 
         """
-        if self._algorithm == 'kd_tree':
+        if self._algorithm == "kd_tree":
             ind = self.tree.query_ball_point(q, r)
-            if np.size(ind) == 0:
+            if len(ind) == 0:
                 return ind, 0
             dist = scipy.spatial.minkowski_distance(q, self.tree.data[ind])
 
             return ind, dist
 
 
-def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
-                grid_origin_alt=None, grid_projection=None,
-                fields=None, gatefilters=False,
-                map_roi=True, weighting_function='Barnes', toa=17000.0,
-                copy_field_data=True, algorithm='kd_tree', leafsize=10,
-                roi_func='dist_beam', constant_roi=None,
-                z_factor=0.05, xy_factor=0.02, min_radius=500.0,
-                h_factor=1.0, nb=1.5, bsp=1.0, **kwargs):
+def map_to_grid(
+    radars,
+    grid_shape,
+    grid_limits,
+    grid_origin=None,
+    grid_origin_alt=None,
+    grid_projection=None,
+    fields=None,
+    gatefilters=False,
+    map_roi=True,
+    weighting_function="Barnes2",
+    toa=17000.0,
+    copy_field_data=True,
+    algorithm="kd_tree",
+    leafsize=10,
+    roi_func="dist_beam",
+    constant_roi=None,
+    z_factor=0.05,
+    xy_factor=0.02,
+    min_radius=250.0,
+    h_factor=(1.0, 1.0, 1.0),
+    nb=1.0,
+    bsp=1.0,
+    **kwargs,
+):
     """
     Map one or more radars to a Cartesian grid.
 
@@ -297,7 +325,7 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
     grid_origin_alt: float or None
         Altitude of grid origin, in meters. None sets the origin
         to the location of the first radar.
-    grid_projection : dic or str
+    grid_projection : dict
         Projection parameters defining the map projection used to transform the
         locations of the radar gates in geographic coordinate to Cartesian
         coodinates. None will use the default dictionary which uses a native
@@ -367,8 +395,12 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
     h_factor, nb, bsp, min_radius : float
         Radius of influence parameters for the built in 'dist_beam' function.
         The parameter correspond to the height scaling, virtual beam width,
-        virtual beam spacing, and minimum radius of influence. These
-        parameters are only used when `roi_func` is 'dist_mean'.
+        virtual beam spacing, and minimum radius of influence.
+        NOTE: the default `min_radius` value is smaller for ARM SACR and SAPR
+        radars (those radars are operated at range resolution of 100 m or
+        higher).
+        to reflect their higher resolution relative to precipitation radars..
+        These parameters are only used when `roi_func` is 'dist_mean'.
     copy_field_data : bool
         True to copy the data within the radar fields for faster gridding,
         the dtype for all fields in the grid will be float64. False will not
@@ -404,7 +436,23 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
     """
     # make a tuple if passed a radar object as the first argument
     if isinstance(radars, Radar):
-        radars = (radars, )
+        radars = (radars,)
+
+    if len(radars) == 0:
+        raise ValueError("Length of radars tuple cannot be zero")
+
+    # set min_radius depending on whether processing ARM radars
+    try:
+        if "platform_id" in radars[0].metadata.keys():
+            if np.any(
+                [
+                    x in radars[0].metadata["platform_id"].lower()
+                    for x in ["sacr", "sapr"]
+                ]
+            ):
+                min_radius = 100.0
+    except AttributeError:
+        pass
 
     skip_transform = False
     if len(radars) == 1 and grid_origin_alt is None and grid_origin is None:
@@ -412,47 +460,41 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
 
     # parse the gatefilters argument
     if isinstance(gatefilters, GateFilter):
-        gatefilters = (gatefilters, )  # make tuple if single filter passed
+        gatefilters = (gatefilters,)  # make tuple if single filter passed
     if gatefilters is False:
-        gatefilters = (False, ) * len(radars)
+        gatefilters = (False,) * len(radars)
     if gatefilters is None:
-        gatefilters = (None, ) * len(radars)
+        gatefilters = (None,) * len(radars)
     if len(gatefilters) != len(radars):
-        raise ValueError('Length of gatefilters must match length of radars')
+        raise ValueError("Length of gatefilters must match length of radars")
 
     # check the parameters
-    if weighting_function.upper() not in [
-            'CRESSMAN', 'BARNES2', 'BARNES', 'NEAREST']:
-        raise ValueError('unknown weighting_function ' +
-                         weighting_function.upper())
-
-    if algorithm not in ['kd_tree']:
-        raise ValueError(f'unknown algorithm: {algorithm}')
-
-    leafsize = int(leafsize)
+    if weighting_function.upper() not in ["CRESSMAN", "BARNES2", "BARNES", "NEAREST"]:
+        raise ValueError("unknown weighting_function")
+    if algorithm not in ["kd_tree"]:
+        raise ValueError(f"unknown algorithm: {algorithm}")
     badval = get_fillvalue()
 
     # parse the grid_projection
     if grid_projection is None:
-        grid_projection = {
-            'proj': 'pyart_aeqd', '_include_lon_0_lat_0': True}
+        grid_projection = {"proj": "pyart_aeqd", "_include_lon_0_lat_0": True}
 
     # find the grid origin if not given
     if grid_origin is None:
         try:
-            lat = float(radars[0].latitude['data'])
-            lon = float(radars[0].longitude['data'])
+            lat = float(radars[0].latitude["data"])
+            lon = float(radars[0].longitude["data"])
         except TypeError:
-            lat = np.mean(radars[0].latitude['data'])
-            lon = np.mean(radars[0].longitude['data'])
+            lat = np.mean(radars[0].latitude["data"])
+            lon = np.mean(radars[0].longitude["data"])
         grid_origin = (lat, lon)
     grid_origin_lat, grid_origin_lon = grid_origin
 
     if grid_origin_alt is None:
         try:
-            grid_origin_alt = float(radars[0].altitude['data'])
+            grid_origin_alt = float(radars[0].altitude["data"])
         except TypeError:
-            grid_origin_alt = np.mean(radars[0].altitude['data'])
+            grid_origin_alt = np.mean(radars[0].altitude["data"])
 
     # fields which should be mapped, None for fields which are in all radars
     if fields is None:
@@ -464,16 +506,16 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
 
     # determine the number of gates (collected points) in each radar
     nradars = len(radars)
-    ngates_per_radar = [r.fields[fields[0]]['data'].size for r in radars]
+    ngates_per_radar = [r.fields[fields[0]]["data"].size for r in radars]
     total_gates = np.sum(ngates_per_radar)
     gate_offset = np.cumsum([0] + ngates_per_radar)
 
     # create arrays to hold the gate locations and indicators if the gate
     # should be included in the interpolation.
-    gate_locations = np.empty((total_gates, 3), dtype=np.float64)
-    include_gate = np.ones((total_gates), dtype=bool)
+    gate_locations = np.ma.empty((total_gates, 3), dtype=np.float64)
+    include_gate = np.ones((total_gates), dtype=np.bool_)
 
-    offsets = []    # offsets from the grid origin, in meters, for each radar
+    offsets = []  # offsets from the grid origin, in meters, for each radar
 
     # create a field lookup tables
     if copy_field_data:
@@ -486,49 +528,48 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
         # array pointing to the radar fields themselved, no copies are made.
         # A table mapping filtered gates to raw gates is created later.
         # Since the dtype is not not know this method is slow.
-        field_data_objs = np.empty((nfields, nradars), dtype='object')
+        field_data_objs = np.empty((nfields, nradars), dtype="object")
         # We also need to know how many gates from each radar are included
         # in the NNLocator, the filtered_gates_per_radar list records this
         filtered_gates_per_radar = []
 
     projparams = grid_projection.copy()
-    if projparams.pop('_include_lon_0_lat_0', False):
-        projparams['lon_0'] = grid_origin_lon
-        projparams['lat_0'] = grid_origin_lat
+    if projparams.pop("_include_lon_0_lat_0", False):
+        projparams["lon_0"] = grid_origin_lon
+        projparams["lat_0"] = grid_origin_lat
 
     # loop over the radars finding gate locations, field data, and offset
     for iradar, (radar, gatefilter) in enumerate(zip(radars, gatefilters)):
-
         # calculate radar offset from the origin
         x_disp, y_disp = geographic_to_cartesian(
-            radar.longitude['data'], radar.latitude['data'], projparams)
+            radar.longitude["data"], radar.latitude["data"], projparams
+        )
         try:
-            z_disp = float(radar.altitude['data']) - grid_origin_alt
+            z_disp = float(radar.altitude["data"]) - grid_origin_alt
             offsets.append((z_disp, float(y_disp), float(x_disp)))
         except TypeError:
-            z_disp = np.mean(radar.altitude['data']) - grid_origin_alt
+            z_disp = np.mean(radar.altitude["data"]) - grid_origin_alt
             offsets.append((z_disp, np.mean(y_disp), np.mean(x_disp)))
 
         # calculate cartesian locations of gates
         if skip_transform:
-            xg_loc = radar.gate_x['data']
-            yg_loc = radar.gate_y['data']
+            xg_loc = radar.gate_x["data"]
+            yg_loc = radar.gate_y["data"]
         else:
             xg_loc, yg_loc = geographic_to_cartesian(
-                radar.gate_longitude['data'], radar.gate_latitude['data'],
-                projparams)
-        zg_loc = radar.gate_altitude['data'] - grid_origin_alt
+                radar.gate_longitude["data"], radar.gate_latitude["data"], projparams
+            )
+        zg_loc = radar.gate_altitude["data"] - grid_origin_alt
 
         # add gate locations to gate_locations array
         start, end = gate_offset[iradar], gate_offset[iradar + 1]
-        gate_locations[start:end, 0] = zg_loc.flat[:]
-        gate_locations[start:end, 1] = yg_loc.flat[:]
-        gate_locations[start:end, 2] = xg_loc.flat[:]
-
+        gate_locations[start:end, 0] = zg_loc.flatten()
+        gate_locations[start:end, 1] = yg_loc.flatten()
+        gate_locations[start:end, 2] = xg_loc.flatten()
         del xg_loc, yg_loc
 
         # determine which gates should be included in the interpolation
-        gflags = zg_loc < toa      # include only those below toa
+        gflags = zg_loc < toa  # include only those below toa
 
         if gatefilter is not False:
             # excluded gates marked by the gatefilter
@@ -536,7 +577,7 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
                 gatefilter = moment_based_gate_filter(radar, **kwargs)
             gflags = np.logical_and(gflags, gatefilter.gate_included)
 
-        include_gate[start:end] = gflags.ravel()
+        include_gate[start:end] = gflags.flatten()
 
         if not copy_field_data:
             # record the number of gates from the current radar which
@@ -547,7 +588,7 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
 
         # copy/store references to field data for lookup
         for ifield, field in enumerate(fields):
-            flat_field_data = radar.fields[field]['data'].ravel()
+            flat_field_data = radar.fields[field]["data"].ravel()
             if copy_field_data:
                 field_data[start:end, ifield] = flat_field_data
             else:
@@ -578,11 +619,12 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
             l_start = filtered_gate_offset[i]
             l_end = filtered_gate_offset[i + 1]
             gates_before = gate_offset[i]
-            lookup[l_start:l_end] += (total_gates * i - gates_before)
+            lookup[l_start:l_end] += total_gates * i - gates_before
 
     # populate the nearest neighbor locator with the filtered gate locations
-    nnlocator = NNLocator(gate_locations[include_gate], algorithm=algorithm,
-                          leafsize=leafsize)
+    nnlocator = NNLocator(
+        gate_locations[include_gate], algorithm=algorithm, leafsize=leafsize
+    )
 
     # unpack the grid parameters
     nz, ny, nx = grid_shape
@@ -592,33 +634,31 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
     x_start, x_stop = xr
 
     if nz == 1:
-        z_step = 0.
+        z_step = 0.0
     else:
-        z_step = (z_stop - z_start) / (nz - 1.)
+        z_step = (z_stop - z_start) / (nz - 1.0)
     if ny == 1:
-        y_step = 0.
+        y_step = 0.0
     else:
-        y_step = (y_stop - y_start) / (ny - 1.)
+        y_step = (y_stop - y_start) / (ny - 1.0)
     if nx == 1:
-        x_step = 0.
+        x_step = 0.0
     else:
-        x_step = (x_stop - x_start) / (nx - 1.)
+        x_step = (x_stop - x_start) / (nx - 1.0)
 
-    if not hasattr(roi_func, '__call__'):
+    if not hasattr(roi_func, "__call__"):
         if constant_roi is not None:
-            roi_func = 'constant'
+            roi_func = "constant"
         else:
             constant_roi = 500.0
-        if roi_func == 'constant':
+        if roi_func == "constant":
             roi_func = _gen_roi_func_constant(constant_roi)
-        elif roi_func == 'dist':
-            roi_func = _gen_roi_func_dist(
-                z_factor, xy_factor, min_radius, offsets)
-        elif roi_func == 'dist_beam':
-            roi_func = _gen_roi_func_dist_beam(
-                h_factor, nb, bsp, min_radius, offsets)
+        elif roi_func == "dist":
+            roi_func = _gen_roi_func_dist(z_factor, xy_factor, min_radius, offsets)
+        elif roi_func == "dist_beam":
+            roi_func = _gen_roi_func_dist_beam(h_factor, nb, bsp, min_radius, offsets)
         else:
-            raise ValueError(f'unknown roi_func: {roi_func}')
+            raise ValueError(f"unknown roi_func: {roi_func}")
 
     # create array to hold interpolated grid data and roi if requested
     grid_data = np.ma.empty((nz, ny, nx, nfields), dtype=np.float64)
@@ -629,7 +669,6 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
 
     # interpolate field values for each point in the grid
     for iz, iy, ix in np.ndindex(nz, ny, nx):
-
         # calculate the grid point
         x = x_start + x_step * ix
         y = y_start + y_step * iy
@@ -641,7 +680,7 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
         # find neighbors and distances
         ind, dist = nnlocator.find_neighbors_and_dists((z, y, x), r)
 
-        if np.size(ind) == 0:
+        if len(ind) == 0:
             # when there are no neighbors, mark the grid point as bad
             grid_data[iz, iy, ix] = np.ma.masked
             grid_data.data[iz, iy, ix] = badval
@@ -661,33 +700,38 @@ def map_to_grid(radars, grid_shape, grid_limits, grid_origin=None,
             r_nums = r_nums.astype(np.intc)
             e_nums = e_nums.astype(np.intc)
             nn_field_data = np.empty((npoints, nfields), np.float64)
-            _load_nn_field_data(field_data_objs, nfields, npoints, r_nums,
-                                e_nums, nn_field_data)
+            _load_nn_field_data(
+                field_data_objs, nfields, npoints, r_nums, e_nums, nn_field_data
+            )
 
         # preforms weighting of neighbors.
         dist2 = dist * dist
         r2 = r * r
 
-        if weighting_function.upper() == 'NEAREST':
+        if weighting_function.upper() == "NEAREST":
             value = nn_field_data[np.argmin(dist2)]
         else:
-            if weighting_function.upper() == 'CRESSMAN':
+            if weighting_function.upper() == "CRESSMAN":
                 weights = (r2 - dist2) / (r2 + dist2)
-            elif weighting_function.upper() == 'BARNES':
-                warnings.warn("Barnes weighting function is deprecated."
-                              " Please use Barnes 2 to be consistent with"
-                              " Pauley and Wu 1990.", DeprecationWarning)
+            elif weighting_function.upper() == "BARNES":
+                warnings.warn(
+                    "Barnes weighting function is deprecated."
+                    " Please use Barnes 2 to be consistent with"
+                    " Pauley and Wu 1990. Default will be switched"
+                    " to Barnes2 on June 1st.",
+                    DeprecationWarning,
+                )
                 weights = np.exp(-dist2 / (2.0 * r2)) + 1e-5
-            elif weighting_function.upper() == 'BARNES2':
+            elif weighting_function.upper() == "BARNES2":
                 weights = np.exp(-dist2 / (r2 / 4)) + 1e-5
             value = np.ma.average(nn_field_data, weights=weights, axis=0)
 
         grid_data[iz, iy, ix] = value
 
     # create and return the grid dictionary
-    grids = dict([(f, grid_data[..., i]) for i, f in enumerate(fields)])
+    grids = {f: grid_data[..., i] for i, f in enumerate(fields)}
     if map_roi:
-        grids['ROI'] = roi
+        grids["ROI"] = roi
     return grids
 
 
@@ -709,7 +753,7 @@ def example_roi_func_constant(zg, yg, xg):
         Radius of influence in meters
     """
     # RoI function parameters
-    constant = 500.     # constant 500 meter RoI
+    constant = 500.0  # constant 500 meter RoI
     return constant
 
 
@@ -721,7 +765,7 @@ def _gen_roi_func_constant(constant_roi):
     """
 
     def roi(zg, yg, xg):
-        """ constant radius of influence function. """
+        """constant radius of influence function."""
         return constant_roi
 
     return roi
@@ -742,18 +786,20 @@ def example_roi_func_dist(zg, yg, xg):
 
     """
     # RoI function parameters
-    z_factor = 0.05         # increase in radius per meter increase in z dim
-    xy_factor = 0.02        # increase in radius per meter increase in xy dim
-    min_radius = 500.       # minimum radius
-    offsets = ((0, 0, 0), )  # z, y, x offset of grid in meters from radar(s)
+    z_factor = 0.05  # increase in radius per meter increase in z dim
+    xy_factor = 0.02  # increase in radius per meter increase in xy dim
+    min_radius = 500.0  # minimum radius
+    offsets = ((0, 0, 0),)  # z, y, x offset of grid in meters from radar(s)
 
     offsets = np.array(offsets)
     zg_off = offsets[:, 0]
     yg_off = offsets[:, 1]
     xg_off = offsets[:, 2]
-    r = np.maximum(z_factor * (zg - zg_off) +
-                   xy_factor * np.sqrt((xg - xg_off)**2 + (yg - yg_off)**2),
-                   min_radius)
+    r = np.maximum(
+        z_factor * (zg - zg_off)
+        + xy_factor * np.sqrt((xg - xg_off) ** 2 + (yg - yg_off) ** 2),
+        min_radius,
+    )
     return min(r)
 
 
@@ -769,11 +815,12 @@ def _gen_roi_func_dist(z_factor, xy_factor, min_radius, offsets):
     xg_off = offsets[:, 2]
 
     def roi(zg, yg, xg):
-        """ dist radius of influence function. """
+        """dist radius of influence function."""
         r = np.maximum(
-            z_factor * (zg - zg_off) +
-            xy_factor * np.sqrt((xg - xg_off)**2 + (yg - yg_off)**2),
-            min_radius)
+            z_factor * (zg - zg_off)
+            + xy_factor * np.sqrt((xg - xg_off) ** 2 + (yg - yg_off) ** 2),
+            min_radius,
+        )
         return min(r)
 
     return roi
@@ -795,20 +842,22 @@ def example_roi_func_dist_beam(zg, yg, xg):
 
     """
     # RoI function parameters
-    h_factor = 1.0      # height scaling
-    nb = 1.5            # virtual beam width
-    bsp = 1.0           # virtual beam spacing
-    min_radius = 500.   # minimum radius in meters
-    offsets = ((0, 0, 0), )  # z, y, x offset of grid in meters from radar(s)
+    h_factor = 1.0  # height scaling
+    nb = 1.5  # virtual beam width
+    bsp = 1.0  # virtual beam spacing
+    min_radius = 500.0  # minimum radius in meters
+    offsets = ((0, 0, 0),)  # z, y, x offset of grid in meters from radar(s)
 
     offsets = np.array(offsets)
     zg_off = offsets[:, 0]
     yg_off = offsets[:, 1]
     xg_off = offsets[:, 2]
     r = np.maximum(
-        h_factor * ((zg - zg_off) / 20.0) +
-        np.sqrt((yg - yg_off)**2 + (xg - xg_off)**2) *
-        np.tan(nb * bsp * np.pi / 180.0), min_radius)
+        h_factor * ((zg - zg_off) / 20.0)
+        + np.sqrt((yg - yg_off) ** 2 + (xg - xg_off) ** 2)
+        * np.tan(nb * bsp * np.pi / 180.0),
+        min_radius,
+    )
     return min(r)
 
 
@@ -825,11 +874,241 @@ def _gen_roi_func_dist_beam(h_factor, nb, bsp, min_radius, offsets):
     xg_off = offsets[:, 2]
 
     def roi(zg, yg, xg):
-        """ dist_beam radius of influence function. """
+        """dist_beam radius of influence function."""
         r = np.maximum(
-            h_factor * ((zg - zg_off) / 20.0) +
-            np.sqrt((yg - yg_off)**2 + (xg - xg_off)**2) *
-            np.tan(nb * bsp * np.pi / 180.0), min_radius)
+            h_factor * ((zg - zg_off) / 20.0)
+            + np.sqrt((yg - yg_off) ** 2 + (xg - xg_off) ** 2)
+            * np.tan(nb * bsp * np.pi / 180.0),
+            min_radius,
+        )
         return min(r)
 
     return roi
+
+
+def grid_ppi_sweeps(
+    radar,
+    target_sweeps=None,
+    grid_size=801,
+    grid_limits="auto",
+    max_z=12000.0,
+    el_rounding_frac=0.25,
+    add_grid_altitude=True,
+    **kwargs,
+):
+    """
+    Separately grid PPI sweeps to an X-Y plane considering only horizontal distances
+    in grid RoI and weighting function.
+    Gridding is performed using the `grid_from_radars` method, which receives any
+    additional input parameters.
+    Note that `h_factor` and `dist_factor` should not be included in kwargs (required
+    for valid gridding results)
+
+    Parameters
+    ----------
+    radar : Radar
+        Radar volume containing PPI sweeps.
+    target_sweeps : int or list
+        sweeps to grid. Using all sweeps in `radar` if None.
+    grid_size: int or 2-tuple
+        grid dimension size. Using sizes for the X-Y plane if tuple.
+        This input parameter is ignored if `grid_shape` is given
+        explicitly via kwargs.
+    grid_limits: 3-tuple with 2-tuple elements or 'auto'
+        if 'auto' using the maximum horizontal range rounded up to the nearest kilometer
+        and limiting vertically up to `max_z`.
+    max_z: float
+        maximum height to consider in gridding (only used if `grid_size` is 'auto')
+    el_rounding_frac: float
+        A fraction for rounding the elevation elements. This variables is also used to
+        represent the sweep for altitude estimation.
+    add_grid_altitude: bool
+        adding a sweep-dependent altitude estimate corresponding to the X-Y plane if True.
+        This output field is useful considering the slanted PPI scans.
+
+    Returns
+    -------
+    radar_ds : xarray.Dataset
+        Radar data gridded to the X-Y plane with a third dimension
+        representing the different sweep elevations.
+
+    """
+    if target_sweeps is None:
+        target_sweeps = radar.sweep_number["data"]
+    elif isinstance(target_sweeps, int):
+        target_sweeps = [target_sweeps]
+
+    # Set grid shape
+    if "grid_shape" not in kwargs.keys():
+        if isinstance(grid_size, int):
+            grid_shape = (1, grid_size, grid_size)
+        elif isinstance(grid_size, tuple):
+            grid_shape = (1, *grid_size)
+        else:
+            raise TypeError("'grid_shape' must be of type int or tuple")
+
+    # Set grid limits in 'auto' option
+    if isinstance(grid_limits, str):
+        if grid_limits == "auto":
+            max_xy = np.max(
+                [np.max(radar.get_gate_x_y_z(sweep=sw)[0]) for sw in target_sweeps]
+            )
+            max_xy = np.ceil(max_xy / 1e3) * 1e3
+            grid_limits = ((0.0, max_z), (-max_xy, max_xy), (-max_xy, max_xy))
+        else:
+            raise ValueError(f"Unknown 'grid_limits' processing string {grid_limits}")
+
+    # Calling the gridding method
+    radar_ds = None
+    for sweep in target_sweeps:
+        radar_sw = radar.extract_sweeps([sweep])
+        sweep_grid = grid_from_radars(
+            (radar_sw,),
+            grid_shape=grid_shape,
+            grid_limits=grid_limits,
+            h_factor=(0.0, 1.0, 1.0),
+            dist_factor=(0.0, 1.0, 1.0),
+            **kwargs,
+        )
+
+        # Convert to xarray.Dataset and finalize
+        el_round = (
+            np.mean(radar_sw.elevation["data"]) / el_rounding_frac
+        ).round() * el_rounding_frac
+        radar_ds_tmp = sweep_grid.to_xarray().squeeze()
+        if add_grid_altitude:
+            alt_est = (radar_ds_tmp["x"] ** 2 + radar_ds_tmp["y"] ** 2) ** 0.5 * np.tan(
+                el_round * np.pi / 180.0
+            )
+        radar_ds_tmp["altitude_est"] = xr.DataArray(
+            alt_est,
+            coords=radar_ds_tmp.coords,
+            dims=radar_ds_tmp.dims,
+            attrs={"long_name": "Estimated altitude in PPI scan", "units": "m"},
+        )
+        radar_ds_tmp = radar_ds_tmp.expand_dims(elevation=[el_round])
+        radar_ds_tmp["elevation"].attrs = {
+            "long_name": "Elevation angle",
+            "units": "deg",
+        }
+        if radar_ds is None:
+            radar_ds = radar_ds_tmp
+        else:
+            radar_ds = xr.concat((radar_ds, radar_ds_tmp), dim="elevation")
+
+    return radar_ds
+
+
+def grid_rhi_sweeps(
+    radar,
+    target_sweeps=None,
+    grid_size=801,
+    grid_limits="auto",
+    max_z=12000.0,
+    az_rounding_frac=0.25,
+    **kwargs,
+):
+    """
+    Separately grid RHI sweeps to a Y-Z plane considering only cross-sectional distances
+    in grid RoI and weighting function.
+    Gridding is performed using the `grid_from_radars` method, which receives any
+    additional input parameters.
+    Note that `h_factor` and `dist_factor` should not be included in kwargs (required
+    for valid gridding results)
+
+    Parameters
+    ----------
+    radar : Radar
+        Radar volume containing PPI sweeps.
+    target_sweeps : int or list
+        sweeps to grid. Using all sweeps in `radar` if None.
+    grid_size: int or 2-tuple
+        grid dimension size. Using sizes for the Y-Z plane if tuple.
+        This input parameter is ignored if `grid_shape` is given
+        explicitly via kwargs.
+    max_z: float
+        maximum height in grid (only used if `grid_size` is 'auto').
+    grid_limits: 3-tuple with 2-tuple elements or 'auto'
+        if 'auto' using the maximum horizontal range and limiting vertically up to 12 km.
+    az_rounding_frac: float
+        A fraction for rounding the azimuth elements.
+
+    Returns
+    -------
+    radar_ds : xarray.Dataset
+        Radar data gridded to the Y-Z plane with a third dimension
+        representing the different sweep azimuths.
+
+    """
+    if target_sweeps is None:
+        target_sweeps = radar.sweep_number["data"]
+    elif isinstance(target_sweeps, int):
+        target_sweeps = [target_sweeps]
+
+    # Set grid shape
+    if "grid_shape" not in kwargs.keys():
+        if isinstance(grid_size, int):
+            grid_shape = (grid_size, grid_size, 1)
+        elif isinstance(grid_size, tuple):
+            grid_shape = (*grid_size, 1)
+        else:
+            raise TypeError("'grid_shape' must be of type int or tuple")
+
+    # Set grid limits in 'auto' option
+    if isinstance(grid_limits, str):
+        if grid_limits == "auto":
+            max_xy = np.max(
+                [np.max(radar.get_gate_x_y_z(sweep=sw)[0]) for sw in target_sweeps]
+            )
+            max_xy = np.ceil(max_xy / 1e3) * 1e3
+            grid_limits = ((0.0, max_z), (-max_xy, max_xy), (-max_xy, max_xy))
+        else:
+            raise ValueError(f"Unknown 'grid_limits' processing string {grid_limits}")
+
+    # Calling the gridding method
+    radar_ds = None
+    for sweep in target_sweeps:
+        radar_sw = radar.extract_sweeps([sweep])
+        if (
+            np.max(radar_sw.azimuth["data"]) - np.min(radar_sw.azimuth["data"]) > 180.0
+        ):  # 0 or 180 deg sweep
+            if np.any(radar_sw.azimuth["data"] > 180.0):
+                diff_center = 180.0  # 0 to 360 deg
+            else:
+                diff_center = 0.0  # -180 to 180
+            az_round = (
+                np.abs(
+                    np.mean(
+                        radar_sw.azimuth["data"]
+                        - 360.0 * (radar_sw.azimuth["data"] > diff_center).astype(int)
+                    )
+                    / az_rounding_frac
+                ).round()
+                * az_rounding_frac
+            )
+        else:
+            az_round = (
+                np.mean(radar_sw.azimuth["data"]) / az_rounding_frac
+            ).round() * az_rounding_frac
+        radar_sw.azimuth[
+            "data"
+        ] -= az_round  # centering azimuth values to 0 to maximize grid range
+        sweep_grid = grid_from_radars(
+            (radar_sw,),
+            grid_shape=grid_shape,
+            grid_limits=grid_limits,
+            h_factor=(1.0, 1.0, 0.0),
+            dist_factor=(1.0, 1.0, 0.0),
+            **kwargs,
+        )
+
+        # Convert to xarray.Dataset and finalize
+        radar_ds_tmp = sweep_grid.to_xarray().squeeze()
+        radar_ds_tmp = radar_ds_tmp.expand_dims(azimuth=[az_round])
+        radar_ds_tmp["azimuth"].attrs = {"long_name": "Azimuth angle", "units": "deg"}
+        if radar_ds is None:
+            radar_ds = radar_ds_tmp
+        else:
+            radar_ds = xr.concat((radar_ds, radar_ds_tmp), dim="azimuth")
+
+    return radar_ds
diff --git a/pyart/retrieve/_gecsx_functions_cython.c b/pyart/retrieve/_gecsx_functions_cython.c
index 0150d3448..17d53a404 100644
--- a/pyart/retrieve/_gecsx_functions_cython.c
+++ b/pyart/retrieve/_gecsx_functions_cython.c
@@ -1565,7 +1565,7 @@ typedef struct {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1574,7 +1574,7 @@ typedef struct {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1583,7 +1583,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1592,7 +1592,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1601,7 +1601,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1610,7 +1610,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1619,7 +1619,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1628,7 +1628,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1637,7 +1637,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1646,7 +1646,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1655,7 +1655,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
  * ctypedef double complex complex128_t
  * 
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1664,7 +1664,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
  * 
  * ctypedef npy_longlong   longlong_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1673,7 +1673,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1682,7 +1682,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1691,7 +1691,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1700,7 +1700,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1709,7 +1709,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1767,7 +1767,7 @@ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_fro
 
 /*--- Type declarations ---*/
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
  * 
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil             # <<<<<<<<<<<<<<
@@ -1776,7 +1776,7 @@ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_fro
  */
 typedef int (*__pyx_t_5numpy_NpyIter_IterNextFunc)(NpyIter *);
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
  * # Iterator API added in v1.6
  * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil
  * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil             # <<<<<<<<<<<<<<
@@ -3131,7 +3131,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_codeobj__7 __pyx_mstate_global->__pyx_codeobj__7
 /* #### Code section: module_code ### */
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3142,7 +3142,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:
  *             return PyDataType_ELSIZE(self)             # <<<<<<<<<<<<<<
@@ -3152,7 +3152,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   __pyx_r = PyDataType_ELSIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
  * 
  *         @property
  *         cdef inline npy_intp itemsize(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3165,7 +3165,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3176,7 +3176,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:
  *             return PyDataType_ALIGNMENT(self)             # <<<<<<<<<<<<<<
@@ -3186,7 +3186,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
  * 
  *         @property
  *         cdef inline npy_intp alignment(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3199,7 +3199,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -3213,7 +3213,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("fields", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
  *         @property
  *         cdef inline object fields(self):
  *             return <object>PyDataType_FIELDS(self)             # <<<<<<<<<<<<<<
@@ -3226,7 +3226,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   __pyx_r = ((PyObject *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
  *         # for this using PyDataType_HASFIELDS.
  *         @property
  *         cdef inline object fields(self):             # <<<<<<<<<<<<<<
@@ -3241,7 +3241,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -3255,7 +3255,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   PyObject *__pyx_t_1;
   __Pyx_RefNannySetupContext("names", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
  *         @property
  *         cdef inline tuple names(self):
  *             return <tuple>PyDataType_NAMES(self)             # <<<<<<<<<<<<<<
@@ -3268,7 +3268,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   __pyx_r = ((PyObject*)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
  * 
  *         @property
  *         cdef inline tuple names(self):             # <<<<<<<<<<<<<<
@@ -3283,7 +3283,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3294,7 +3294,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr
 static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) {
   PyArray_ArrayDescr *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:
  *             return PyDataType_SUBARRAY(self)             # <<<<<<<<<<<<<<
@@ -3304,7 +3304,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   __pyx_r = PyDataType_SUBARRAY(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
  *         # this field via the inline helper method PyDataType_SHAPE.
  *         @property
  *         cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3317,7 +3317,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3328,7 +3328,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra
 static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) {
   npy_uint64 __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
  *         cdef inline npy_uint64 flags(self) noexcept nogil:
  *             """The data types flags."""
  *             return PyDataType_FLAGS(self)             # <<<<<<<<<<<<<<
@@ -3338,7 +3338,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   __pyx_r = PyDataType_FLAGS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
  * 
  *         @property
  *         cdef inline npy_uint64 flags(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3351,7 +3351,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3362,7 +3362,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
  *         cdef inline int numiter(self) noexcept nogil:
  *             """The number of arrays that need to be broadcast to the same shape."""
  *             return PyArray_MultiIter_NUMITER(self)             # <<<<<<<<<<<<<<
@@ -3372,7 +3372,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
  * 
  *         @property
  *         cdef inline int numiter(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3385,7 +3385,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3396,7 +3396,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
  *         cdef inline npy_intp size(self) noexcept nogil:
  *             """The total broadcasted size."""
  *             return PyArray_MultiIter_SIZE(self)             # <<<<<<<<<<<<<<
@@ -3406,7 +3406,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3419,7 +3419,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3430,7 +3430,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
  *         cdef inline npy_intp index(self) noexcept nogil:
  *             """The current (1-d) index into the broadcasted result."""
  *             return PyArray_MultiIter_INDEX(self)             # <<<<<<<<<<<<<<
@@ -3440,7 +3440,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
  * 
  *         @property
  *         cdef inline npy_intp index(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3453,7 +3453,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3464,7 +3464,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult
 static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
  *         cdef inline int nd(self) noexcept nogil:
  *             """The number of dimensions in the broadcasted result."""
  *             return PyArray_MultiIter_NDIM(self)             # <<<<<<<<<<<<<<
@@ -3474,7 +3474,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
  * 
  *         @property
  *         cdef inline int nd(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3487,7 +3487,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3498,7 +3498,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:
  *             """The shape of the broadcasted result."""
  *             return PyArray_MultiIter_DIMS(self)             # <<<<<<<<<<<<<<
@@ -3508,7 +3508,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
  * 
  *         @property
  *         cdef inline npy_intp* dimensions(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3521,7 +3521,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3532,7 +3532,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions
 static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) {
   void **__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
  *             """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
  *             On return, the iterators are adjusted for broadcasting."""
  *             return PyArray_MultiIter_ITERS(self)             # <<<<<<<<<<<<<<
@@ -3542,7 +3542,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
  * 
  *         @property
  *         cdef inline void** iters(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3555,7 +3555,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3566,7 +3566,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -3576,7 +3576,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
  * 
  *         @property
  *         cdef inline PyObject* base(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3589,7 +3589,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -3603,7 +3603,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -3616,7 +3616,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -3631,7 +3631,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3642,7 +3642,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -3652,7 +3652,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
  * 
  *         @property
  *         cdef inline int ndim(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3665,7 +3665,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3676,7 +3676,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -3686,7 +3686,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3699,7 +3699,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3710,7 +3710,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -3720,7 +3720,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3733,7 +3733,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3744,7 +3744,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -3754,7 +3754,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
  * 
  *         @property
  *         cdef inline npy_intp size(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3767,7 +3767,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3778,7 +3778,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -3788,7 +3788,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
  * 
  *         @property
  *         cdef inline char* data(self) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -3801,7 +3801,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -3818,7 +3818,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -3832,7 +3832,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
  * ctypedef long double complex clongdouble_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -3851,7 +3851,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -3868,7 +3868,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -3882,7 +3882,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -3901,7 +3901,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -3918,7 +3918,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -3932,7 +3932,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -3951,7 +3951,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -3968,7 +3968,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -3982,7 +3982,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -4001,7 +4001,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -4018,7 +4018,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -4032,7 +4032,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -4051,7 +4051,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -4066,7 +4066,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   PyObject *__pyx_t_2;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -4076,7 +4076,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -4089,7 +4089,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_t_2);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -4098,7 +4098,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -4112,7 +4112,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -4127,7 +4127,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -4141,7 +4141,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -4150,7 +4150,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
  * cdef inline void set_array_base(ndarray arr, object base) except *:
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -4159,7 +4159,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 1012, __pyx_L1_error)
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base) except *:             # <<<<<<<<<<<<<<
@@ -4174,7 +4174,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -4189,7 +4189,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -4198,7 +4198,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -4208,7 +4208,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -4219,7 +4219,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -4228,7 +4228,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -4240,7 +4240,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -4255,7 +4255,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -4279,7 +4279,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4295,7 +4295,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -4304,7 +4304,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1024, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4318,7 +4318,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -4333,7 +4333,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -4348,7 +4348,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4364,7 +4364,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -4387,7 +4387,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -4411,7 +4411,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4427,7 +4427,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -4436,7 +4436,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1030, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4450,7 +4450,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -4465,7 +4465,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -4480,7 +4480,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4496,7 +4496,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
  *         raise ImportError("numpy._core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -4519,7 +4519,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -4543,7 +4543,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4559,7 +4559,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -4568,7 +4568,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1036, __pyx_L3_error)
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4582,7 +4582,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -4597,7 +4597,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
+      /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -4612,7 +4612,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
+    /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -4628,7 +4628,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
  *         raise ImportError("numpy._core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -4651,7 +4651,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -4662,7 +4662,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -4672,7 +4672,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -4685,7 +4685,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -4696,7 +4696,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -4706,7 +4706,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj) noexcept:             # <<<<<<<<<<<<<<
@@ -4719,7 +4719,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4730,7 +4730,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -4740,7 +4740,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4753,7 +4753,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4764,7 +4764,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -4774,7 +4774,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4787,7 +4787,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+/* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -4798,7 +4798,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -4808,7 +4808,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:             # <<<<<<<<<<<<<<
@@ -5687,7 +5687,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy._core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -5698,7 +5698,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "../../../../../tmp/pip-build-env-ouln2xlt/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
+  /* "../../../../tmp/pip-build-env-tk5z5u6l/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy._core.umath failed to import")             # <<<<<<<<<<<<<<
diff --git a/pyart/retrieve/comp_z.py b/pyart/retrieve/comp_z.py
index c4e4a1423..8503bc6bc 100644
--- a/pyart/retrieve/comp_z.py
+++ b/pyart/retrieve/comp_z.py
@@ -8,7 +8,7 @@
 import numpy as np
 from netCDF4 import num2date
 from pandas import to_datetime
-from scipy.interpolate import RegularGridInterpolator
+from scipy.interpolate import RectBivariateSpline
 
 from pyart.core import Radar
 
@@ -103,10 +103,10 @@ def composite_reflectivity(radar, field="reflectivity", gatefilter=None):
 
         else:
             # Configure the intperpolator
-            z_interpolator = RegularGridInterpolator((ranges, az), z, kind="linear")
+            z_interpolator = RectBivariateSpline(az, ranges, z)
 
             # Apply the interpolation
-            z = z_interpolator(ranges, azimuth_final)
+            z = z_interpolator(azimuth_final, ranges)
 
         # if first sweep, create new dim, otherwise concat them up
         if sweep == minimum_sweep:
@@ -190,4 +190,4 @@ def composite_reflectivity(radar, field="reflectivity", gatefilter=None):
         azimuth,
         elevation,
         instrument_parameters=instrument_parameters,
-    )
+    )
\ No newline at end of file
diff --git a/pyart/xradar/__init__.py b/pyart/xradar/__init__.py
new file mode 100644
index 000000000..5c4d58d5d
--- /dev/null
+++ b/pyart/xradar/__init__.py
@@ -0,0 +1 @@
+from .accessor import Xradar, Xgrid  # noqa
diff --git a/pyart/xradar/accessor.py b/pyart/xradar/accessor.py
new file mode 100644
index 000000000..8a374c88a
--- /dev/null
+++ b/pyart/xradar/accessor.py
@@ -0,0 +1,790 @@
+"""
+Utilities for interfacing between xradar and Py-ART
+
+"""
+
+
+import copy
+
+import numpy as np
+import pandas as pd
+from datatree import DataTree, formatting, formatting_html
+from datatree.treenode import NodePath
+from xarray import DataArray, Dataset, concat
+from xarray.core import utils
+from xradar.util import get_sweep_keys
+
+from ..config import get_metadata
+from ..core.transforms import (
+    antenna_vectors_to_cartesian,
+    cartesian_to_geographic,
+    cartesian_vectors_to_geographic,
+)
+from ..lazydict import LazyLoadDict
+
+
+class Xgrid:
+    def __init__(self, grid_ds):
+        """
+        Wraps a Cf-compliant xarray Dataset into a PyART Grid Object.
+        Note that the times must not be decoded by xr.open_dataset when loading the file.
+
+        Parameters
+        ----------
+        grid_ds: xarray Dataset
+            The xarray Dataset to convert to a Py-ART grid.
+        """
+        if "units" not in list(grid_ds["time"].attrs.keys()):
+            raise RuntimeError(
+                "decode_times must be set to false when opening grid file!"
+            )
+        self.ds = grid_ds
+        self.time = dict(data=np.atleast_1d(self.ds["time"].values))
+        self.time.update(self.ds["time"].attrs)
+        self.fields = {}
+        self._find_fields()
+        self.origin_altitude = dict(
+            data=np.atleast_1d(self.ds["origin_altitude"].values)
+        )
+        self.origin_altitude.update(self.ds["origin_altitude"].attrs)
+        self.origin_latitude = dict(
+            data=np.atleast_1d(self.ds["origin_latitude"].values)
+        )
+        self.origin_latitude.update(self.ds["origin_latitude"].attrs)
+        self.origin_longitude = dict(
+            data=np.atleast_1d(self.ds["origin_longitude"].values)
+        )
+        self.origin_longitude.update(self.ds["origin_longitude"].attrs)
+        self.z = dict(data=np.atleast_1d(self.ds["z"].values))
+        self.z.update(self.ds["z"].attrs)
+        self.y = dict(data=np.atleast_1d(self.ds["y"].values))
+        self.y.update(self.ds["y"].attrs)
+        self.x = dict(data=np.atleast_1d(self.ds["x"].values))
+        self.x.update(self.ds["x"].attrs)
+        self.nradar = len(self.ds["nradar"].values)
+        self.radar_altitude = dict(data=np.atleast_1d(self.ds["radar_altitude"].values))
+        self.radar_altitude.update(self.ds["radar_altitude"].attrs)
+        self.radar_longitude = dict(
+            data=np.atleast_1d(self.ds["radar_longitude"].values)
+        )
+        self.radar_longitude.update(self.ds["radar_longitude"].attrs)
+        self.radar_latitude = dict(data=np.atleast_1d(self.ds["radar_latitude"].values))
+        self.radar_latitude.update(self.ds["radar_latitude"].attrs)
+        self.radar_time = dict(data=np.atleast_1d(self.ds["radar_time"].values))
+        self.radar_time.update(self.ds["radar_time"].attrs)
+        self.radar_name = dict(data=self.ds["radar_name"].values.astype("<U12"))
+        self.radar_name.update(self.ds["radar_name"].attrs)
+        self.projection = self.ds["projection"].attrs
+        if "_include_lon_0_lat_0" in list(self.projection.keys()):
+            if self.projection["_include_lon_0_lat_0"].lower() == "true":
+                self.projection["_include_lon_0_lat_0"] = True
+            else:
+                self.projection["_include_lon_0_lat_0"] = False
+
+        self.init_point_altitude()
+        self.init_point_longitude_latitude()
+        self.init_point_x_y_z()
+
+    def _find_fields(self):
+        for key in list(self.ds.variables.keys()):
+            if self.ds[key].dims == ("time", "z", "y", "x"):
+                self.fields[key] = {}
+                self.fields[key]["data"] = self.ds[key].values.squeeze()
+                self.fields[key].update(self.ds[key].attrs)
+
+    def get_projparams(self):
+        projparams = self.projection.copy()
+        if projparams.pop("_include_lon_0_lat_0", False):
+            projparams["lon_0"] = self.origin_longitude["data"][0]
+            projparams["lat_0"] = self.origin_latitude["data"][0]
+        return projparams
+
+    @property
+    def metadata(self):
+        return self.ds.attrs
+
+    @property
+    def ny(self):
+        return self.ds.sizes["y"]
+
+    @property
+    def nx(self):
+        return self.ds.sizes["x"]
+
+    @property
+    def nz(self):
+        return self.ds.sizes["z"]
+
+    # Attribute init/reset methods
+    def init_point_x_y_z(self):
+        """Initialize or reset the point_{x, y, z} attributes."""
+        self.point_x = LazyLoadDict(get_metadata("point_x"))
+        self.point_x.set_lazy("data", _point_data_factory(self, "x"))
+
+        self.point_y = LazyLoadDict(get_metadata("point_y"))
+        self.point_y.set_lazy("data", _point_data_factory(self, "y"))
+
+        self.point_z = LazyLoadDict(get_metadata("point_z"))
+        self.point_z.set_lazy("data", _point_data_factory(self, "z"))
+
+    def init_point_longitude_latitude(self):
+        """
+        Initialize or reset the point_{longitude, latitudes} attributes.
+        """
+        point_longitude = LazyLoadDict(get_metadata("point_longitude"))
+        point_longitude.set_lazy("data", _point_lon_lat_data_factory(self, 0))
+        self.point_longitude = point_longitude
+
+        point_latitude = LazyLoadDict(get_metadata("point_latitude"))
+        point_latitude.set_lazy("data", _point_lon_lat_data_factory(self, 1))
+        self.point_latitude = point_latitude
+
+    def init_point_altitude(self):
+        """Initialize the point_altitude attribute."""
+        point_altitude = LazyLoadDict(get_metadata("point_altitude"))
+        point_altitude.set_lazy("data", _point_altitude_data_factory(self))
+        self.point_altitude = point_altitude
+
+    def get_point_longitude_latitude(self, level=0, edges=False):
+        """
+        Return arrays of longitude and latitude for a given grid height level.
+
+        Parameters
+        ----------
+        level : int, optional
+            Grid height level at which to determine latitudes and longitudes.
+            This is not currently used as all height level have the same
+            layout.
+        edges : bool, optional
+            True to calculate the latitude and longitudes of the edges by
+            interpolating between Cartesian coordinates points and
+            extrapolating at the boundaries. False to calculate the locations
+            at the centers.
+
+        Returns
+        -------
+        longitude, latitude : 2D array
+            Arrays containing the latitude and longitudes, in degrees, of the
+            grid points or edges between grid points for the given height.
+
+        """
+        x = self.x["data"]
+        y = self.y["data"]
+        projparams = self.get_projparams()
+        return cartesian_vectors_to_geographic(x, y, projparams, edges=edges)
+
+    def add_field(self, field_name, dic, replace_existing=False):
+        """
+        Add a field to the object.
+
+        Parameters
+        ----------
+        field_name : str
+            Name of the field to add to the dictionary of fields.
+        dic : dict
+            Dictionary contain field data and metadata.
+        replace_existing : bool, optional
+            True to replace the existing field with key field_name if it
+            exists, loosing any existing data. False will raise a ValueError
+            when the field already exists.
+
+        """
+        # check that the field dictionary to add is valid
+        if field_name in self.fields and replace_existing is False:
+            err = f"A field with name: {field_name} already exists"
+            raise ValueError(err)
+        if "data" not in dic:
+            raise KeyError("dic must contain a 'data' key")
+        if dic["data"].shape != (self.nz, self.ny, self.nx):
+            t = (self.nz, self.ny, self.nx)
+            err = "'data' has invalid shape, should be (%i, %i)" % t
+            raise ValueError(err)
+        self.fields[field_name] = dic
+
+    def to_xarray(self):
+        """
+        Convert the Grid object to an xarray format.
+
+        Attributes
+        ----------
+        time : dict
+            Time of the grid.
+        fields : dict of dicts
+            Moments from radars or other variables.
+        longitude, latitude : dict, 2D
+            Arrays of latitude and longitude for the grid height level.
+        x, y, z : dict, 1D
+            Distance from the grid origin for each Cartesian coordinate axis
+            in a one dimensional array.
+
+        """
+
+        lon, lat = self.get_point_longitude_latitude()
+        z = self.z["data"]
+        y = self.y["data"]
+        x = self.x["data"]
+
+        time = self.ds.time.values
+
+        ds = Dataset()
+        for field in list(self.fields.keys()):
+            field_data = self.fields[field]["data"]
+            data = DataArray(
+                np.expand_dims(field_data, 0),
+                dims=("time", "z", "y", "x"),
+                coords={
+                    "time": (["time"], time),
+                    "z": (["z"], z),
+                    "lat": (["y", "x"], lat),
+                    "lon": (["y", "x"], lon),
+                    "y": (["y"], y),
+                    "x": (["x"], x),
+                },
+            )
+            for meta in list(self.fields[field].keys()):
+                if meta != "data":
+                    data.attrs.update({meta: self.fields[field][meta]})
+
+            ds[field] = data
+            ds.lon.attrs = [
+                ("long_name", "longitude of grid cell center"),
+                ("units", "degree_E"),
+                ("standard_name", "Longitude"),
+            ]
+            ds.lat.attrs = [
+                ("long_name", "latitude of grid cell center"),
+                ("units", "degree_N"),
+                ("standard_name", "Latitude"),
+            ]
+
+            ds.z.attrs = get_metadata("z")
+            ds.y.attrs = get_metadata("y")
+            ds.x.attrs = get_metadata("x")
+
+            ds.z.encoding["_FillValue"] = None
+            ds.lat.encoding["_FillValue"] = None
+            ds.lon.encoding["_FillValue"] = None
+            ds.close()
+        return ds
+
+
+class Xradar:
+    def __init__(self, xradar, default_sweep="sweep_0", scan_type=None):
+        self.xradar = xradar
+        self.scan_type = scan_type or "ppi"
+        self.sweep_group_names = get_sweep_keys(self.xradar)
+        self.nsweeps = len(self.sweep_group_names)
+        self.combined_sweeps = self._combine_sweeps()
+        self.fields = self._find_fields(self.combined_sweeps)
+        self.time = dict(
+            data=(self.combined_sweeps.time - self.combined_sweeps.time.min()).astype(
+                "int64"
+            )
+            / 1e9,
+            units=f"seconds since {pd.to_datetime(self.combined_sweeps.time.min().values).strftime('%Y-%m-%d %H:%M:%S.0')}",
+            calendar="gregorian",
+        )
+        self.range = dict(data=self.combined_sweeps.range.values)
+        self.azimuth = dict(data=self.combined_sweeps.azimuth.values)
+        self.elevation = dict(data=self.combined_sweeps.elevation.values)
+        self.fixed_angle = dict(data=self.combined_sweeps.sweep_fixed_angle.values)
+        self.antenna_transition = None
+        self.latitude = dict(
+            data=np.expand_dims(self.xradar["latitude"].values, axis=0)
+        )
+        self.longitude = dict(
+            data=np.expand_dims(self.xradar["longitude"].values, axis=0)
+        )
+        self.altitude = dict(
+            data=np.expand_dims(self.xradar["altitude"].values, axis=0)
+        )
+        self.sweep_end_ray_index = dict(
+            data=self.combined_sweeps.ngates.groupby("sweep_number").max().values
+        )
+        self.sweep_start_ray_index = dict(
+            data=self.combined_sweeps.ngates.groupby("sweep_number").min().values
+        )
+        self.metadata = dict(**self.xradar.attrs)
+        self.ngates = len(self.range["data"])
+        self.nrays = len(self.azimuth["data"])
+        self.instrument_parameters = self.find_instrument_parameters()
+        self.init_gate_x_y_z()
+        self.init_gate_alt()
+
+    def __repr__(self):
+        return formatting.datatree_repr(self.xradar)
+
+    def _repr_html_(self):
+        return formatting_html.datatree_repr(self.xradar)
+
+    def __getitem__(self: DataTree, key):
+        """
+        Access child nodes, variables, or coordinates stored anywhere in this tree.
+
+        Returned object will be either a DataTree or DataArray object depending on whether the key given points to a
+        child or variable.
+
+        Parameters
+        ----------
+        key : str
+            Name of variable / child within this node, or unix-like path to variable / child within another node.
+
+        Returns
+        -------
+        Union[DataTree, DataArray]
+        """
+
+        # Either:
+        if utils.is_dict_like(key):
+            # dict-like indexing
+            raise NotImplementedError("Should this index over whole tree?")
+        elif isinstance(key, str):
+            # path-like: a name of a node/variable, or path to a node/variable
+            path = NodePath(key)
+            return self.xradar._get_item(path)
+        elif utils.is_list_like(key):
+            # iterable of variable names
+            raise NotImplementedError(
+                "Selecting via tags is deprecated, and selecting multiple items should be "
+                "implemented via .subset"
+            )
+        else:
+            raise ValueError(f"Invalid format for key: {key}")
+
+        # Iterators
+
+    def find_instrument_parameters(self):
+        # By default, check the radar_parameters first
+        if "radar_parameters" in list(self.xradar.children):
+            radar_param_dict = self.xradar["radar_parameters"].ds.to_dict(data="array")
+            instrument_parameters = radar_param_dict["data_vars"]
+            instrument_parameters.update(radar_param_dict["attrs"])
+
+        else:
+            instrument_parameters = {}
+
+        # Check to see if the root dataset has this info
+        if len(self.xradar.ds) > 0:
+            root_param_dict = self.xradar.ds.to_dict(data="array")
+            instrument_parameters.update(root_param_dict["data_vars"])
+            instrument_parameters.update(root_param_dict["attrs"])
+
+        if len(instrument_parameters.keys()) > 0:
+            for field in instrument_parameters.keys():
+                field_dict = instrument_parameters[field]
+                if isinstance(field_dict, dict):
+                    if "attrs" in field_dict:
+                        for param in field_dict["attrs"]:
+                            field_dict[param] = field_dict["attrs"][param]
+                        del field_dict["attrs"]
+
+                    if "dims" in field_dict:
+                        del field_dict["dims"]
+                instrument_parameters[field] = field_dict
+
+        return instrument_parameters
+
+    def iter_start(self):
+        """Return an iterator over the sweep start indices."""
+        return (s for s in self.sweep_start_ray_index["data"])
+
+    def iter_end(self):
+        """Return an iterator over the sweep end indices."""
+        return (s for s in self.sweep_end_ray_index["data"])
+
+    def iter_start_end(self):
+        """Return an iterator over the sweep start and end indices."""
+        return ((s, e) for s, e in zip(self.iter_start(), self.iter_end()))
+
+    def iter_slice(self):
+        """Return an iterator which returns sweep slice objects."""
+        return (slice(s, e + 1) for s, e in self.iter_start_end())
+
+    def iter_field(self, field_name):
+        """Return an iterator which returns sweep field data."""
+        self.check_field_exists(field_name)
+        return (self.fields[field_name]["data"][s] for s in self.iter_slice())
+
+    def iter_azimuth(self):
+        """Return an iterator which returns sweep azimuth data."""
+        return (self.azimuth["data"][s] for s in self.iter_slice())
+
+    def iter_elevation(self):
+        """Return an iterator which returns sweep elevation data."""
+        return (self.elevation["data"][s] for s in self.iter_slice())
+
+    def add_field(self, field_name, dic, replace_existing=False):
+        """
+        Add a field to the object.
+
+        Parameters
+        ----------
+        field_name : str
+            Name of the field to add to the dictionary of fields.
+        dic : dict
+            Dictionary contain field data and metadata.
+        replace_existing : bool, optional
+            True to replace the existing field with key field_name if it
+            exists, loosing any existing data. False will raise a ValueError
+            when the field already exists.
+
+        """
+        # check that the field dictionary to add is valid
+        if field_name in self.fields and replace_existing is False:
+            err = f"A field with name: {field_name} already exists"
+            raise ValueError(err)
+        if "data" not in dic:
+            raise KeyError("dic must contain a 'data' key")
+        if dic["data"].shape != (self.nrays, self.ngates):
+            t = (self.nrays, self.ngates)
+            err = "'data' has invalid shape, should be (%i, %i)" % t
+            raise ValueError(err)
+        # add the field
+        self.fields[field_name] = dic
+        for sweep in range(self.nsweeps):
+            sweep_ds = (
+                self.xradar[f"sweep_{sweep}"].to_dataset().drop_duplicates("azimuth")
+            )
+            sweep_ds[field_name] = (
+                ("azimuth", "range"),
+                self.fields[field_name]["data"][self.get_slice(sweep)],
+            )
+            attrs = dic.copy()
+            del attrs["data"]
+            sweep_ds[field_name].attrs = attrs
+            self.xradar[f"sweep_{sweep}"].ds = sweep_ds
+        return
+
+    def get_field(self, sweep, field_name, copy=False):
+        """
+        Return the field data for a given sweep.
+
+        When used with :py:func:`get_gate_x_y_z` this method can be used to
+        obtain the data needed for plotting a radar field with the correct
+        spatial context.
+
+        Parameters
+        ----------
+        sweep : int
+            Sweep number to retrieve data for, 0 based.
+        field_name : str
+            Name of the field from which data should be retrieved.
+        copy : bool, optional
+            True to return a copy of the data. False, the default, returns
+            a view of the data (when possible), changing this data will
+            change the data in the underlying Radar object.
+
+        Returns
+        -------
+        data : array
+            Array containing data for the requested sweep and field.
+        """
+        self.check_field_exists(field_name)
+        s = self.get_slice(sweep)
+        data = self.fields[field_name]["data"][s]
+        if copy:
+            return data.copy()
+        else:
+            return data
+
+    def check_field_exists(self, field_name):
+        """
+        Check that a field exists in the fields dictionary.
+
+        If the field does not exist raise a KeyError.
+
+        Parameters
+        ----------
+        field_name : str
+            Name of field to check.
+
+        """
+        if field_name not in self.fields:
+            raise KeyError("Field not available: " + field_name)
+        return
+
+    def get_gate_x_y_z(self, sweep, edges=False, filter_transitions=False):
+        """
+        Return the x, y and z gate locations in meters for a given sweep.
+
+        With the default parameter this method returns the same data as
+        contained in the gate_x, gate_y and gate_z attributes but this method
+        performs the gate location calculations only for the specified sweep
+        and therefore is more efficient than accessing this data through these
+        attribute.
+
+        When used with :py:func:`get_field` this method can be used to obtain
+        the data needed for plotting a radar field with the correct spatial
+        context.
+
+        Parameters
+        ----------
+        sweep : int
+            Sweep number to retrieve gate locations from, 0 based.
+        edges : bool, optional
+            True to return the locations of the gate edges calculated by
+            interpolating between the range, azimuths and elevations.
+            False (the default) will return the locations of the gate centers
+            with no interpolation.
+        filter_transitions : bool, optional
+            True to remove rays where the antenna was in transition between
+            sweeps. False will include these rays. No rays will be removed
+            if the antenna_transition attribute is not available (set to None).
+
+        Returns
+        -------
+        x, y, z : 2D array
+            Array containing the x, y and z, distances from the radar in
+            meters for the center (or edges) for all gates in the sweep.
+
+        """
+        # Check to see if the data needs to be georeferenced
+        if "x" not in self.xradar[f"sweep_{sweep}"].coords:
+            self.combined_sweeps = self.combined_sweeps.xradar.georeference()
+
+        data = self.combined_sweeps.sel(sweep_number=sweep)
+        return data["x"].values, data["y"].values, data["z"].values
+
+    def init_gate_x_y_z(self):
+        """Initialize or reset the gate_{x, y, z} attributes."""
+
+        ranges = self.range["data"]
+        azimuths = self.azimuth["data"]
+        elevations = self.elevation["data"]
+        cartesian_coords = antenna_vectors_to_cartesian(
+            ranges, azimuths, elevations, edges=False
+        )
+
+        if not hasattr(self, "gate_x"):
+            self.gate_x = dict()
+
+        if not hasattr(self, "gate_y"):
+            self.gate_y = dict()
+
+        if not hasattr(self, "gate_z"):
+            self.gate_z = dict()
+
+        self.gate_x = dict(data=cartesian_coords[0])
+        self.gate_y = dict(data=cartesian_coords[1])
+        self.gate_z = dict(data=cartesian_coords[2])
+
+    def init_gate_alt(self):
+        if not hasattr(self, "gate_altitude"):
+            self.gate_altitude = dict()
+
+        try:
+            self.gate_altitude = dict(data=self.altitude["data"] + self.gate_z["data"])
+        except ValueError:
+            self.gate_altitude = dict(
+                data=np.mean(self.altitude["data"]) + self.gate_z["data"]
+            )
+
+    def _combine_sweeps(self):
+        # Loop through and extract the different datasets
+        ds_list = []
+        for sweep in self.sweep_group_names:
+            ds_list.append(self.xradar[sweep].ds.drop_duplicates("azimuth"))
+
+        # Merge based on the sweep number
+        merged = concat(ds_list, dim="sweep_number")
+
+        # Stack the sweep number and azimuth together
+        stacked = merged.stack(gates=["sweep_number", "azimuth"]).transpose()
+
+        # Drop the missing gates
+        cleaned = stacked.where(stacked.time == stacked.time.dropna("gates"))
+
+        # Add in number of gates variable
+        cleaned["ngates"] = ("gates", np.arange(len(cleaned.gates)))
+
+        # Return the non-missing times, ensuring valid data is returned
+        return cleaned
+
+    def add_filter(self, gatefilter, replace_existing=False, include_fields=None):
+        """
+        Updates the radar object with an applied gatefilter provided
+        by the user that masks values in fields within the radar object.
+
+        Parameters
+        ----------
+        gatefilter : GateFilter
+            GateFilter instance. This filter will exclude equal to
+            the conditions provided in the gatefilter and mask values
+            in fields specified or all fields if include_fields is None.
+        replace_existing : bool, optional
+            If True, replaces the fields in the radar object with
+            copies of those fields with the applied gatefilter.
+            False will return new fields with the appended 'filtered_'
+            prefix.
+        include_fields : list, optional
+            List of fields to have filtered applied to. If none, all
+            fields will have applied filter.
+
+        """
+        # If include_fields is None, sets list to all fields to include.
+        if include_fields is None:
+            include_fields = [*self.fields.keys()]
+
+        try:
+            # Replace current fields with masked versions with applied gatefilter.
+            if replace_existing:
+                for field in include_fields:
+                    self.fields[field]["data"] = np.ma.masked_where(
+                        gatefilter.gate_excluded, self.fields[field]["data"]
+                    )
+            # Add new fields with prefix 'filtered_'
+            else:
+                for field in include_fields:
+                    field_dict = copy.deepcopy(self.fields[field])
+                    field_dict["data"] = np.ma.masked_where(
+                        gatefilter.gate_excluded, field_dict["data"]
+                    )
+                    self.add_field(
+                        "filtered_" + field, field_dict, replace_existing=True
+                    )
+
+        # If fields don't match up throw an error.
+        except KeyError:
+            raise KeyError(
+                field + " not found in the original radar object, "
+                "please check that names in the include_fields list "
+                "match those in the radar object."
+            )
+        return
+
+    def get_nyquist_vel(self, sweep, check_uniform=True):
+        """
+        Return the Nyquist velocity in meters per second for a given sweep.
+
+        Raises a LookupError if the Nyquist velocity is not available, an
+        Exception is raised if the velocities are not uniform in the sweep
+        unless check_uniform is set to False.
+
+        Parameters
+        ----------
+        sweep : int
+            Sweep number to retrieve data for, 0 based.
+        check_uniform : bool
+            True to check to perform a check on the Nyquist velocities that
+            they are uniform in the sweep, False will skip this check and
+            return the velocity of the first ray in the sweep.
+
+        Returns
+        -------
+        nyquist_velocity : float
+            Array containing the Nyquist velocity in m/s for a given sweep.
+
+        """
+        s = self.get_slice(sweep)
+        try:
+            nyq_vel = self.instrument_parameters["nyquist_velocity"]["data"][s]
+        except TypeError:
+            raise LookupError("Nyquist velocity unavailable")
+        if check_uniform:
+            if np.any(nyq_vel != nyq_vel[0]):
+                raise Exception("Nyquist velocities are not uniform in sweep")
+        return float(nyq_vel[0])
+
+    def get_start(self, sweep):
+        """Return the starting ray index for a given sweep."""
+        return int(self.combined_sweeps.ngates.sel(sweep_number=sweep).min())
+
+    def get_end(self, sweep):
+        """Return the ending ray for a given sweep."""
+        return self.sweep_end_ray_index["data"][sweep]
+
+    def get_start_end(self, sweep):
+        """Return the starting and ending ray for a given sweep."""
+        return self.get_start(sweep), self.get_end(sweep)
+
+    def get_slice(self, sweep):
+        """Return a slice for selecting rays for a given sweep."""
+        start, end = self.get_start_end(sweep)
+        return slice(start, end + 1)
+
+    def _find_fields(self, ds):
+        fields = {}
+        for field in self.combined_sweeps.variables:
+            if self.combined_sweeps[field].dims == ("gates", "range"):
+                fields[field] = {
+                    "data": self.combined_sweeps[field].values,
+                    **self.combined_sweeps[field].attrs,
+                }
+        return fields
+
+    def get_azimuth(self, sweep, copy=False):
+        """
+        Return an array of azimuth angles for a given sweep.
+
+        Parameters
+        ----------
+        sweep : int
+            Sweep number to retrieve data for, 0 based.
+        copy : bool, optional
+            True to return a copy of the azimuths. False, the default, returns
+            a view of the azimuths (when possible), changing this data will
+            change the data in the underlying Radar object.
+
+        Returns
+        -------
+        azimuths : array
+            Array containing the azimuth angles for a given sweep.
+
+        """
+        s = self.get_slice(sweep)
+        azimuths = self.azimuth["data"][s]
+        if copy:
+            return azimuths.copy()
+        else:
+            return azimuths
+
+
+def _point_data_factory(grid, coordinate):
+    """Return a function which returns the locations of all points."""
+
+    def _point_data():
+        """The function which returns the locations of all points."""
+        reg_x = grid.x["data"]
+        reg_y = grid.y["data"]
+        reg_z = grid.z["data"]
+        if coordinate == "x":
+            return np.tile(reg_x, (len(reg_z), len(reg_y), 1)).swapaxes(2, 2)
+        elif coordinate == "y":
+            return np.tile(reg_y, (len(reg_z), len(reg_x), 1)).swapaxes(1, 2)
+        else:
+            assert coordinate == "z"
+            return np.tile(reg_z, (len(reg_x), len(reg_y), 1)).swapaxes(0, 2)
+
+    return _point_data
+
+
+def _point_lon_lat_data_factory(grid, coordinate):
+    """Return a function which returns the geographic locations of points."""
+
+    def _point_lon_lat_data():
+        """The function which returns the geographic point locations."""
+        x = grid.point_x["data"]
+        y = grid.point_y["data"]
+        projparams = grid.get_projparams()
+        geographic_coords = cartesian_to_geographic(x, y, projparams)
+        # Set point_latitude['data'] when point_longitude['data'] is evaluated
+        # and vice-versa.  This ensures that both attributes contain data from
+        # the same map projection and that the map projection only needs to be
+        # evaluated once.
+        if coordinate == 0:
+            grid.point_latitude["data"] = geographic_coords[1]
+        else:
+            grid.point_longitude["data"] = geographic_coords[0]
+        return geographic_coords[coordinate]
+
+    return _point_lon_lat_data
+
+
+def _point_altitude_data_factory(grid):
+    """Return a function which returns the point altitudes."""
+
+    def _point_altitude_data():
+        """The function which returns the point altitudes."""
+        return grid.origin_altitude["data"][0] + grid.point_z["data"]
+
+    return _point_altitude_data
diff --git a/tests/graph/test_cm.py b/tests/graph/test_cm.py
index 43cf4a650..562ef1a97 100644
--- a/tests/graph/test_cm.py
+++ b/tests/graph/test_cm.py
@@ -2,7 +2,6 @@
 
 
 import matplotlib
-import matplotlib.cm
 
 from pyart.graph import cm
 
@@ -13,10 +12,10 @@ def test_colormaps_exist():
 
 
 def test_colormaps_registered():
-    cmap = matplotlib.cm.get_cmap("pyart_NWSRef")
+    cmap = matplotlib.colormaps.get_cmap("pyart_NWSRef")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_NWSRef_r")
+    cmap = matplotlib.colormaps.get_cmap("pyart_NWSRef_r")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
 
diff --git a/tests/graph/test_cm_colorblind.py b/tests/graph/test_cm_colorblind.py
index cde75eb3c..5060ff014 100644
--- a/tests/graph/test_cm_colorblind.py
+++ b/tests/graph/test_cm_colorblind.py
@@ -2,7 +2,6 @@
 
 
 import matplotlib
-import matplotlib.cm
 
 from pyart.graph import cm_colorblind
 
@@ -19,26 +18,26 @@ def test_colormaps_exist():
 
 
 def test_colormaps_registered():
-    cmap = matplotlib.cm.get_cmap("pyart_HomeyerRainbow")
+    cmap = matplotlib.colormaps.get_cmap("pyart_HomeyerRainbow")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_HomeyerRainbow_r")
+    cmap = matplotlib.colormaps.get_cmap("pyart_HomeyerRainbow_r")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_balance")
+    cmap = matplotlib.colormaps.get_cmap("pyart_balance")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_balance_r")
+    cmap = matplotlib.colormaps.get_cmap("pyart_balance_r")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_ChaseSpectral")
+    cmap = matplotlib.colormaps.get_cmap("pyart_ChaseSpectral")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_ChaseSpectral_r")
+    cmap = matplotlib.colormaps.get_cmap("pyart_ChaseSpectral_r")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_SpectralExtended")
+    cmap = matplotlib.colormaps.get_cmap("pyart_SpectralExtended")
     assert isinstance(cmap, matplotlib.colors.Colormap)
 
-    cmap = matplotlib.cm.get_cmap("pyart_SpectralExtended_r")
+    cmap = matplotlib.colormaps.get_cmap("pyart_SpectralExtended_r")
     assert isinstance(cmap, matplotlib.colors.Colormap)
diff --git a/tests/graph/test_common.py b/tests/graph/test_common.py
index d5b1b9a5e..7cec01236 100644
--- a/tests/graph/test_common.py
+++ b/tests/graph/test_common.py
@@ -31,6 +31,11 @@ def test_parse_ax_fig():
     assert fig1 == fig2
 
 
+def test_parse_cmap():
+    assert common.parse_cmap("jet", "foo") == "jet"
+    assert common.parse_cmap(None, "reflectivity") == "pyart_NWSRef"
+
+
 def test_parse_vmin_vmax():
     radar = pyart.testing.make_empty_ppi_radar(1, 1, 1)
     radar.fields["foo"] = {}
diff --git a/tests/graph/test_gridmapdisplay.py b/tests/graph/test_gridmapdisplay.py
index 5cbe699e1..e5a479ba8 100644
--- a/tests/graph/test_gridmapdisplay.py
+++ b/tests/graph/test_gridmapdisplay.py
@@ -20,7 +20,7 @@ def test_gridmapdisplay_simple(outfile=None):
     display = pyart.graph.GridMapDisplay(grid)
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    display.plot_grid("reflectivity", vmin=-5, vmax=35, ax=ax)
+    display.plot_grid("reflectivity", level=0, vmin=-5, vmax=35, ax=ax)
     if outfile:
         fig.savefig(outfile)
 
@@ -40,6 +40,7 @@ def test_gridmapdisplay_fancy(outfile=None):
     ax1 = plt.subplot(331, projection=projection)
     display.plot_grid(
         "reflectivity",
+        level=0,
         vmin=-5.0,
         vmax=35.0,
         ax=ax1,
@@ -116,6 +117,21 @@ def test_error_raising():
     display.mappables.append(None)  # mock the mappable
     pytest.raises(ValueError, display.plot_colorbar)
 
+def test_gridmapdisplay_cross_section(outfile=None):
+    # test basic GridMapDisplay cross section functionality.
+    start = (34.8, -98.75)
+    end = (38.6, -96.45)
+    fig = plt.figure()
+    grid = pyart.testing.make_target_grid()
+    display = pyart.graph.GridMapDisplay(grid)
+    display.plot_cross_section(
+        "reflectivity", start, end, vmin=-5, vmax=35
+    )
+    try:
+        return fig
+    finally:
+        plt.close(fig)
+
 
 if __name__ == "__main__":
     test_gridmapdisplay_simple("figure_grid_mapdisplay_simple.png")
diff --git a/tests/graph/test_radarmapdisplay.py b/tests/graph/test_radarmapdisplay.py
index 21dd3987e..9a5680b77 100644
--- a/tests/graph/test_radarmapdisplay.py
+++ b/tests/graph/test_radarmapdisplay.py
@@ -46,13 +46,14 @@ def test_radarmapdisplay_cartopy_ppi(outfile=None):
 )
 def test_radarmapdisplay_cartopy_preexisting_ax(outfile=None):
     import cartopy
-    from cartopy.io.img_tiles import Stamen
+    from cartopy.io.img_tiles import GoogleTiles
 
     radar = pyart.io.read_cfradial(pyart.testing.CFRADIAL_PPI_FILE)
     display = pyart.graph.RadarMapDisplay(radar, shift=(0.1, 0.0))
     fig = plt.figure()
     ax = plt.axes(projection=cartopy.crs.PlateCarree())
-    ax.add_image(Stamen("terrain-background"), 6)
+    tiler = GoogleTiles(style="terrain")
+    ax.add_image(tiler, 6)
     display.plot_ppi_map("reflectivity_horizontal", 0, ax=ax, embellish=False)
     if outfile:
         fig.savefig(outfile)
diff --git a/tests/retrieve/test_comp_z.py b/tests/retrieve/test_comp_z.py
index 5f6426ecf..6eac559aa 100644
--- a/tests/retrieve/test_comp_z.py
+++ b/tests/retrieve/test_comp_z.py
@@ -3,7 +3,7 @@
 import copy
 
 import numpy as np
-from numpy.testing import assert_array_equal, assert_equal
+from numpy.testing import assert_array_almost_equal, assert_equal
 
 import pyart
 
@@ -85,7 +85,7 @@ def test_composite_z():
 
     # choose a random az
     random_az = np.random.randint(0, 720)
-    assert_array_equal(
+    assert_array_almost_equal(
         compz.fields["composite_reflectivity"]["data"][random_az, :],
         np.arange(0, z.shape[1]),
-    )
+    )
\ No newline at end of file
diff --git a/tests/xradar/test_accessor.py b/tests/xradar/test_accessor.py
new file mode 100644
index 000000000..a8250cfab
--- /dev/null
+++ b/tests/xradar/test_accessor.py
@@ -0,0 +1,156 @@
+import pyart
+import numpy as np
+import xarray as xr
+import xradar as xd
+from numpy.testing import assert_allclose, assert_almost_equal
+from open_radar_data import DATASETS
+
+
+filename = DATASETS.fetch("cfrad.20080604_002217_000_SPOL_v36_SUR.nc")
+
+
+def test_get_field(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    reflectivity = radar.get_field(0, "DBZ")
+    assert reflectivity.shape == (480, 996)
+
+
+def test_get_azimuth(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    azimuths = radar.get_azimuth(0)
+    assert azimuths.shape == (480,)
+
+
+def test_instrument_parameters(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    assert radar.instrument_parameters["instrument_name"] == "SPOLRVP8"
+    assert_allclose(
+        radar.instrument_parameters["latitude"]["data"], np.array(22.52669907)
+    )
+    assert_allclose(
+        radar.instrument_parameters["longitude"]["data"], np.array(120.4335022)
+    )
+
+
+def test_get_gate_x_y_z(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    x, y, z = radar.get_gate_x_y_z(0)
+    assert x.shape == (480, 996)
+    assert y.shape == (480, 996)
+    assert z.shape == (480, 996)
+
+
+def test_add_field(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    new_field = radar.fields["DBZ"]
+    radar.add_field("reflectivity", new_field)
+    assert "reflectivity" in radar.fields
+    assert radar["sweep_0"]["reflectivity"].shape == radar["sweep_0"]["DBZ"].shape
+
+
+def test_grid(filename=filename):
+    dtree = xd.io.open_cfradial1_datatree(
+        filename,
+        optional=False,
+    )
+    radar = pyart.xradar.Xradar(dtree)
+    grid = pyart.map.grid_from_radars(
+        (radar,),
+        grid_shape=(1, 11, 11),
+        grid_limits=((2000, 2000), (-100_000.0, 100_000.0), (-100_000.0, 100_000.0)),
+        fields=["DBZ"],
+    )
+    assert_allclose(grid.x["data"], np.arange(-100_000, 120_000, 20_000))
+    assert_allclose(grid.fields["DBZ"]["data"][0, -1, 0], np.array(-0.511), rtol=1e01)
+
+
+def _check_attrs_similar(grid1, grid2, attr):
+    print("Checking attribute:", attr)
+    dic1 = getattr(grid1, attr)
+    dic2 = getattr(grid2, attr)
+    _check_dicts_similar(dic1, dic2)
+
+
+def _check_dicts_similar(dic1, dic2):
+    for k, v in dic1.items():
+        print("Checking key:", k)
+        if k == "data":
+            assert_almost_equal(v, dic2[k])
+        else:
+            assert dic2[k] == v
+
+
+def test_grid_write_read():
+    # test the read_grid and write_grid function by performing a
+    # write/read roundtrip and comparing the two Grid objects
+    grid1 = pyart.testing.make_target_grid()
+    grid1.projection["comment"] = "This is a comment"
+    grid1.metadata["comment"] = "This is another comment"
+
+    with pyart.testing.InTemporaryDirectory():
+        tmpfile = "tmp_grid2.nc"
+        pyart.io.write_grid(tmpfile, grid1)
+        grid2 = xr.open_dataset(tmpfile, decode_times=False)
+        grid2 = pyart.xradar.Xgrid(grid2)
+
+        # check fields
+        for field in grid1.fields.keys():
+            _check_dicts_similar(grid1.fields[field], grid2.fields[field])
+
+        # check attributes
+        assert "Conventions" in grid2.metadata
+        grid2.metadata.pop("Conventions")
+        _check_attrs_similar(grid1, grid2, "metadata")
+
+        _check_attrs_similar(grid1, grid2, "time")
+
+        _check_attrs_similar(grid1, grid2, "origin_latitude")
+        _check_attrs_similar(grid1, grid2, "origin_longitude")
+        _check_attrs_similar(grid1, grid2, "origin_altitude")
+
+        _check_attrs_similar(grid1, grid2, "x")
+        _check_attrs_similar(grid1, grid2, "y")
+        _check_attrs_similar(grid1, grid2, "z")
+
+        _check_attrs_similar(grid1, grid2, "point_x")
+        _check_attrs_similar(grid1, grid2, "point_y")
+        _check_attrs_similar(grid1, grid2, "point_z")
+
+        _check_attrs_similar(grid1, grid2, "projection")
+        assert grid1.projection["_include_lon_0_lat_0"] is True
+
+        _check_attrs_similar(grid1, grid2, "point_latitude")
+        _check_attrs_similar(grid1, grid2, "point_longitude")
+        _check_attrs_similar(grid1, grid2, "point_altitude")
+
+        assert grid1.nx == grid2.nx
+        assert grid1.ny == grid2.ny
+        assert grid1.nz == grid2.nz
+
+        _check_attrs_similar(grid1, grid2, "radar_latitude")
+        _check_attrs_similar(grid1, grid2, "radar_longitude")
+        _check_attrs_similar(grid1, grid2, "radar_altitude")
+        _check_attrs_similar(grid1, grid2, "radar_time")
+        assert grid1.radar_name["data"] == grid2.radar_name["data"]
+        assert grid1.nradar == grid2.nradar
+        grid2.ds.close()