From ecc0347717c48e771ff0c0754f08486670938101 Mon Sep 17 00:00:00 2001 From: x01dc Date: Fri, 30 Oct 2026 11:48:48 +0100 Subject: [PATCH] config(lamni): rename simulated configs to simulated_bl_real_lamni / simulated_bl_simulated_lamni The names now say which half is simulated: the beamline (ddg1, fsh) is simulated in all of them, LamNI is either real or simulated. Device tags, the include key (was 'flomni'), the generator output name and docs follow. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01M8zoDzDfsCTY2o5bT3J7Wv --- bin/generate_simulated_configs.py | 2 +- .../flomni/AI_docs/SIMULATED_ENDSTATIONS.md | 2 +- ...amni.yaml => simulated_bl_real_lamni.yaml} | 6 ++-- ...yaml => simulated_bl_simulated_lamni.yaml} | 36 +++++++++---------- ...imulated_bl_simulated_lamni_keithley.yaml} | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) rename csaxs_bec/device_configs/simulated_omny/{simulated_bl_endstation_lamni.yaml => simulated_bl_real_lamni.yaml} (89%) rename csaxs_bec/device_configs/simulated_omny/{simulated_lamni.yaml => simulated_bl_simulated_lamni.yaml} (93%) rename csaxs_bec/device_configs/simulated_omny/{simulated_lamni_keithley.yaml => simulated_bl_simulated_lamni_keithley.yaml} (69%) diff --git a/bin/generate_simulated_configs.py b/bin/generate_simulated_configs.py index 632930ac..6277ea72 100644 --- a/bin/generate_simulated_configs.py +++ b/bin/generate_simulated_configs.py @@ -149,5 +149,5 @@ def transform(src_name: str, dst_dir: str, dst_name: str, setup: str) -> None: if __name__ == "__main__": - transform("ptycho_lamni.yaml", "simulated_omny", "simulated_lamni.yaml", "LamNI") + transform("ptycho_lamni.yaml", "simulated_omny", "simulated_bl_simulated_lamni.yaml", "LamNI") transform("ptycho_omny.yaml", "simulated_omny", "simulated_omny.yaml", "OMNY") diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/AI_docs/SIMULATED_ENDSTATIONS.md b/csaxs_bec/bec_ipython_client/plugins/flomni/AI_docs/SIMULATED_ENDSTATIONS.md index 9d0ae74c..95e53eda 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/AI_docs/SIMULATED_ENDSTATIONS.md +++ b/csaxs_bec/bec_ipython_client/plugins/flomni/AI_docs/SIMULATED_ENDSTATIONS.md @@ -59,7 +59,7 @@ Protocol fidelity is grounded in the actual hardware-side sources: `fgalil.dmc`, - `devices/sim/sim_sample_storage.py` — `SimFlomniSampleStorage` (patched EPICS, seedable via `sim_samples`, default slots 0–3 populated) - `device_configs/simulated_omny/` — **all** simulated configs live here: - `simulated_flomni.yaml` (hand-maintained), `simulated_lamni.yaml` and + `simulated_flomni.yaml` (hand-maintained), `simulated_bl_simulated_lamni.yaml` and `simulated_omny.yaml` (generated), `simulated_bl_endstation.yaml` (pre-existing) - `bin/generate_simulated_configs.py` — regenerates the LamNI/OMNY configs from `ptycho_lamni.yaml`/`ptycho_omny.yaml` (rerun after real-config changes) diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_real_lamni.yaml similarity index 89% rename from csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml rename to csaxs_bec/device_configs/simulated_omny/simulated_bl_real_lamni.yaml index 2217767c..f4adf475 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_real_lamni.yaml @@ -9,7 +9,7 @@ ddg1: readoutPriority: baseline softwareTrigger: true deviceTags: - - simulated_bl_endstation_lamni + - simulated_bl_real_lamni fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -19,9 +19,9 @@ fsh: enabled: true readoutPriority: monitored deviceTags: - - simulated_bl_endstation_lamni + - simulated_bl_real_lamni -flomni: +lamni: - !include ../ptycho_lamni.yaml # machine: diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml similarity index 93% rename from csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml rename to csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml index 63600cb4..2d88d3ab 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni.yaml @@ -26,7 +26,7 @@ leyex: userParameter: in: 14.117 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni leyey: description: Xray eye Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -50,7 +50,7 @@ leyey: in: 48.069 out: 0.5 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni loptx: description: Optics X deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -80,7 +80,7 @@ loptx: detector_distance: -1 # mm, sample-to-detector; unknown for now fzp_details: "manufacturing notes here" # free-text FZP manufacturing notes deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni lopty: description: Optics Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -105,7 +105,7 @@ lopty: in: 3.724 out: 3.53 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni loptz: description: Optics Z deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -127,7 +127,7 @@ loptz: readoutPriority: baseline connectionTimeout: 20 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni lsamrot: description: Sample rotation deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -150,7 +150,7 @@ lsamrot: readoutPriority: baseline connectionTimeout: 20 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni lsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -174,7 +174,7 @@ lsamx: userParameter: center: 8.768 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni lsamy: description: Sample coarse Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -198,7 +198,7 @@ lsamy: userParameter: center: 10.041 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni losax: description: OSA X deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -219,7 +219,7 @@ losax: userParameter: in: -1.442 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni losay: description: OSA Y deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -241,7 +241,7 @@ losay: in: -0.171 out: 3.8 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni losaz: description: OSA Z deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -263,7 +263,7 @@ losaz: in: -1 out: -3 deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni rtx: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniMotor deviceConfig: @@ -289,7 +289,7 @@ rtx: enabled: true readOnly: false deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni rty: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniMotor deviceConfig: @@ -308,7 +308,7 @@ rty: enabled: true readOnly: false deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni rt_positions: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniFlyer deviceConfig: @@ -321,7 +321,7 @@ rt_positions: enabled: true readOnly: false deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni cam_xeye: description: Camera LamNI Xray eye ID15 deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera @@ -354,7 +354,7 @@ cam_xeye: userParameter: pixel_calibration: 0.0009174311926605505 # mm/pixel (= 0.2 / 218) deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni ddg1: description: Simulated main delay generator for triggering deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.SimulatedDDG1 @@ -366,7 +366,7 @@ ddg1: readoutPriority: baseline softwareTrigger: true deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -376,7 +376,7 @@ fsh: enabled: true readoutPriority: monitored deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni ############################################################ #################### GUI Signals ########################### @@ -390,4 +390,4 @@ omny_xray_gui: readOnly: false readoutPriority: on_request deviceTags: - - simulated_lamni + - simulated_bl_simulated_lamni diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_lamni_keithley.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml similarity index 69% rename from csaxs_bec/device_configs/simulated_omny/simulated_lamni_keithley.yaml rename to csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml index 2f1cba07..2ba72172 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_lamni_keithley.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_simulated_lamni_keithley.yaml @@ -1,6 +1,6 @@ # Simulated LamNI endstation with the real Keithley 2400. lamni: - - !include ./simulated_lamni.yaml + - !include ./simulated_bl_simulated_lamni.yaml keithley: - !include ../keithley_2400.yaml