Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tomotools
tomoscan
Commits
5f840528
Commit
5f840528
authored
Feb 17, 2020
by
payno
Browse files
[EDFTomoScan] move get_pixel_size to private. User should use pixel_size instead
parent
900ce538
Changes
1
Hide whitespace changes
Inline
Side-by-side
tomoscan/esrf/edfscan.py
View file @
5f840528
...
...
@@ -116,7 +116,7 @@ class EDFTomoScan(TomoScanBase):
:rtype: float
"""
if
self
.
__pixel_size
is
None
:
self
.
__pixel_size
=
EDFTomoScan
.
get_pixel_size
(
scan
=
self
.
path
)
self
.
__pixel_size
=
EDFTomoScan
.
_
get_pixel_size
(
scan
=
self
.
path
)
return
self
.
__pixel_size
@
property
...
...
@@ -391,7 +391,7 @@ class EDFTomoScan(TomoScanBase):
return
d1
,
d2
@
staticmethod
def
get_pixel_size
(
scan
:
str
)
->
Union
[
None
,
int
]:
def
_
get_pixel_size
(
scan
:
str
)
->
Union
[
None
,
int
]:
if
os
.
path
.
isdir
(
scan
)
is
False
:
return
None
value
=
EDFTomoScan
.
retrieve_information
(
scan
=
scan
,
...
...
@@ -411,7 +411,7 @@ class EDFTomoScan(TomoScanBase):
# for now pixel size are stored in microns.
# We want to return them in meter
if
value
is
not
None
:
return
value
*
m
etric
s
ystem
.
micrometer
return
value
*
M
etric
S
ystem
.
MICROMETER
else
:
return
None
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment