Exposing more methods to python

Author: peterfpeterson

Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp

@@ -11,6 +11,7 @@
 #include "MantidPythonInterface/core/Policies/RemoveConst.h"
 
 #include <boost/python/class.hpp>
+#include <boost/python/copy_const_reference.hpp>
 #include <boost/python/overloads.hpp>
 #include <boost/python/register_ptr_to_python.hpp>
 
@@ -74,6 +75,12 @@ void export_Instrument() {
            "Return the valid to :class:`~mantid.kernel.DateAndTime` of the "
            "instrument")
 
+      .def("getFilename", &Instrument::getFilename, arg("self"), return_value_policy<copy_const_reference>(),
+           "Return the name of the file that the original IDF was from")
+
+      .def("setFilename", &Instrument::setFilename, (arg("self"), arg("filename")),
+           "Return the name of the file that the original IDF was from")
+
       .def("getBaseInstrument", &Instrument::baseInstrument, arg("self"), return_value_policy<RemoveConstSharedPtr>(),
            "Return reference to the base instrument")
 

Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py

@@ -44,6 +44,20 @@ def test_getReferenceFrame(self):
         frame = self.__testws.getInstrument().getReferenceFrame()
         self.assertTrue(isinstance(frame, ReferenceFrame))
 
+    def test_getFilename(self):
+        inst = self.__testws.getInstrument()
+
+        # get the filename
+        NAME_ORIG = inst.getFilename()
+
+        # check that the filename can be set
+        NAME_NEW = "testable"
+        inst.setFilename(NAME_NEW)
+        self.assertEqual(inst.getFilename(), NAME_NEW)
+
+        # put the filename back to what it was
+        inst.setFilename(NAME_ORIG)
+
     def test_ValidDates(self):
         inst = self.__testws.getInstrument()
         valid_from = inst.getValidFromDate()

docs/source/release/v6.13.0/Framework/Python/New_features/.gitkeep

@@ -0,0 +1 @@
+- Exposed ``Instrument.getFilename()`` and ``Instrument.setFilename()`` to python