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
Benoit Rousselle
bliss
Commits
a576bc07
Commit
a576bc07
authored
May 16, 2019
by
Linus Pithan
Committed by
Matias Guijarro
May 21, 2019
Browse files
make use of fill_meta in lima to save rois and acq. parameters in hdf5
parent
d0d8e83a
Changes
2
Hide whitespace changes
Inline
Side-by-side
bliss/controllers/lima/roi.py
View file @
a576bc07
...
...
@@ -36,6 +36,9 @@ class Roi(object):
def
__repr__
(
self
):
return
"<%s,%s> <%s x %s>"
%
(
self
.
x
,
self
.
y
,
self
.
width
,
self
.
height
)
def
to_dict
(
self
):
return
{
"x"
:
self
.
x
,
"y"
:
self
.
y
,
"width"
:
self
.
width
,
"height"
:
self
.
height
}
def
__eq__
(
self
,
other
):
return
self
.
p0
==
other
.
p0
and
self
.
p1
==
other
.
p1
and
self
.
name
==
other
.
name
...
...
bliss/scanning/acquisition/lima.py
View file @
a576bc07
...
...
@@ -314,3 +314,18 @@ class LimaAcquisitionMaster(AcquisitionMaster):
if
self
.
_reading_task
is
None
:
return
True
return
self
.
_reading_task
.
get
()
def
fill_meta_at_scan_end
(
self
,
scan_meta
):
scan_meta
.
instrument
.
set
(
self
,
{
self
.
name
:
{
"lima_parameters"
:
self
.
parameters
}}
)
def
fill_meta_at_scan_init
(
self
,
scan_meta
):
try
:
rois
=
dict
(
self
.
channels
[
0
].
acq_device
.
master_controller
.
roi_counters
)
roi_counters
=
dict
()
for
roi_name
,
roi
in
rois
.
items
():
roi_counters
[
roi_name
]
=
roi
.
to_dict
()
scan_meta
.
instrument
.
set
(
self
,
{
self
.
name
:
{
"roi_counters"
:
roi_counters
}})
except
Exception
:
pass
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