Commit ed88c5f1 authored by Pierre Paleo's avatar Pierre Paleo
Browse files

EDFTomoScan: Bugfix + distance in meters

parent c0b04ffd
...@@ -85,8 +85,10 @@ class EDFTomoScan(TomoScanBase): ...@@ -85,8 +85,10 @@ class EDFTomoScan(TomoScanBase):
self.__scan_range = None self.__scan_range = None
self._edf_n_frames = n_frames self._edf_n_frames = n_frames
self.__distance = None self.__distance = None
self.__energy = None
self.update() self.update()
@docstring(TomoScanBase.clear_caches) @docstring(TomoScanBase.clear_caches)
def clear_caches(self): def clear_caches(self):
self._darks = None self._darks = None
...@@ -422,7 +424,7 @@ class EDFTomoScan(TomoScanBase): ...@@ -422,7 +424,7 @@ class EDFTomoScan(TomoScanBase):
if self.__distance is None: if self.__distance is None:
return None return None
else: else:
return self.__distance return self.__distance * MetricSystem.MILLIMETER.value
@property @property
@docstring(TomoScanBase.energy) @docstring(TomoScanBase.energy)
...@@ -457,7 +459,7 @@ class EDFTomoScan(TomoScanBase): ...@@ -457,7 +459,7 @@ class EDFTomoScan(TomoScanBase):
# for now pixel size are stored in microns. # for now pixel size are stored in microns.
# We want to return them in meter # We want to return them in meter
if value is not None: if value is not None:
return value * MetricSystem.MICROMETER return value * MetricSystem.MICROMETER.value
else: else:
return None return None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment