Skip to content
GitLab
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
b606abf1
Commit
b606abf1
authored
Nov 26, 2020
by
payno
Browse files
Merge branch '0.4'
parents
752e2c66
0ae9589c
Pipeline
#37936
passed with stages
in 19 minutes and 34 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tomoscan/esrf/hdf5scan.py
View file @
b606abf1
...
...
@@ -268,6 +268,13 @@ class HDF5TomoScan(TomoScanBase):
if
"definition"
in
node
.
attrs
and
node
.
attrs
[
"definition"
].
lower
()
==
"nxtomo"
:
_logger
.
info
(
node
.
name
+
" is recognized as an NXtomo class."
)
return
True
elif
(
"instrument"
in
node
and
"NX_class"
in
node
[
"instrument"
].
attrs
and
node
[
"instrument"
].
attrs
[
"NX_class"
]
==
"NXinstrument"
):
instrument_node
=
node
[
"instrument"
]
return
"detector"
in
node
[
"instrument"
]
else
:
return
False
...
...
tomoscan/esrf/mock.py
View file @
b606abf1
...
...
@@ -129,7 +129,7 @@ class _ScanMock:
radius
=
min
(
background
.
shape
)
def
_compute_radius_to_center
(
data
):
assert
data
.
ndim
is
2
assert
data
.
ndim
==
2
xcenter
=
(
data
.
shape
[
2
])
//
2
ycenter
=
(
data
.
shape
[
1
])
//
2
y
,
x
=
numpy
.
ogrid
[:
data
.
shape
[
0
],
:
data
.
shape
[
1
]]
...
...
@@ -533,7 +533,7 @@ class MockEDF(_ScanMock):
S1
=
0.0
,
S2
=
1.0
,
):
assert
len
(
shape
)
is
3
assert
len
(
shape
)
==
3
f
=
open
(
filePath
,
"w"
)
f
.
writelines
(
"
\n
"
.
join
(
...
...
tomoscan/scanbase.py
View file @
b606abf1
...
...
@@ -414,7 +414,7 @@ class TomoScanBase:
"incoherent data information to retrieve"
"scan extra images angle"
)
elif
len
(
extraImgs
)
is
3
:
elif
len
(
extraImgs
)
==
3
:
res
[
"180(1)"
]
=
ordered_url
[
extraImgs
[
0
]]
res
[
"90(1)"
]
=
ordered_url
[
extraImgs
[
1
]]
res
[
"0(1)"
]
=
ordered_url
[
extraImgs
[
2
]]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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