From 2bfa7b6ca318a377547fa43f69e46bf0d57a4036 Mon Sep 17 00:00:00 2001 From: x10da Date: Tue, 7 Apr 2026 08:40:21 +0200 Subject: [PATCH] Change of order of nidaq signals --- superxas_bec/devices/nidaq/nidaq.py | 147 ++++++++++++++-------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/superxas_bec/devices/nidaq/nidaq.py b/superxas_bec/devices/nidaq/nidaq.py index cbf3ae0..6227374 100644 --- a/superxas_bec/devices/nidaq/nidaq.py +++ b/superxas_bec/devices/nidaq/nidaq.py @@ -33,6 +33,80 @@ class NidaqError(Exception): class NidaqControl(Device): """Nidaq control class with all PVs""" + energy = Cpt(SetableSignal, value=0, kind=Kind.normal) + + smpl_abs = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream sample absorption" + ) + ref_abs = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream reference absorption" + ) + cisum = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter sum" + ) + + ai0_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 0, MEAN" + ) + ai1_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 1, MEAN" + ) + ai2_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 2, MEAN" + ) + ai3_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 3, MEAN" + ) + ai4_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 4, MEAN" + ) + ai5_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 5, MEAN" + ) + ai6_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 6, MEAN" + ) + ai7_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 7, MEAN" + ) + + di0_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 0, MAX") + di1_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 1, MAX") + di2_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 2, MAX") + di3_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 3, MAX") + di4_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 4, MAX") + + ci0_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 0, MEAN" + ) + ci1_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 1, MEAN" + ) + ci2_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 2, MEAN" + ) + ci3_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 3, MEAN" + ) + ci4_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 4, MEAN" + ) + ci5_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 5, MEAN" + ) + ci6_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 6, MEAN" + ) + ci7_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 7, MEAN" + ) + ci8_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 8, MEAN" + ) + ci9_mean = Cpt( + SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 9, MEAN" + ) + ### Readback PVs for EpicsEmitter ### ai0 = Cpt( EpicsSignalRO, @@ -216,31 +290,6 @@ class NidaqControl(Device): ### Readback for BEC emitter ### - ai0_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 0, MEAN" - ) - ai1_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 1, MEAN" - ) - ai2_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 2, MEAN" - ) - ai3_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 3, MEAN" - ) - ai4_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 4, MEAN" - ) - ai5_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 5, MEAN" - ) - ai6_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 6, MEAN" - ) - ai7_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 7, MEAN" - ) - ai0_std_dev = Cpt( SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 0, STD" ) @@ -266,37 +315,6 @@ class NidaqControl(Device): SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream analog input 7, STD" ) - ci0_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 0, MEAN" - ) - ci1_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 1, MEAN" - ) - ci2_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 2, MEAN" - ) - ci3_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 3, MEAN" - ) - ci4_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 4, MEAN" - ) - ci5_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 5, MEAN" - ) - ci6_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 6, MEAN" - ) - ci7_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 7, MEAN" - ) - ci8_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 8, MEAN" - ) - ci9_mean = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 9, MEAN" - ) - ci0_std_dev = Cpt( SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 0. STD" ) @@ -328,16 +346,6 @@ class NidaqControl(Device): SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter input 9. STD" ) - cisum = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream counter sum" - ) - smpl_abs = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream sample absorption" - ) - ref_abs = Cpt( - SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream reference absorption" - ) - xas_timestamp = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XAS timestamp") # xrd_timestamp = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD timestamp") @@ -346,14 +354,7 @@ class NidaqControl(Device): # xrd_ai0_mean = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD ai0 mean") # xrd_ai0_std_dev = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream XRD ai0 std dev") - di0_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 0, MAX") - di1_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 1, MAX") - di2_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 2, MAX") - di3_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 3, MAX") - di4_max = Cpt(SetableSignal, value=0, kind=Kind.normal, doc="NIDAQ stream digital input 4, MAX") - enc = Cpt(SetableSignal, value=0, kind=Kind.normal) - energy = Cpt(SetableSignal, value=0, kind=Kind.normal) rle = Cpt(SetableSignal, value=0, kind=Kind.normal) ### Control PVs ###