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
f6756865
Commit
f6756865
authored
May 27, 2021
by
Wout De Nolf
Browse files
ct: disable metadata when not saved
parent
cd0b92aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
bliss/common/scans/ct.py
View file @
f6756865
...
...
@@ -92,8 +92,6 @@ def ct(
scan_info
=
scan_info
,
)
s
.
_update_scan_info_with_scan_meta
=
lambda
_
:
None
if
run
:
s
.
run
()
...
...
bliss/scanning/scan.py
View file @
f6756865
...
...
@@ -617,7 +617,12 @@ class Scan:
self
.
root_node
=
None
self
.
_scan_connection
=
None
self
.
_shadow_scan_number
=
not
save
self
.
_add_to_scans_queue
=
not
(
name
==
"ct"
and
self
.
_shadow_scan_number
)
nonsaved_ct
=
False
if
scan_info
:
nonsaved_ct
=
scan_info
.
get
(
"type"
,
None
)
==
"ct"
and
not
save
self
.
_add_to_scans_queue
=
not
nonsaved_ct
self
.
_enable_scanmeta
=
not
nonsaved_ct
# Double buffer pipeline for streams store
if
self
.
_USE_PIPELINE_MGR
:
...
...
@@ -1431,16 +1436,24 @@ class Scan:
def
_metadata_of_user
(
self
,
meta_timing
):
"""Update scan_info with user scan metadata.
"""
if
not
self
.
_enable_scanmeta
:
return
self
.
_evaluate_scan_meta
(
self
.
_user_scan_meta
,
meta_timing
)
def
_metadata_of_nonacq_controllers
(
self
,
meta_timing
):
"""Update scan_info with controller scan metadata.
"""
if
not
self
.
_enable_scanmeta
:
return
self
.
_evaluate_scan_meta
(
self
.
_controllers_scan_meta
,
meta_timing
)
def
_metadata_of_acq_controllers
(
self
,
meta_timing
):
"""Update the controller Redis nodes with metadata.
"""
# Note: not sure why we disable the others but keep the
# metadata of the acquistion controllers.
# not self._enable_scanmeta:
# return
if
meta_timing
==
META_TIMING
.
START
:
method_name
=
"fill_meta_at_scan_start"
elif
meta_timing
==
META_TIMING
.
PREPARED
:
...
...
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