From b8406016d2dc17e46fbc5a5db46c9866f80989d8 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Wed, 17 Sep 2025 12:26:47 +0200 Subject: [PATCH 1/2] removes duplicated clearing of channels and cleans up status mapping for nicos --- db/daq.proto | 19 ------------------- db/daq_common.db | 49 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/db/daq.proto b/db/daq.proto index 5a751af..fd3f2ee 100644 --- a/db/daq.proto +++ b/db/daq.proto @@ -204,52 +204,33 @@ setGate { } ################################################################################ -# TODO To clean startWithCountPreset4 { - clearTimer; - clearCounter4; readAll4; startWithCountPreset; } startWithCountPreset8 { - clearTimer; - clearCounter4; - clearCounter8; readAll8; startWithCountPreset; } startWithCountPreset10 { - clearTimer; - clearCounter4; - clearCounter8; - clearCounter10; readAll10; startWithCountPreset; } startWithTimePreset4 { - clearTimer; - clearCounter4; readAll4; startWithTimePreset; } startWithTimePreset8 { - clearTimer; - clearCounter4; - clearCounter8; readAll8; startWithTimePreset; } startWithTimePreset10 { - clearTimer; - clearCounter4; - clearCounter8; - clearCounter10; readAll10; startWithTimePreset; } diff --git a/db/daq_common.db b/db/daq_common.db index fa86c65..83fe9d0 100644 --- a/db/daq_common.db +++ b/db/daq_common.db @@ -55,7 +55,15 @@ record(seq, "$(INSTR)$(NAME):REINIT-CONF") # it must always be triggered after the value of $(INSTR)$(NAME):RAW-STATUS is # updated, so that it can't be the case that the status changes back from # counting to idle, without having updated the time and count values. -record(longin, "$(INSTR)$(NAME):RAW-STATUS") +# +# The status can be interpreted as follows +# +# Bit 0: NC_STAT_P_TIME_C +# Bit 1: NC_STAT_P_COUNT_C +# Bit 2: NC_STAT_RATE_OK_C It appears this should be ignored unless counting +# Bit 3: NC_STAT_PAUSE_C +# +record(mbbiDirect, "$(INSTR)$(NAME):RAW-STATUS") { field(DESC, "Raw returned status value") field(DTYP, "stream") @@ -64,13 +72,44 @@ record(longin, "$(INSTR)$(NAME):RAW-STATUS") field(FLNK, "$(INSTR)$(NAME):READALL") } +record(bi, "$(INSTR)$(NAME):COUNTING_TIME") +{ + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B0") + field(ZNAM, "DISABLED") + field(ONAM, "COUNTING") +} + +record(bi, "$(INSTR)$(NAME):COUNTING_PRESET") +{ + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B1") + field(ZNAM, "DISABLED") + field(ONAM, "COUNTING") +} + +record(bi, "$(INSTR)$(NAME):IS_LOWRATE") +{ + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B2") + field(ZNAM, "LOW RATE") + field(ONAM, "GOOD RATE") +} + +record(bi, "$(INSTR)$(NAME):IS_PAUSED") +{ + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B3") + field(ZNAM, "RUNNING") + field(ONAM, "PAUSED") +} + record(calc, "$(INSTR)$(NAME):MAP-STATUS") { field(DESC, "Maps Raw Status to State") - field(INPA, "$(INSTR)$(NAME):RAW-STATUS NPP") - field(INPB, "$(INSTR)$(NAME):INVALID-CONFIG NPP") - field(INPC, "$(INSTR)$(NAME):RAW-STATUS.UDF NPP") # should also be invalid if can't read the status - field(CALC, "(B=1||C==1)?4:A=0?0:(A=1||A=2)?1:(A=5||A=6)?2:(A=9||A=13||A=10||A=14)?3:4") + field(INPA, "$(INSTR)$(NAME):INVALID-CONFIG NPP") + field(INPB, "$(INSTR)$(NAME):RAW-STATUS.UDF NPP") # should also be invalid if can't read the status + field(INPC, "$(INSTR)$(NAME):COUNTING_TIME PP") + field(INPD, "$(INSTR)$(NAME):COUNTING_PRESET PP") + field(INPE, "$(INSTR)$(NAME):IS_LOWRATE PP") + field(INPF, "$(INSTR)$(NAME):IS_PAUSED PP") + field(CALC, "(A=1||B=1)?4:(F=1)?3:(C=0&&D=0)?0:(E=0)?2:1") field(FLNK, "$(INSTR)$(NAME):STATUS") } From 14214e6151323a4c2926a202d49f538b8e71dc57 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Wed, 17 Sep 2025 13:54:08 +0200 Subject: [PATCH 2/2] low rate status is handled differently in new and old box --- db/daq_2nd_gen.db | 7 +++++++ db/daq_4ch.db | 7 +++++++ db/daq_8ch.db | 7 +++++++ db/daq_common.db | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/db/daq_2nd_gen.db b/db/daq_2nd_gen.db index f5f2af9..b835201 100644 --- a/db/daq_2nd_gen.db +++ b/db/daq_2nd_gen.db @@ -38,6 +38,13 @@ record(seq, "$(INSTR)$(NAME):CORRECT-MONITOR-CHANNEL") field(SCAN, ".5 second") } +record(calc, "$(INSTR)$(NAME):RATE_MAP") +{ + field(DESC, "Want a consistent lowrate pv") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(CALC, "(A=1)?1:0") +} + ################################################################################ # Count Commands diff --git a/db/daq_4ch.db b/db/daq_4ch.db index 193a01a..2a44d79 100644 --- a/db/daq_4ch.db +++ b/db/daq_4ch.db @@ -25,6 +25,13 @@ record(longin, "$(INSTR)$(NAME):MONITOR-CHANNEL_RBV") field(DISP, 1) } +record(calc, "$(INSTR)$(NAME):RATE_MAP") +{ + field(DESC, "Want a consistent lowrate pv") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(CALC, "(A=0)?1:0") +} + ################################################################################ # Count Commands diff --git a/db/daq_8ch.db b/db/daq_8ch.db index c770a7d..8891ea4 100644 --- a/db/daq_8ch.db +++ b/db/daq_8ch.db @@ -25,6 +25,13 @@ record(longin, "$(INSTR)$(NAME):MONITOR-CHANNEL_RBV") field(DISP, 1) } +record(calc, "$(INSTR)$(NAME):RATE_MAP") +{ + field(DESC, "Want a consistent lowrate pv") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(CALC, "(A=0)?1:0") +} + ################################################################################ # Count Commands diff --git a/db/daq_common.db b/db/daq_common.db index 83fe9d0..403ed49 100644 --- a/db/daq_common.db +++ b/db/daq_common.db @@ -88,7 +88,7 @@ record(bi, "$(INSTR)$(NAME):COUNTING_PRESET") record(bi, "$(INSTR)$(NAME):IS_LOWRATE") { - field(INP, "$(INSTR)$(NAME):RAW-STATUS.B2") + field(INP, "$(INSTR)$(NAME):RATE_MAP PP") field(ZNAM, "LOW RATE") field(ONAM, "GOOD RATE") }