From cb82cd89df148722a8b5ff4e48de2273a84daea6 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 15 Jan 2025 13:25:47 +0100
Subject: [PATCH] Reorder things in some addons' init
---
src/calng/base_correction.py | 1 -
src/calng/correction_addons/base_addon.py | 2 +-
src/calng/correction_addons/litpixel_counter.py | 10 +++++-----
src/calng/correction_addons/peakfinder9.py | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index 0271fea3..e62a59cf 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -588,7 +588,6 @@ class BaseCorrection(PythonDevice):
)
# update device schema in one fell swoop
self.updateSchema(schema_override)
- print(self._enabled_addons)
self._geometry = None
def _on_geometry(geometry):
diff --git a/src/calng/correction_addons/base_addon.py b/src/calng/correction_addons/base_addon.py
index 307e3b14..1ab99090 100644
--- a/src/calng/correction_addons/base_addon.py
+++ b/src/calng/correction_addons/base_addon.py
@@ -17,9 +17,9 @@ class BaseCorrectionAddon:
def __init__(self, device, prefix, config):
"""Will get node from extend_device_schema; node paths won't include prefix"""
- self.reconfigure(config)
self._device = device
self._prefix = prefix
+ self.reconfigure(config)
def post_correction(
self, train_id, processed_data, cell_table, pulse_table, output_hash
diff --git a/src/calng/correction_addons/litpixel_counter.py b/src/calng/correction_addons/litpixel_counter.py
index bd2b2c03..90c4eaba 100644
--- a/src/calng/correction_addons/litpixel_counter.py
+++ b/src/calng/correction_addons/litpixel_counter.py
@@ -22,16 +22,16 @@ def factors(n):
class LitPixelCounter(BaseCorrectionAddon):
def __init__(self, device, prefix, config):
- # note: this includes reconfigure
- super().__init__(device, prefix, config)
- global cupy
- import cupy
-
self._ss_size = device.kernel_runner.num_pixels_ss
self._ss_factors = factors(self._ss_size)
self._fs_size = device.kernel_runner.num_pixels_fs
self._fs_factors = factors(self._fs_size)
+ # note: this includes reconfigure
+ super().__init__(device, prefix, config)
+ global cupy
+ import cupy
+
# these properties may be changed to the factors
# of module dimensions due to protection
device.set(f"{prefix}.ssAsicSize", self._ss_asic_size)
diff --git a/src/calng/correction_addons/peakfinder9.py b/src/calng/correction_addons/peakfinder9.py
index 1647350c..4a9d199f 100644
--- a/src/calng/correction_addons/peakfinder9.py
+++ b/src/calng/correction_addons/peakfinder9.py
@@ -170,11 +170,11 @@ class Peakfinder9(BaseCorrectionAddon):
pass
def __init__(self, device, prefix, config):
+ self._config = config
super().__init__(device, prefix, config)
global cupy
import cupy
- self._config = config
_src_dir = pathlib.Path(__file__).absolute().parent.parent
with (_src_dir / "kernels" / "peakfinder9_gpu.cu").open("r") as fd:
--
GitLab