From b44f15c53ff1db21aa1a38b387292e0c0756ba9b Mon Sep 17 00:00:00 2001 From: PONS Date: Fri, 12 Jun 2026 15:18:54 +0200 Subject: [PATCH] Move type initialisation to the init_measure method --- pyaml/tuning_tools/measurement_tool.py | 1 + pyaml/tuning_tools/orbit_response_matrix.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyaml/tuning_tools/measurement_tool.py b/pyaml/tuning_tools/measurement_tool.py index 09c3d7726..edec89e4a 100644 --- a/pyaml/tuning_tools/measurement_tool.py +++ b/pyaml/tuning_tools/measurement_tool.py @@ -58,6 +58,7 @@ def __init__(self, name): def _init_measure(self, measurement_type: str | None = None): # Initialize measurement data + # type is used there to be able to reload a measurement, typically a reponse matrix, using the PyAML factory. self._latest_measurement = {} if measurement_type is not None: self._latest_measurement["type"] = measurement_type diff --git a/pyaml/tuning_tools/orbit_response_matrix.py b/pyaml/tuning_tools/orbit_response_matrix.py index 064399d74..68d26fbac 100644 --- a/pyaml/tuning_tools/orbit_response_matrix.py +++ b/pyaml/tuning_tools/orbit_response_matrix.py @@ -123,7 +123,7 @@ def measure( idx = 0 try: self._register_callback(callback) - self._init_measure() + self._init_measure("pyaml.tuning_tools.orbit_response_matrix_data") for code, measurement in generator: callback_data = {"idx": idx, "response_data": measurement.response_data} if code is ResponseCode.AFTER_SET: @@ -156,7 +156,6 @@ def measure( orm_data = self._pySC_response_data_to_ORMData(measurement.response_data.model_dump()) self.latest_measurement.update(orm_data.model_dump()) - self.latest_measurement["type"] = "pyaml.tuning_tools.orbit_response_matrix_data" return True