Access to AxisDouble vector and changes in intensitydata unittest

Core/PythonAPI/src/AxisBin.pypp.cpp

@@ -222,6 +222,15 @@ void register_AxisBin_class(){
                 , getSize_function_type(&::AxisBin::getSize)
                 , default_getSize_function_type(&AxisBin_wrapper::default_getSize) );
         
+        }
+        { //::AxisBin::getVector
+        
+            typedef ::std::vector< double > ( ::AxisBin::*getVector_function_type )(  ) const;
+            
+            AxisBin_exposer.def( 
+                "getVector"
+                , getVector_function_type( &::AxisBin::getVector ) );
+        
         }
         { //::AxisBin::initBins
         

Core/PythonAPI/src/AxisDouble.pypp.cpp

@@ -202,6 +202,15 @@ void register_AxisDouble_class(){
                 , getUpperBoundIndex_function_type( &::AxisDouble::getUpperBoundIndex )
                 , ( bp::arg("value") ) );
         
+        }
+        { //::AxisDouble::getVector
+        
+            typedef ::std::vector< double > ( ::AxisDouble::*getVector_function_type )(  ) const;
+            
+            AxisDouble_exposer.def( 
+                "getVector"
+                , getVector_function_type( &::AxisDouble::getVector ) );
+        
         }
         { //::AxisDouble::initElements
         

Core/Tools/inc/AxisBin.h

@@ -57,6 +57,10 @@ public:
 
 //    //! find the bin that contains the given value
 //    Bin1D findMatchingBin(double value) const;
+
+    //! returns vector containing the bin limits
+    std::vector<double> getVector() const { return m_value_vector; }
+
 protected:
     virtual bool equals(const IAxis& other) const;
 private:

Core/Tools/inc/AxisDouble.h

@@ -69,6 +69,9 @@ public:
     //! find the index that corresponds to the given upper bound (index is inclusive)
     size_t getUpperBoundIndex(double value) const;
 
+    //! returns vector containing the axis points
+    std::vector<double> getVector() const { return m_sample_vector; }
+
 protected:
     virtual bool equals(const IAxis& other) const;
 

Tests/FunctionalTests/TestPyCore/intensitydata.py

@@ -3,6 +3,7 @@
 import sys
 import os
 import unittest
+import numpy
 
 sys.path.append(os.path.abspath(
                 os.path.join(os.path.split(__file__)[0],
@@ -59,6 +60,17 @@ class IntensityDataTest(unittest.TestCase):
         self.assertEqual(0.0, data.getAxis(1).getMin())
         self.assertEqual(2.0, data.getAxis(1).getMax())
 
+        self.assertEqual(11, len(data.getAxis(0).getVector()))
+
+    def test_numpy_array(self):
+        data = IntensityData()
+        data.addAxis("axis0", 10, 0.0, 10.0)
+        data.addAxis("axis1", 20, 0.0, 20.0)
+        data.setAllTo(1)
+        arr = data.getArray()
+        self.assertEqual( (10,20), data.getArray().shape)
+        self.assertEqual( (data.totalSum()), numpy.sum(data.getArray()) )
+
 
 if __name__ == '__main__':
     unittest.main()