Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
calng
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
Model registry
Operate
Environments
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
calibration
calng
Commits
1a655dcc
Commit
1a655dcc
authored
2 years ago
by
David Hammer
Browse files
Options
Downloads
Patches
Plain Diff
New handling of invalid arrays from DAQ (need Karabo >= 2.14.1)
parent
385420de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!12
Snapshot: field test deployed version as of end of run 202201
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/calng/base_correction.py
+11
-7
11 additions, 7 deletions
src/calng/base_correction.py
with
11 additions
and
7 deletions
src/calng/base_correction.py
+
11
−
7
View file @
1a655dcc
...
...
@@ -924,13 +924,19 @@ class BaseCorrection(PythonDevice):
if
source
not
in
self
.
sources
:
self
.
log_status_info
(
f
"
Ignoring hash with unknown source
{
source
}
"
)
return
continue
elif
not
data_hash
.
has
(
self
.
_image_data_path
):
self
.
log_status_info
(
"
Ignoring hash without image node
"
)
return
elif
len
(
self
.
input_data_shape
)
!=
len
(
data_hash
.
get
(
f
"
{
self
.
_image_data_path
}
.shape
"
)):
self
.
log_status_info
(
"
DAQ probably not sending data
"
)
return
continue
try
:
image_data
=
data_hash
.
get
(
self
.
_image_data_path
)
cell_table
=
data_hash
.
get
(
self
.
_cell_table_path
).
ravel
()
except
RuntimeError
as
err
:
self
.
log_status_info
(
f
"
Failed to load image data; probably empty hash from DAQ:
{
err
}
"
)
continue
# no more common reasons to skip input, so go to processing
if
state
is
State
.
ON
:
...
...
@@ -939,7 +945,6 @@ class BaseCorrection(PythonDevice):
train_id
=
metadata
.
getAttribute
(
"
timestamp
"
,
"
tid
"
)
self
.
_train_ratio_tracker
.
update
(
train_id
)
cell_table
=
data_hash
.
get
(
self
.
_cell_table_path
).
ravel
()
if
self
.
unsafe_get
(
"
constantParameters.memoryCells
"
)
<=
cell_table
.
max
():
self
.
log_status_warn
(
"
Input cell IDs out of range of constants
"
)
...
...
@@ -951,7 +956,6 @@ class BaseCorrection(PythonDevice):
self
.
set
(
"
dataFormat.memoryCells
"
,
cell_table
.
size
)
self
.
_lock_and_update_in_background
(
self
.
_update_frame_filter
)
image_data
=
data_hash
.
get
(
self
.
_image_data_path
)
# DataAggregator typically tells us the wrong axis order
if
self
.
unsafe_get
(
"
dataFormat.overrideInputAxisOrder
"
):
expected_shape
=
self
.
input_data_shape
...
...
This diff is collapsed.
Click to expand it.
David Hammer
@hammerd
mentioned in commit
3566342d
·
2 years ago
mentioned in commit
3566342d
mentioned in commit 3566342d031db1bb435b6430f100afdbaaa6c4bf
Toggle commit list
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