From 2a21de065c9796e8975aea01eefe9c1351796a22 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 23 Feb 2022 11:32:17 +0100
Subject: [PATCH] Ravel cell table instead of squeezing it
---
src/calng/base_correction.py | 2 +-
src/calng/utils.py | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index 8de51c95..02cf87f2 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -939,7 +939,7 @@ class BaseCorrection(PythonDevice):
self.log_status_warn("Empty cell table, DAQ probably not sending data.")
return
- cell_table = np.squeeze(cell_table)
+ cell_table = np.ravel(cell_table)
# no more common reasons to skip input, so go to processing
if state is State.ON:
diff --git a/src/calng/utils.py b/src/calng/utils.py
index a623731d..0e560b05 100644
--- a/src/calng/utils.py
+++ b/src/calng/utils.py
@@ -149,14 +149,6 @@ def ceil_div(num, denom):
return (num + denom - 1) // denom
-def shape_after_transpose(input_shape, transpose_pattern, squeeze=True):
- if squeeze:
- input_shape = tuple(dim for dim in input_shape if dim > 1)
- if transpose_pattern is None:
- return input_shape
- return tuple(np.array(input_shape)[list(transpose_pattern)].tolist())
-
-
class RepeatingTimer:
"""A timer which will call callback every interval seconds"""
--
GitLab