refs #6667 Added new parameter types to API-1

for old DGS reduction to work
mantidproject · Jul 10, 2013 · 19705bd · 19705bd
1 parent bb18353
commit 19705bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/PythonAPI/src/geometry_exports.cpp b/Code/Mantid/Framework/PythonAPI/src/geometry_exports.cpp
@@ -45,6 +45,9 @@ namespace Mantid
     BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getPositionParameter,Geometry::Component::getPositionParameter,1,2);
     BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getRotationParameter,Geometry::Component::getRotationParameter,1,2);
     BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getStringParameter,Geometry::Component::getStringParameter,1,2);
+    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getBoolParameter,Geometry::Component::getBoolParameter,1,2);
+    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getIntParameter,Geometry::Component::getIntParameter,1,2);
+    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterType,Geometry::Component::getParameterType,1,2);
 
     void export_components()
     {
@@ -124,6 +127,11 @@ namespace Mantid
         .def("getPositionParameter", &Geometry::Component::getPositionParameter, Component_getPositionParameter())
         .def("getRotationParameter", &Geometry::Component::getRotationParameter, Component_getRotationParameter())
         .def("getStringParameter", &Geometry::Component::getStringParameter, Component_getStringParameter())
+
+        .def("getBoolParameter", &Geometry::Component::getBoolParameter, Component_getBoolParameter())
+        .def("getIntParameter", &Geometry::Component::getIntParameter, Component_getIntParameter())
+        .def("getParameterType", &Geometry::Component::getParameterType, Component_getParameterType())
+
 
         ;
 

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
@@ -71,7 +71,7 @@ def get_bool_param(self, parname):
         try:
             self._self_check()
         except ValueError:
-            return default
+            return default            
 
         param = self.get_parameter(parname)
         if param < 0 :

diff --git a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py
@@ -238,6 +238,8 @@ def test_get_parameter(self):
         param = tReducer.get_default_parameter('background')
         self.assertTrue(isinstance(param,bool))
 
+        print "Instr_type :",type(tReducer.instrument)
+