diff --git a/db/daq_2nd_gen.db b/db/daq_2nd_gen.db index d90fc0c..2a82306 100644 --- a/db/daq_2nd_gen.db +++ b/db/daq_2nd_gen.db @@ -41,7 +41,7 @@ record(seq, "$(INSTR)$(NAME):CORRECT-MONITOR-CHANNEL") record(calc, "$(INSTR)$(NAME):RATE_MAP") { field(DESC, "Want a consistent lowrate pv") - field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP MS") field(CALC, "(A=1)?0:1") } diff --git a/db/daq_4ch.db b/db/daq_4ch.db index 8dc3a39..1373c53 100644 --- a/db/daq_4ch.db +++ b/db/daq_4ch.db @@ -28,7 +28,7 @@ record(longin, "$(INSTR)$(NAME):MONITOR-CHANNEL_RBV") record(calc, "$(INSTR)$(NAME):RATE_MAP") { field(DESC, "Want a consistent lowrate pv") - field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP MS") field(CALC, "(A=0)?0:1") } diff --git a/db/daq_8ch.db b/db/daq_8ch.db index 6ad2c56..3e10646 100644 --- a/db/daq_8ch.db +++ b/db/daq_8ch.db @@ -28,7 +28,7 @@ record(longin, "$(INSTR)$(NAME):MONITOR-CHANNEL_RBV") record(calc, "$(INSTR)$(NAME):RATE_MAP") { field(DESC, "Want a consistent lowrate pv") - field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP") + field(INPA, "$(INSTR)$(NAME):RAW-STATUS.B2 NPP MS") field(CALC, "(A=0)?0:1") } diff --git a/db/daq_common.db b/db/daq_common.db index 787d6de..60b0f8d 100644 --- a/db/daq_common.db +++ b/db/daq_common.db @@ -74,28 +74,28 @@ record(mbbiDirect, "$(INSTR)$(NAME):RAW-STATUS") record(bi, "$(INSTR)$(NAME):COUNTING_TIME") { - field(INP, "$(INSTR)$(NAME):RAW-STATUS.B0") + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B0 NPP MS") field(ZNAM, "DISABLED") field(ONAM, "COUNTING") } record(bi, "$(INSTR)$(NAME):COUNTING_PRESET") { - field(INP, "$(INSTR)$(NAME):RAW-STATUS.B1") + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B1 NPP MS") field(ZNAM, "DISABLED") field(ONAM, "COUNTING") } record(bi, "$(INSTR)$(NAME):IS_LOWRATE") { - field(INP, "$(INSTR)$(NAME):RATE_MAP PP") + field(INP, "$(INSTR)$(NAME):RATE_MAP PP MS") field(ONAM, "LOW RATE") field(ZNAM, "GOOD RATE") } record(bi, "$(INSTR)$(NAME):IS_PAUSED") { - field(INP, "$(INSTR)$(NAME):RAW-STATUS.B3") + field(INP, "$(INSTR)$(NAME):RAW-STATUS.B3 NPP MS") field(ZNAM, "RUNNING") field(ONAM, "PAUSED") } @@ -103,12 +103,12 @@ record(bi, "$(INSTR)$(NAME):IS_PAUSED") record(calc, "$(INSTR)$(NAME):MAP-STATUS") { field(DESC, "Maps Raw Status to State") - 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(INPA, "$(INSTR)$(NAME):INVALID-CONFIG NPP MS") + field(INPB, "$(INSTR)$(NAME):RAW-STATUS.UDF NPP MS") # should also be invalid if can't read the status + field(INPC, "$(INSTR)$(NAME):COUNTING_TIME PP MS") + field(INPD, "$(INSTR)$(NAME):COUNTING_PRESET PP MS") + field(INPE, "$(INSTR)$(NAME):IS_LOWRATE PP MS") + field(INPF, "$(INSTR)$(NAME):IS_PAUSED PP MS") field(CALC, "(A=1||B=1)?4:(F=1)?3:(C=0&&D=0)?0:(E=1)?2:1") field(FLNK, "$(INSTR)$(NAME):STATUS") } @@ -116,7 +116,7 @@ record(calc, "$(INSTR)$(NAME):MAP-STATUS") record(mbbi, "$(INSTR)$(NAME):STATUS") { field(DESC, "DAQ Status") - field(INP, "$(INSTR)$(NAME):MAP-STATUS NPP") + field(INP, "$(INSTR)$(NAME):MAP-STATUS NPP MS") field(ZRVL, "0") field(ZRST, "Idle") field(ONVL, "1") diff --git a/db/gating_channels.db b/db/gating_channels.db index 248e609..9382b4c 100644 --- a/db/gating_channels.db +++ b/db/gating_channels.db @@ -75,8 +75,8 @@ record(mbbi, "$(INSTR)$(NAME):GATE-$(CHANNEL)_RBV") record(calcout, "$(INSTR)$(NAME):GATE-$(CHANNEL)-SEL_RBV") { - field(INPA, "$(INSTR)$(NAME):GATE-$(CHANNEL)-ENABLE_RBV NPP") - field(INPB, "$(INSTR)$(NAME):GATE-$(CHANNEL)-TRIG_RBV NPP") + field(INPA, "$(INSTR)$(NAME):GATE-$(CHANNEL)-ENABLE_RBV NPP MS") + field(INPB, "$(INSTR)$(NAME):GATE-$(CHANNEL)-TRIG_RBV NPP MS") field(CALC, "A=0?0:B=0?1:2") field(OOPT, "On Change") field(OUT, "$(INSTR)$(NAME):GATE-$(CHANNEL)_RBV PP")