remove now-pointless to_g3frameobject function

CMB-S4 · Feb 29, 2024 · d7b9535 · d7b9535
1 parent 8ae8b39
commit d7b9535
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/core/include/core/pybindings.h b/core/include/core/pybindings.h
@@ -353,9 +353,6 @@ class G3ModuleRegistrator {
 	    .def(boost::python::init<const T &>()) \
 	    .def_pickle(g3frameobject_picklesuite<T>())
 
-G3FrameObjectPtr
-to_g3frameobject(boost::python::object obj);
-
 // Declare a python module with a name and the name of its enclosing package scope.
 // name should be be a bare token, while pkg should be a string literal, e.g.:
 //     SPT3G_PYTHON_MODULE_2(foo, "spt3g.bar")

diff --git a/core/src/python.cxx b/core/src/python.cxx
@@ -154,31 +154,22 @@ boost::python::list g3frame_keys(const G3Frame &map)
         return keys;
 }
 
-G3FrameObjectPtr to_g3frameobject(bp::object obj)
+static void g3frame_python_put(G3Frame &f, std::string name, bp::object obj)
 {
-	G3FrameObjectPtr fo;
-
 	if (bp::extract<G3FrameObjectPtr>(obj).check())
-		fo = bp::extract<G3FrameObjectPtr>(obj)();
+		f.Put(name, bp::extract<G3FrameObjectPtr>(obj)());
 	else if (PyBool_Check(obj.ptr()))
-		fo = boost::make_shared<G3Bool>(bp::extract<bool>(obj)());
+		f.Put(name, boost::make_shared<G3Bool>(bp::extract<bool>(obj)()));
 	else if (bp::extract<int64_t>(obj).check())
-		fo = boost::make_shared<G3Int>(bp::extract<int64_t>(obj)());
+		f.Put(name, boost::make_shared<G3Int>(bp::extract<int64_t>(obj)()));
 	else if (bp::extract<double>(obj).check())
-		fo = boost::make_shared<G3Double>(bp::extract<double>(obj)());
+		f.Put(name, boost::make_shared<G3Double>(bp::extract<double>(obj)()));
 	else if (bp::extract<std::string>(obj).check())
-		fo = boost::make_shared<G3String>(bp::extract<std::string>(obj)());
+		f.Put(name, boost::make_shared<G3String>(bp::extract<std::string>(obj)()));
 	else {
 		PyErr_SetString(PyExc_TypeError, "Object is not a G3FrameObject derivative or a plain-old-data type");
 		bp::throw_error_already_set();
 	}
-
-	return fo;
-}
-
-static void g3frame_python_put(G3Frame &f, std::string name, bp::object obj)
-{
-	f.Put(name, to_g3frameobject(obj));
 }
 
 static bp::object g3frame_python_get(G3Frame &f, std::string name)
@@ -548,10 +539,6 @@ SPT3G_PYTHON_MODULE(core)
 	register_vector_of<G3FramePtr>("Frame");
 	register_vector_of<G3FrameObjectPtr>("FrameObject");
 
-	bp::def("to_g3frameobject", to_g3frameobject,
-	  "Convert the input argument to a G3FrameObject.  Raises a TypeError "
-	  "if the object cannot be converted.");
-
 	bp::class_<G3ModuleWrap, boost::shared_ptr<G3ModuleWrap>,
 	  boost::noncopyable>("G3Module", "Base class for functors that can be "
 	  "added to a G3Pipeline.")