From 35ddb0e651845d22b2a8602a45e103f72f865375 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Fri, 8 Oct 2021 17:05:58 +0200
Subject: [PATCH] flake8, whitespace
---
src/calng/agipd_gpu.py | 3 ---
src/calng/agipd_gpu_kernels.cpp | 1 +
src/calng/base_correction.py | 1 +
src/calng/base_gpu.py | 2 +-
src/calng/calcat_utils.py | 29 ++++++++++++++---------------
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/calng/agipd_gpu.py b/src/calng/agipd_gpu.py
index c1d63382..8526836f 100644
--- a/src/calng/agipd_gpu.py
+++ b/src/calng/agipd_gpu.py
@@ -136,9 +136,6 @@ class AgipdGpuRunner(base_gpu.BaseGpuRunner):
)
else:
self.override_md_additional_offset(override_md_additional_offset)
- print(
- f"Rel gain pc min max: {self.rel_gain_pc_map_gpu.min()}, {self.rel_gain_pc_map_gpu.max()}"
- )
def override_md_additional_offset(self, override_value):
self.md_additional_offset_gpu.fill(override_value)
diff --git a/src/calng/agipd_gpu_kernels.cpp b/src/calng/agipd_gpu_kernels.cpp
index 2a9d7dc3..7c8a65fe 100644
--- a/src/calng/agipd_gpu_kernels.cpp
+++ b/src/calng/agipd_gpu_kernels.cpp
@@ -20,6 +20,7 @@ extern "C" {
const float* rel_gain_pc_map,
const float* md_additional_offset,
const float* rel_gain_xray_map,
+ const float g_gain_value,
const unsigned int* bad_pixel_map,
const float bad_pixel_mask_value,
unsigned char* gain_map,
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index 1f0e26c6..12d4a96e 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -366,6 +366,7 @@ class BaseCorrection(PythonDevice):
self._buffer_lock = threading.Lock()
self.KARABO_SLOT(self.loadMostRecentConstants)
self.KARABO_SLOT(self.requestScene)
+
# TODO: the CalCatFriend could add these for us
# note: overly complicated slot function creation necessary for closure to work
def make_wrapper_capturing_constant(constant):
diff --git a/src/calng/base_gpu.py b/src/calng/base_gpu.py
index 1b1e9bc1..868d42e0 100644
--- a/src/calng/base_gpu.py
+++ b/src/calng/base_gpu.py
@@ -73,7 +73,7 @@ class BaseGpuRunner:
self.preview_raw = np.empty(self.preview_shape, dtype=np.float32)
self.preview_corrected = np.empty(self.preview_shape, dtype=np.float32)
- # functions to get data from respective buffers to cell, x, y shape for preview computation
+ # to get data from respective buffers to cell, x, y shape for preview computation
# TODO: handle shape juggling programmatically, removing need for these two helpers
def _preview_preprocess_raw(self):
"""Should return view of self.input_data_gpu with shape (cell, x, y)"""
diff --git a/src/calng/calcat_utils.py b/src/calng/calcat_utils.py
index 78c9a953..3d1a2dc5 100644
--- a/src/calng/calcat_utils.py
+++ b/src/calng/calcat_utils.py
@@ -15,7 +15,6 @@ from calibration_client.modules import (
CalibrationConstantVersion,
Detector,
DetectorType,
- Parameter,
PhysicalDetectorUnit,
)
from karabo.bound import (
@@ -345,18 +344,18 @@ class BaseCalcatFriend:
constant = self._constant_enum_class[constant]
calibration_id = self.calibration_id(constant.name)
- self._set_status(constant, f"calibrationId", calibration_id)
+ self._set_status(constant, "calibrationId", calibration_id)
condition = self._constants_need_conditions[constant]()
condition_id = self.condition_id(
self._karabo_da_to_float_uuid[karabo_da], condition
)
- self._set_status(constant, f"conditionId", condition_id)
+ self._set_status(constant, "conditionId", condition_id)
constant_id = self.constant_id(
calibration_id=calibration_id, condition_id=condition_id
)
- self._set_status(constant, f"constantId", constant_id)
+ self._set_status(constant, "constantId", constant_id)
resp = CalibrationConstantVersion.get_by_uk(
self.client,
@@ -369,8 +368,8 @@ class BaseCalcatFriend:
timestamp = resp["data"][
"begin_at"
] # TODO: check which key we like (also has begin_validity_at)
- self._set_status(constant, f"createdAt", timestamp)
- self._set_status(constant, f"constantVersionId", resp["data"]["id"])
+ self._set_status(constant, "createdAt", timestamp)
+ self._set_status(constant, "constantVersionId", resp["data"]["id"])
file_path = (
self.caldb_store / resp["data"]["path_to_file"] / resp["data"]["file_name"]
@@ -379,7 +378,7 @@ class BaseCalcatFriend:
with h5py.File(file_path, "r") as fd:
constant_data = np.array(fd[resp["data"]["data_set_name"]]["data"])
self.cached_constants[constant] = constant_data
- self._set_status(constant, f"found", True)
+ self._set_status(constant, "found", True)
return constant_data
@@ -399,12 +398,12 @@ class BaseCalcatFriend:
with h5py.File(file_path, "r") as fd:
constant_data = np.array(fd[resp["data"]["data_set_name"]]["data"])
self.cached_constants[constant] = constant_data
- self._set_status(constant, f"createdAt", resp["data"]["begin_at"])
- self._set_status(constant, f"calibrationId", "manual override")
- self._set_status(constant, f"conditionId", "manual override")
- self._set_status(constant, f"constantId", "manual override")
- self._set_status(constant, f"constantVersionId", constant_version_id)
- self._set_status(constant, f"found", True)
+ self._set_status(constant, "createdAt", resp["data"]["begin_at"])
+ self._set_status(constant, "calibrationId", "manual override")
+ self._set_status(constant, "conditionId", "manual override")
+ self._set_status(constant, "constantId", "manual override")
+ self._set_status(constant, "constantVersionId", constant_version_id)
+ self._set_status(constant, "found", True)
return constant_data
def get_constant_version_and_call_me_back(
@@ -437,8 +436,8 @@ class BaseCalcatFriend:
def flush_constants(self):
for constant in self._constant_enum_class:
- self._set_status(constant, f"createdAt", "")
- self._set_status(constant, f"found", False)
+ self._set_status(constant, "createdAt", "")
+ self._set_status(constant, "found", False)
class AgipdConstants(enum.Enum):
--
GitLab