diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index 00344e9e..ab3643df 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -661,64 +661,64 @@ calculated_signal: # without also confirming (e.g. restarting the device server) that the other device has # actually dropped its connection. # -# Currently: Mode A active, Mode B commented out (switched back 2026-09-15 for A/B -# comparison testing after confirming Mode B works end-to-end; Mode B speed testing beyond -# 100 Hz is still TODO). -omny_panda: - readoutPriority: async - deviceClass: csaxs_bec.devices.panda_box.panda_box_omny.PandaBoxOMNY - deviceConfig: - host: omny-panda.psi.ch - signal_alias: - FMC_IN.VAL1.Min: cap_voltage_fzp_y_min - FMC_IN.VAL1.Max: cap_voltage_fzp_y_max - FMC_IN.VAL1.Mean: cap_voltage_fzp_y_mean - FMC_IN.VAL2.Min: cap_voltage_fzp_x_min - FMC_IN.VAL2.Max: cap_voltage_fzp_x_max - FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean - INENC1.VAL.Max: interf_st_fzp_y_max - INENC1.VAL.Mean: interf_st_fzp_y_mean - INENC1.VAL.Min: interf_st_fzp_y_min - INENC2.VAL.Max: interf_st_fzp_x_max - INENC2.VAL.Mean: interf_st_fzp_x_mean - INENC2.VAL.Min: interf_st_fzp_x_min - INENC3.VAL.Max: interf_st_rotz_max - INENC3.VAL.Mean: interf_st_rotz_mean - INENC3.VAL.Min: interf_st_rotz_min - INENC4.VAL.Max: interf_st_rotx_max - INENC4.VAL.Mean: interf_st_rotx_mean - INENC4.VAL.Min: interf_st_rotx_min - PCAP.GATE_DURATION.Value: pcap_gate_duration_value - enabled: true - readOnly: false - softwareTrigger: false - deviceTags: - - ptycho_flomni - -# omny_panda_continuous: +# Currently: Mode B active for speed testing beyond the initial 100 Hz, Mode A commented out +# (both modes confirmed working end-to-end 2026-09-15; this swap 2026-09-15 is for Mode B +# speed testing specifically). +# omny_panda: # readoutPriority: async # deviceClass: csaxs_bec.devices.panda_box.panda_box_omny.PandaBoxOMNY # deviceConfig: # host: omny-panda.psi.ch -# raw_stream_mode: true # signal_alias: -# FMC_IN.VAL1.Value: cap_voltage_fzp_y -# FMC_IN.VAL2.Value: cap_voltage_fzp_x -# INENC1.VAL.Value: interf_st_fzp_y -# INENC2.VAL.Value: interf_st_fzp_x -# INENC3.VAL.Value: interf_st_rotz -# INENC4.VAL.Value: interf_st_rotx +# FMC_IN.VAL1.Min: cap_voltage_fzp_y_min +# FMC_IN.VAL1.Max: cap_voltage_fzp_y_max +# FMC_IN.VAL1.Mean: cap_voltage_fzp_y_mean +# FMC_IN.VAL2.Min: cap_voltage_fzp_x_min +# FMC_IN.VAL2.Max: cap_voltage_fzp_x_max +# FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean +# INENC1.VAL.Max: interf_st_fzp_y_max +# INENC1.VAL.Mean: interf_st_fzp_y_mean +# INENC1.VAL.Min: interf_st_fzp_y_min +# INENC2.VAL.Max: interf_st_fzp_x_max +# INENC2.VAL.Mean: interf_st_fzp_x_mean +# INENC2.VAL.Min: interf_st_fzp_x_min +# INENC3.VAL.Max: interf_st_rotz_max +# INENC3.VAL.Mean: interf_st_rotz_mean +# INENC3.VAL.Min: interf_st_rotz_min +# INENC4.VAL.Max: interf_st_rotx_max +# INENC4.VAL.Mean: interf_st_rotx_mean +# INENC4.VAL.Min: interf_st_rotx_min # PCAP.GATE_DURATION.Value: pcap_gate_duration_value -# # TTLIN1 (detector trigger) feeds both blocks below - confirmed 2026-09-15 against the -# # omny-panda hardware, see docs/developer/panda_box_free_running_setup.md. PCAP.BITS0 -# # is a shared 32-bit word; PandaBoxOMNY masks it to bit 0 (TTLIN1.VAL) before -# # publishing gate_detector_active. COUNTER1 counts TTLIN1's falling edge, i.e. one -# # increment per completed exposure; it also doubles as the on_complete signal. Confirmed -# # working end-to-end 2026-09-15; speed testing beyond the initial 100 Hz is still TODO. -# PCAP.BITS0.Value: gate_detector_active -# COUNTER1.OUT.Value: frame_counter # enabled: true # readOnly: false # softwareTrigger: false # deviceTags: # - ptycho_flomni + +omny_panda_continuous: + readoutPriority: async + deviceClass: csaxs_bec.devices.panda_box.panda_box_omny.PandaBoxOMNY + deviceConfig: + host: omny-panda.psi.ch + raw_stream_mode: true + signal_alias: + FMC_IN.VAL1.Value: cap_voltage_fzp_y + FMC_IN.VAL2.Value: cap_voltage_fzp_x + INENC1.VAL.Value: interf_st_fzp_y + INENC2.VAL.Value: interf_st_fzp_x + INENC3.VAL.Value: interf_st_rotz + INENC4.VAL.Value: interf_st_rotx + PCAP.GATE_DURATION.Value: pcap_gate_duration_value + # TTLIN1 (detector trigger) feeds both blocks below - confirmed 2026-09-15 against the + # omny-panda hardware, see docs/developer/panda_box_free_running_setup.md. PCAP.BITS0 + # is a shared 32-bit word; PandaBoxOMNY masks it to bit 0 (TTLIN1.VAL) before + # publishing gate_detector_active. COUNTER1 counts TTLIN1's falling edge, i.e. one + # increment per completed exposure; it also doubles as the on_complete signal. Confirmed + # working end-to-end 2026-09-15; now under speed testing beyond the initial 100 Hz. + PCAP.BITS0.Value: gate_detector_active + COUNTER1.OUT.Value: frame_counter + enabled: true + readOnly: false + softwareTrigger: false + deviceTags: + - ptycho_flomni