Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tomotools
tomoscan
Commits
8d00feb7
Commit
8d00feb7
authored
Apr 30, 2021
by
payno
Browse files
Merge branch 'master' of
https://gitlab.esrf.fr/tomotools/tomoscan
into 0.5
parents
14b9d03f
66f9dfe6
Changes
4
Hide whitespace changes
Inline
Side-by-side
tomoscan/esrf/hdf5scan.py
View file @
8d00feb7
...
...
@@ -516,7 +516,7 @@ class HDF5TomoScan(TomoScanBase):
@
property
def
return_projs
(
self
)
->
typing
.
Union
[
None
,
list
]:
""""""
"""
"""
frames
=
self
.
frames
if
frames
:
return_frames
=
list
(
filter
(
lambda
x
:
x
.
is_control
==
True
,
frames
))
...
...
@@ -638,8 +638,9 @@ class HDF5TomoScan(TomoScanBase):
):
rotation_angle
=
self
.
rotation_angle
if
rotation_angle
is
not
None
:
dist_to180
=
abs
(
180
-
numpy
.
max
(
rotation_angle
))
dist_to360
=
abs
(
360
-
numpy
.
max
(
rotation_angle
))
angle_range
=
numpy
.
max
(
rotation_angle
)
-
numpy
.
min
(
rotation_angle
)
dist_to180
=
abs
(
180
-
angle_range
)
dist_to360
=
abs
(
360
-
angle_range
)
if
dist_to180
<
dist_to360
:
self
.
_scan_range
=
180
else
:
...
...
@@ -832,7 +833,7 @@ class HDF5TomoScan(TomoScanBase):
@
property
def
frames
(
self
)
->
typing
.
Union
[
None
,
tuple
]:
"""return tuple of frames. Frames contains
"""
"""return tuple of frames. Frames contains"""
if
self
.
_frames
is
None
:
image_keys
=
self
.
image_key
rotation_angles
=
self
.
rotation_angle
...
...
tomoscan/esrf/test/test_edfscan.py
View file @
8d00feb7
...
...
@@ -264,7 +264,7 @@ class TestOriDarksFlats(unittest.TestCase):
class
TestProjections
(
unittest
.
TestCase
):
"""Test that the
"""
"""Test that the"""
def
setUp
(
self
)
->
None
:
self
.
folder
=
tempfile
.
mkdtemp
()
...
...
tomoscan/esrf/test/test_hdf5scan.py
View file @
8d00feb7
...
...
@@ -65,7 +65,7 @@ class TestHDF5Scan(HDF5TestBaseClass):
self
.
scan
=
HDF5TomoScan
(
scan
=
self
.
dataset_file
)
def
testGeneral
(
self
):
"""some general on the HDF5Scan
"""
"""some general on the HDF5Scan"""
self
.
assertEqual
(
self
.
scan
.
master_file
,
self
.
dataset_file
)
self
.
assertEqual
(
self
.
scan
.
path
,
os
.
path
.
dirname
(
self
.
dataset_file
))
self
.
assertEqual
(
self
.
scan
.
type
,
"hdf5"
)
...
...
tomoscan/version.py
View file @
8d00feb7
...
...
@@ -76,7 +76,7 @@ RELEASE_LEVEL_VALUE = {
}
MAJOR
=
0
MINOR
=
5
MINOR
=
6
MICRO
=
0
RELEV
=
"final"
# <16
SERIAL
=
0
# <16
...
...
Write
Preview
Markdown
is supported
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