Refs #629 SampleLogs.get_pointlist creates point lists in units of mi…

…li-meters

Signed-off-by: Jose Borreguero <[email protected]>

pyrs/dataobjects/sample_logs.py

@@ -497,6 +497,9 @@ def get_pointlist(self, subruns=None) -> 'PointList':
         r"""
         Create a ~pyrs.dataobjects.sample_logs.PointList instance from the vx, vy, and vz logs
 
+        Units are converted to mili-meters, if the logs are in meters. If the logs lack units, it's
+        assumed units are mili-meters
+
         Parameters
         ----------
         subruns: int, list, np.ndarray, ~pyrs.dataobjects.sample_logs.SubRuns
@@ -522,9 +525,12 @@ def get_pointlist(self, subruns=None) -> 'PointList':
         if missing:
             raise ValueError('Failed to find positions in logs. Missing {}'.format(', '.join(missing)))
 
+        # Check the units are in mili meters
+        factor = 1000.0 if self._units.get(VX, 'mm') == 'm' else 1.0
+
         # create a PointList on the fly
         # passing the subruns down allow for slicing/selecting
-        return PointList([self[VX, subruns], self[VY, subruns], self[VZ, subruns]])
+        return PointList([factor * self[vi, subruns] for vi in (VX, VY, VZ)])
 
 
 class _DirectionExtents(NamedTuple):

tests/unit/pyrs/dataobjects/test_sample_logs.py

@@ -115,6 +115,13 @@ def test_get_pointlist(self):
         np.testing.assert_equal(pointlist.vy, [0, 2, 3])
         np.testing.assert_equal(pointlist.vz, [0, 2, 3])
 
+        # check unit conversion
+        sample['vx', 'm'] = np.arange(5, dtype=float)
+        sample['vy', 'm'] = np.arange(5, dtype=float)
+        sample['vz', 'm'] = np.arange(5, dtype=float)
+        pointlist = sample.get_pointlist()
+        np.testing.assert_allclose(pointlist.vx, 1000 * np.arange(5, dtype=float), atol=0.1)
+
 
 class TestDirectionExtents: