From 0cadd8582e1ecc17feaec191155947b13e0ced35 Mon Sep 17 00:00:00 2001 From: x12sa Date: Fri, 11 Sep 2026 16:24:12 +0200 Subject: [PATCH] fix(flomni,omny): sanitize sample name spaces in tomography_scannumbers.txt The scannumbers log is read column-wise by downstream tooling; a sample name containing spaces breaks that whitespace-based parsing since it's written as the trailing field. Replace spaces with underscores before writing. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01FB3kYVkJruYsmcVsj7RS1G --- csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py | 3 ++- csaxs_bec/bec_ipython_client/plugins/omny/omny.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py index 15431a95..a1391e78 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py +++ b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py @@ -3342,10 +3342,11 @@ class Flomni( def _write_tomo_scan_number(self, scan_number: int, angle: float, subtomo_number: int) -> None: tomo_scan_numbers_file = os.path.expanduser("~/data/raw/logs/tomography_scannumbers.txt") + sample_name = self.sample_name.replace(" ", "_") with open(tomo_scan_numbers_file, "a+") as out_file: # pylint: disable=undefined-variable out_file.write( - f"{scan_number} {angle} {dev.fsamroy.read()['fsamroy']['value']:.5f} {self.tomo_id} {subtomo_number} {0} {self.sample_name}\n" + f"{scan_number} {angle} {dev.fsamroy.read()['fsamroy']['value']:.5f} {self.tomo_id} {subtomo_number} {0} {sample_name}\n" ) def tomo_scan_projection(self, angle: float, _internal: bool = False): diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/omny.py b/csaxs_bec/bec_ipython_client/plugins/omny/omny.py index 2a987d75..34b18556 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/omny.py +++ b/csaxs_bec/bec_ipython_client/plugins/omny/omny.py @@ -1235,10 +1235,11 @@ class OMNY( tomo_scan_numbers_file = os.path.expanduser( "~/Data10/specES1/dat-files/tomography_scannumbers.txt" ) + sample_name = self.sample_name.replace(" ", "_") with open(tomo_scan_numbers_file, "a+") as out_file: # pylint: disable=undefined-variable out_file.write( - f"{scan_number} {angle} {dev.osamroy.read()['osamroy']['value']:.3f} {self.tomo_id} {subtomo_number} {0} {self.sample_name}\n" + f"{scan_number} {angle} {dev.osamroy.read()['osamroy']['value']:.3f} {self.tomo_id} {subtomo_number} {0} {sample_name}\n" ) def tomo_scan_projection(self, angle: float):