diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py index 0271fea3456b47af0c3b5d190c5e9213e465adfe..e62a59cffc5c1b9caeb91d5473c6dd9e8346adb9 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 307e3b145e27f65b826a697cab4054a11854a212..1ab990902b07e6a2252a3466540dce986102a4d1 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 bd2b2c03f58db555ee95eb319dc6b17f882c8519..90c4eaba7f5351dd7df7b1a2cc4ac2c8062163b6 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 1647350cb0e7e7a9cb567d99d77159e966a76d52..4a9d199f4c7dd77cadb579d827160d40bee685be 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: