Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ewoksdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
workflow
ewoksapps
ewoksdata
Commits
13f73a29
Commit
13f73a29
authored
11 months ago
by
Wout De Nolf
Browse files
Options
Downloads
Patches
Plain Diff
fix lima iteration from memory
parent
75b38627
No related branches found
No related tags found
1 merge request
!76
Resolve "iter_bliss_scan_data_from_memory yields many lima arrays if counter_names is empty"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ewoksdata/data/blissdata/blissdatav1.py
+26
-19
26 additions, 19 deletions
src/ewoksdata/data/blissdata/blissdatav1.py
src/ewoksdata/data/blissdata/blissdatavid31.py
+25
-17
25 additions, 17 deletions
src/ewoksdata/data/blissdata/blissdatavid31.py
with
51 additions
and
36 deletions
src/ewoksdata/data/blissdata/blissdatav1.py
+
26
−
19
View file @
13f73a29
from
numbers
import
Number
from
collections
import
Counter
from
typing
import
List
,
Optional
from
numpy.typing
import
ArrayLike
...
...
@@ -44,32 +45,38 @@ def iter_bliss_scan_data_from_memory(
counter_streams
[
name
]
=
stream
client
=
StreamingClient
({
**
lima_streams
,
**
counter_streams
})
lima_buffer_count
=
Counter
()
while
True
:
try
:
output
=
client
.
read
()
except
EndOfStream
:
break
else
:
for
stream
,
data
in
output
.
items
():
_
,
payload
=
data
# drop index
if
stream
.
name
in
lima_streams
:
lima_client
=
lima_clients
[
stream
.
name
]
prev_len
=
len
(
lima_client
)
lima_client
.
update
(
**
payload
[
-
1
])
try
:
data
=
lima_client
[
prev_len
-
1
:]
except
IndexNoMoreThereError
:
continue
buffers
[
stream
.
name
.
split
(
"
:
"
)[
-
2
]].
extend
(
data
)
else
:
buffers
[
stream
.
name
.
split
(
"
:
"
)[
-
1
]].
extend
(
payload
)
for
stream
,
(
_
,
payload
)
in
output
.
items
():
name_parts
=
stream
.
name
.
split
(
"
:
"
)
if
stream
.
name
in
lima_streams
:
# payload is a sequence of JSON statuses
ctr_name
=
name_parts
[
-
2
]
last_status
=
payload
[
-
1
]
lima_client
=
lima_clients
[
stream
.
name
]
lima_client
.
update
(
**
last_status
)
n_already_read
=
lima_buffer_count
[
ctr_name
]
try
:
data
=
lima_client
[
n_already_read
:]
except
IndexNoMoreThereError
:
continue
buffers
[
ctr_name
].
extend
(
data
)
lima_buffer_count
[
ctr_name
]
+=
len
(
data
)
else
:
# payload is a sequence of data points (0D, 1D, 2D)
ctr_name
=
name_parts
[
-
1
]
buffers
[
ctr_name
].
extend
(
payload
)
nyield
=
min
(
len
(
v
)
for
v
in
buffers
.
values
())
if
nyield
:
for
i
in
range
(
nyield
):
yield
{
name
:
values
[
i
]
for
name
,
values
in
buffers
.
items
()}
buffers
=
{
name
:
values
[
nyield
:]
for
name
,
values
in
buffers
.
items
()}
nyield
=
min
(
len
(
v
)
for
v
in
buffers
.
values
())
if
nyield
:
for
i
in
range
(
nyield
):
yield
{
name
:
values
[
i
]
for
name
,
values
in
buffers
.
items
()}
buffers
=
{
name
:
values
[
nyield
:]
for
name
,
values
in
buffers
.
items
()}
def
last_lima_image
(
channel_info
:
dict
)
->
ArrayLike
:
...
...
This diff is collapsed.
Click to expand it.
src/ewoksdata/data/blissdata/blissdatavid31.py
+
25
−
17
View file @
13f73a29
from
numbers
import
Number
from
collections
import
Counter
from
typing
import
List
,
Optional
from
numpy.typing
import
ArrayLike
...
...
@@ -35,39 +36,46 @@ def iter_bliss_scan_data_from_memory(
lima_streams
=
dict
()
lima_clients
=
dict
()
lima_buffer_count
=
dict
()
counter_streams
=
dict
()
for
name
,
stream
in
scan
.
streams
.
items
():
if
stream
.
encoding
[
"
type
"
]
==
"
json
"
and
"
lima
"
in
stream
.
info
[
"
format
"
]:
if
name
.
split
(
"
:
"
)[
-
2
]
in
lima_names
:
lima_streams
[
name
]
=
stream
lima_clients
[
name
]
=
lima_client_factory
(
stream
.
info
)
lima_buffer_count
[
name
]
=
0
elif
name
.
split
(
"
:
"
)[
-
1
]
in
counter_names
:
counter_streams
[
name
]
=
stream
client
=
StreamingClient
({
**
lima_streams
,
**
counter_streams
})
lima_buffer_count
=
Counter
()
while
True
:
try
:
output
=
client
.
read
()
except
EndOfStream
:
break
else
:
for
stream
,
data
in
output
.
items
():
_
,
payload
=
data
# drop index
if
stream
.
name
in
lima_streams
:
lima_client
=
lima_clients
[
stream
.
name
]
prev_len
=
len
(
lima_client
)
lima_client
.
update
(
**
payload
[
-
1
])
data
=
lima_client
[
prev_len
-
1
:]
buffers
[
stream
.
name
.
split
(
"
:
"
)[
-
2
]].
extend
(
data
)
else
:
buffers
[
stream
.
name
.
split
(
"
:
"
)[
-
1
]].
extend
(
payload
)
nyield
=
min
(
len
(
v
)
for
v
in
buffers
.
values
())
if
nyield
:
for
i
in
range
(
nyield
):
yield
{
name
:
values
[
i
]
for
name
,
values
in
buffers
.
items
()}
buffers
=
{
name
:
values
[
nyield
:]
for
name
,
values
in
buffers
.
items
()}
for
stream
,
(
_
,
payload
)
in
output
.
items
():
name_parts
=
stream
.
name
.
split
(
"
:
"
)
if
stream
.
name
in
lima_streams
:
# payload is a sequence of JSON statuses
ctr_name
=
name_parts
[
-
2
]
lima_client
=
lima_clients
[
stream
.
name
]
lima_client
.
update
(
**
payload
[
-
1
])
n_already_read
=
lima_buffer_count
[
ctr_name
]
data
=
lima_client
[
n_already_read
:]
buffers
[
ctr_name
].
extend
(
data
)
lima_buffer_count
[
ctr_name
]
+=
len
(
data
)
else
:
# payload is a sequence of data points (0D, 1D, 2D)
ctr_name
=
name_parts
[
-
1
]
buffers
[
ctr_name
].
extend
(
payload
)
nyield
=
min
(
len
(
v
)
for
v
in
buffers
.
values
())
if
nyield
:
for
i
in
range
(
nyield
):
yield
{
name
:
values
[
i
]
for
name
,
values
in
buffers
.
items
()}
buffers
=
{
name
:
values
[
nyield
:]
for
name
,
values
in
buffers
.
items
()}
def
last_lima_image
(
channel_info
:
dict
)
->
ArrayLike
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment