From 2357e82935d40be255f9217353044c92feba6804 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Wed, 27 May 2026 11:43:21 +0200 Subject: [PATCH] DAQ: filenaming fix --- src/aare/devices/jfjoch.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 1176521b..6ef44a8c 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -107,6 +107,7 @@ class JFJochWrapper: #raster grid, rotation or screening specific parameter initialisation wedge = None if isinstance(r, RasterGridRequest): + data_folder = f"{pgroup}/raw/raster" if r.n_x == 1: trigger = 1 images = r.n_y @@ -115,10 +116,12 @@ class JFJochWrapper: images = r.n_x else: if r.screening: + data_folder = f"{pgroup}/raw/screening" wedge = r.wedge_omega_deg images = 1 trigger = r.steps else: + data_folder = f"{pgroup}/raw" wedge = None images = r.steps trigger = 1 @@ -130,7 +133,7 @@ class JFJochWrapper: ntrigger= trigger, images_per_trigger=images, detector_distance_mm=s.diffraction.dtz_mm, - file_prefix=f"{pgroup}/raw/raster/{r.file_prefix}", + file_prefix=f"{data_folder}/{r.file_prefix}", incident_energy_keV=s.diffraction.energy_keV, sample_name=sample, image_time_us=round(r.exp_time_s * 1e6),