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
Bliss
bliss
Commits
3f2ced0b
Commit
3f2ced0b
authored
May 10, 2021
by
Valentin Valls
Browse files
Fix writer tests
parent
6292cb27
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/nexus_writer/helpers/nxw_test_data.py
View file @
3f2ced0b
...
...
@@ -1131,6 +1131,8 @@ def expected_detector_content(name, config=True, save_images=True):
datasets
=
{
"type"
,
"data"
,
"acq_parameters"
,
"ctrl_parameters"
}
else
:
datasets
=
{
"type"
,
"acq_parameters"
,
"ctrl_parameters"
}
elif
name
.
startswith
(
"simu1_"
)
or
name
.
startswith
(
"simu2_"
):
datasets
=
{
"data"
,
"type"
}
else
:
datasets
=
{
"data"
}
else
:
...
...
@@ -1145,20 +1147,34 @@ def expected_detector_content(name, config=True, save_images=True):
datasets
=
{
"data"
}
else
:
if
save_images
:
datasets
=
{
"data"
,
"acq_parameters"
,
"ctrl_parameters"
}
datasets
=
{
"data"
,
"acq_parameters"
,
"ctrl_parameters"
,
"type"
}
else
:
datasets
=
{
"acq_parameters"
,
"ctrl_parameters"
}
datasets
=
{
"acq_parameters"
,
"ctrl_parameters"
,
"type"
}
elif
name
==
"image"
:
if
save_images
:
datasets
=
{
"data"
,
"acq_parameters"
,
"ctrl_parameters"
}
datasets
=
{
"data"
,
"acq_parameters"
,
"ctrl_parameters"
,
"type"
}
else
:
datasets
=
{
"acq_parameters"
,
"ctrl_parameters"
}
datasets
=
{
"acq_parameters"
,
"ctrl_parameters"
,
"type"
}
elif
re
.
match
(
"roi[1-3]_(sum|avg|std|min|max)"
,
name
):
datasets
=
{
"data"
,
"roi1"
,
"roi2"
,
"roi3"
}
elif
name
==
"roi4"
:
datasets
=
{
"data"
,
"roi4"
}
elif
name
==
"roi_collection_counter"
:
datasets
=
{
"data"
,
"roi_collection_counter"
}
elif
re
.
match
(
"roi[1-3]"
,
name
):
# Lima
datasets
=
{
"data"
,
"type"
}
elif
name
.
startswith
(
"simu1_"
)
or
name
.
startswith
(
"simu2_"
):
# MCAs
datasets
=
{
"data"
,
"type"
}
elif
(
name
.
endswith
(
"_det0"
)
or
name
.
endswith
(
"_det1"
)
or
name
.
endswith
(
"_det2"
)
or
name
.
endswith
(
"_det3"
)
):
# MCAs
datasets
=
{
"data"
,
"type"
}
else
:
datasets
=
{
"data"
}
return
datasets
...
...
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