From 29ca01b31d19016b223ac565b3c0d03281edfc1d Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Tue, 18 Aug 2026 16:37:52 +0200 Subject: [PATCH] f --- xtreme_bec/file_writer/xtreme_nexus.py | 35 +++++++++++++------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/xtreme_bec/file_writer/xtreme_nexus.py b/xtreme_bec/file_writer/xtreme_nexus.py index 453f367..0c1f300 100644 --- a/xtreme_bec/file_writer/xtreme_nexus.py +++ b/xtreme_bec/file_writer/xtreme_nexus.py @@ -18,7 +18,6 @@ class XtremeNeXusFormat(DefaultFormat): ("i0_electrometer", "Keithley 2 / 428 i0", "keithley_2"), ("diode_electrometer", "Keithley 3 / 428 diode", "keithley_3"), ) - _MONITOR_SIGNALS = ("s1", "s2", "s3", "s4", "s5", "s6", "s7") def format(self) -> None: entry = self.storage.create_group("entry") @@ -171,9 +170,7 @@ class XtremeNeXusFormat(DefaultFormat): if "signals" in self.device_manager.devices: adc_signals = instrument.create_group("adc_signals") adc_signals.attrs["NX_class"] = "NXdetector" - adc_signals.create_soft_link( - name="signals", target=f"/entry/collection/devices/signals" - ) + self._write_signals_with_softlink(adc_signals) for group_name, description, device_name in self._KEITHLEY_GROUPS: electrometer = instrument.create_group(group_name) @@ -186,10 +183,7 @@ class XtremeNeXusFormat(DefaultFormat): ############################## self._populate_default_nxdata(data) - def _populate_default_nxdata(self, data_group) -> None: - # We populate the NXdata group with the signals by linking to the datasets in collection. - # If the signals are on readout priority "async", we take the async signals, otherwise we take the normal signals. - + def _write_signals_with_softlink(self, group): signals_is_async = "signals" in self.info_storage["bec"].get("readout_priority", {}).get( "async", [] ) @@ -203,23 +197,28 @@ class XtremeNeXusFormat(DefaultFormat): print(self.written_async_signals) - self.safe_dataset(group=data_group, name="s1", device="signals", signal=f"{prefix}s1") - self.safe_dataset(group=data_group, name="s2", device="signals", signal=f"{prefix}s2") - self.safe_dataset(group=data_group, name="s3", device="signals", signal=f"{prefix}s3") - self.safe_dataset(group=data_group, name="s4", device="signals", signal=f"{prefix}s4") - self.safe_dataset(group=data_group, name="s5", device="signals", signal=f"{prefix}s5") - self.safe_dataset(group=data_group, name="s6", device="signals", signal=f"{prefix}s6") - self.safe_dataset(group=data_group, name="s7", device="signals", signal=f"{prefix}s7") + self.safe_dataset(group=group, name="s1", device="signals", signal=f"{prefix}s1") + self.safe_dataset(group=group, name="s2", device="signals", signal=f"{prefix}s2") + self.safe_dataset(group=group, name="s3", device="signals", signal=f"{prefix}s3") + self.safe_dataset(group=group, name="s4", device="signals", signal=f"{prefix}s4") + self.safe_dataset(group=group, name="s5", device="signals", signal=f"{prefix}s5") + self.safe_dataset(group=group, name="s6", device="signals", signal=f"{prefix}s6") + self.safe_dataset(group=group, name="s7", device="signals", signal=f"{prefix}s7") self.safe_dataset( - group=data_group, name="norm_diode", device="signals", signal=f"{prefix}norm_diode" + group=group, name="norm_diode", device="signals", signal=f"{prefix}norm_diode" ) self.safe_dataset( - group=data_group, name="norm_tey", device="signals", signal=f"{prefix}norm_tey" + group=group, name="norm_tey", device="signals", signal=f"{prefix}norm_tey" ) self.safe_dataset( - group=data_group, name="energy", device="signals", signal=f"{prefix}energy_cerbk" + group=group, name="energy", device="signals", signal=f"{prefix}energy_cerbk" ) + def _populate_default_nxdata(self, data_group) -> None: + # We populate the NXdata group with the signals by linking to the datasets in collection. + # If the signals are on readout priority "async", we take the async signals, otherwise we take the normal signals. + self._write_signals_with_softlink(data_group) + # has_otf_data = self.get_entry("otf", signal="edata") is not None # if has_otf_data: