cleanup

Author: arahlin

core/src/G3Vector.cxx

@@ -75,7 +75,7 @@ void G3Vector<int64_t>::save(A &ar, const unsigned v) const
 	}
 }
 
-template <typename V, typename T=typename V::value_type>
+template <typename T, typename V>
 auto vector_from_python(const py::array_t<T> &buf, bool contiguous=true) {
 	if (buf.ndim() != 1)
 		throw py::type_error("Only valid 1D buffers can be copied to a vector");
@@ -91,11 +91,6 @@ auto vector_from_python(const py::array_t<T> &buf, bool contiguous=true) {
 	return vec;
 }
 
-template <typename V>
-auto time_vector_from_python(const py::array &buf) {
-	return vector_from_python<V, G3TimeStamp>(buf, false);
-}
-
 template <typename V>
 auto vector_buffer_info(V &v) {
 	using T = typename V::value_type;
@@ -123,7 +118,9 @@ template <typename V, typename C, typename... Args>
 struct vector_buffer<G3Time, V, C, Args...> {
 	static void impl(C &cls) {
 		cls.def_buffer(&time_vector_buffer_info<V>);
-		cls.def(py::init(&time_vector_from_python<V>));
+		cls.def(py::init([](const py::array &v) {
+			return vector_from_python<G3TimeStamp, V>(v, false);
+		}), "Copy constructor from numpy array");
 		py::implicitly_convertible<py::buffer, V>();
 	}
 };
@@ -133,7 +130,8 @@ template <typename V, typename C, typename... Args> \
 struct vector_buffer<T, V, C, Args...> { \
 	static void impl(C &cls) { \
 		cls.def_buffer(&vector_buffer_info<V>); \
-		cls.def(py::init(&vector_from_python<V>)); \
+		cls.def(py::init([](const py::array &v) { \
+			return vector_from_python<T, V>(v, true); })); \
 		py::implicitly_convertible<py::buffer, V>(); \
 	} \
 }

maps/src/FlatSkyMap.cxx

@@ -810,21 +810,19 @@ flatskymap_fill(FlatSkyMap &skymap, const py::cbuffer &v)
 }
 
 static FlatSkyMapPtr
-flatskymap_from_numpy(const py::cbuffer &v, double res,
+flatskymap_from_numpy(const py::array &v, double res,
     bool weighted, MapProjection proj,
     double alpha_center, double delta_center,
     MapCoordReference coord_ref, G3Timestream::TimestreamUnits u,
     G3SkyMap::MapPolType pol_type, double x_res,
     double x_center, double y_center,
     bool flat_pol, G3SkyMap::MapPolConv pol_conv)
 {
-	auto info = v.request_contiguous();
-
-	if (info.ndim != 2)
+	if (v.ndim() != 2)
 		throw py::value_error("Only 2-D maps supported");
 
-	size_t ypix = info.shape[0];
-	size_t xpix = info.shape[1];
+	size_t ypix = v.shape(0);
+	size_t xpix = v.shape(1);
 
 	FlatSkyProjection proj_info(xpix, ypix, res, alpha_center,
 	    delta_center, x_res, proj, x_center, y_center);
@@ -838,7 +836,7 @@ flatskymap_from_numpy(const py::cbuffer &v, double res,
 }
 
 static FlatSkyMapPtr
-flatskymap_array_clone(const FlatSkyMap &m, const py::cbuffer &v)
+flatskymap_array_clone(const FlatSkyMap &m, const py::array &v)
 {
 	auto skymap = std::dynamic_pointer_cast<FlatSkyMap>(m.Clone(false));
 	flatskymap_fill(*skymap, v);