From d216a3ac4250bf6ec18f01ec009b47e744704a93 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Mon, 8 Jun 2026 10:22:33 +0200 Subject: [PATCH] updates soft proton count record names --- db/daq_soft_proton.db | 65 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/db/daq_soft_proton.db b/db/daq_soft_proton.db index ab2f38e..b56394e 100644 --- a/db/daq_soft_proton.db +++ b/db/daq_soft_proton.db @@ -67,15 +67,15 @@ record(bi, "$(INSTR)$(NAME):IS_LOWRATE") # Commands ################################################################################ -record(ao, "$(INSTR)$(NAME):PRESET-COUNT") +record(ao, "$(INSTR)$(NAME):PRESET_COUNT") { field(DESC, "Count until preset reached") field(VAL, 0) field(PREC, 2) - field(FLNK, "$(INSTR)$(NAME):PRESET-COUNT-TRIG") + field(FLNK, "$(INSTR)$(NAME):PRESET_COUNT-TRIG") } -record(longout, "$(INSTR)$(NAME):PRESET-COUNT-TRIG") +record(longout, "$(INSTR)$(NAME):PRESET_COUNT-TRIG") { field(DESC, "Count until preset reached") # Signal count preset as command @@ -84,16 +84,16 @@ record(longout, "$(INSTR)$(NAME):PRESET-COUNT-TRIG") field(FLNK, "$(INSTR)$(NAME):COUNT-TYPE") } -record(ao, "$(INSTR)$(NAME):PRESET-TIME") +record(ao, "$(INSTR)$(NAME):PRESET_TIME") { field(DESC, "Count for specified time") field(VAL, 0) field(PREC, 2) field(EGU, "seconds") - field(FLNK, "$(INSTR)$(NAME):PRESET-TIME-TRIG") + field(FLNK, "$(INSTR)$(NAME):PRESET_TIME-TRIG") } -record(longout, "$(INSTR)$(NAME):PRESET-TIME-TRIG") +record(longout, "$(INSTR)$(NAME):PRESET_TIME-TRIG") { field(DESC, "Count until preset time reached") # Signal count preset as command @@ -138,14 +138,14 @@ record(seq, "$(INSTR)$(NAME):FULL-RESET") # 0. set status to busy # 1. set elapsed time to 0 # 2. set status to OK -record(seq, "$(INSTR)$(NAME):CT") +record(seq, "$(INSTR)$(NAME):T_CLEAR") { field(SELM, "All") - field(LNK0, "$(INSTR)$(NAME):ETS PP") + field(LNK0, "$(INSTR)$(NAME):T_STS PP") field(DO0, 1) - field(LNK1, "$(INSTR)$(NAME):ELAPSED-TIME PP") + field(LNK1, "$(INSTR)$(NAME):T PP") field(DO1, 0) - field(LNK2, "$(INSTR)$(NAME):ETS PP") + field(LNK2, "$(INSTR)$(NAME):T_STS PP") field(DO2, 0) } @@ -198,25 +198,25 @@ record(ao,"$(INSTR)$(NAME):THRESHOLD") field(OMSL, "supervisory") } -record(ai,"$(INSTR)$(NAME):ELAPSED-TIME") +record(ai,"$(INSTR)$(NAME):T") { field(DESC, "DAQ Measured Time") field(EGU, "sec") } # Current Status of elapsed time -record(bi, "$(INSTR)$(NAME):ETS") +record(bi, "$(INSTR)$(NAME):T_STS") { field(DESC, "Channel Status") field(VAL, 0) - field(ZNAM, "OK") - field(ONAM, "CLEARING") + field(ZNAM, "Idle") + field(ONAM, "Busy") } record(longout, "$(INSTR)$(NAME):MONITOR-CHANNEL") { alias("$(INSTR)$(NAME):MONITOR-CHANNEL_RBV") - field(DESC, "PRESET-COUNT Monitors this channel") + field(DESC, "PRESET_COUNT Monitors this channel") field(VAL, 1) } @@ -232,9 +232,9 @@ record(aSub, "$(INSTR)$(NAME):EMULATION") # The first 4 inputs are also mapped as the first 4 outputs field(INPA, "$(INSTR)$(NAME):STATUS") field(FTA, "ULONG") - field(INPB, "$(INSTR)$(NAME):M1") + field(INPB, "$(INSTR)$(NAME):CH1") field(FTB, "INT64") - field(INPC, "$(INSTR)$(NAME):ELAPSED-TIME") + field(INPC, "$(INSTR)$(NAME):T") field(FTC, "DOUBLE") field(INPD, "$(INSTR)$(NAME):COMMAND-TRIG") field(FTD, "ULONG") @@ -246,26 +246,26 @@ record(aSub, "$(INSTR)$(NAME):EMULATION") field(FTF, "DOUBLE") field(INPG, "$(INSTR)$(NAME):COUNT-TYPE") field(FTG, "ULONG") - field(INPH, "$(INSTR)$(NAME):PRESET-COUNT") + field(INPH, "$(INSTR)$(NAME):PRESET_COUNT") field(FTH, "DOUBLE") - field(INPI, "$(INSTR)$(NAME):PRESET-TIME") + field(INPI, "$(INSTR)$(NAME):PRESET_TIME") field(FTI, "DOUBLE") # L is last input before EPICS 7.0.10 - field(INPJ, "$(INSTR)$(NAME):R1-PREV") + field(INPJ, "$(INSTR)$(NAME):CH1_RATE-PREV") field(FTJ, "DOUBLE") - field(INPL, "$(INSTR)$(NAME):R1 PP") + field(INPL, "$(INSTR)$(NAME):CH1_RATE PP") field(FTL, "DOUBLE") # The first 4 outputs are also mapped as the first 4 inputs field(OUTA, "$(INSTR)$(NAME):STATUS PP") field(FTVA, "ULONG") - field(OUTB, "$(INSTR)$(NAME):M1 PP") + field(OUTB, "$(INSTR)$(NAME):CH1 PP") field(FTVB, "INT64") - field(OUTC, "$(INSTR)$(NAME):ELAPSED-TIME PP") + field(OUTC, "$(INSTR)$(NAME):T PP") field(FTVC, "DOUBLE") field(OUTD, "$(INSTR)$(NAME):COMMAND-TRIG PP") field(FTVD, "ULONG") - field(OUTE, "$(INSTR)$(NAME):R1-PREV PP") + field(OUTE, "$(INSTR)$(NAME):CH1_RATE-PREV PP") field(FTVE, "DOUBLE") field(OUTF, "$(INSTR)$(NAME):IS_LOWRATE PP") field(FTVF, "ULONG") @@ -277,7 +277,7 @@ record(aSub, "$(INSTR)$(NAME):EMULATION") ####################### # Channel interface ####################### -record(int64in, "$(INSTR)$(NAME):M1") +record(int64in, "$(INSTR)$(NAME):CH1") { field(DESC, "DAQ CH0, proton current") field(EGU, "$(COUNTER_EGU=cts)") @@ -285,7 +285,7 @@ record(int64in, "$(INSTR)$(NAME):M1") # The proton rate take by a PV over the network, PV named indicated by $(REMOTE_RATE_PV) macro # It emulates Zero rate if either shutter is closed. -record(calc, "$(INSTR)$(NAME):R1") +record(calc, "$(INSTR)$(NAME):CH1_RATE") { field(DESC, "Rate of DAQ CH0 proton current") field(INPA, "$(REMOTE_RATE_PV) CA") @@ -303,7 +303,7 @@ record(calc, "$(INSTR)$(NAME):R1") } # Store previous rate value, so we can average over the period -record(ai, "$(INSTR)$(NAME):R1-PREV") { +record(ai, "$(INSTR)$(NAME):CH1_RATE-PREV") { field(DESC, "Previous rate of DAQ CH0 proton current") } @@ -311,24 +311,23 @@ record(ai, "$(INSTR)$(NAME):R1-PREV") { # 0. set status to busy # 1. set elapsed time to 0 # 2. set status to OK -record(seq, "$(INSTR)$(NAME):C1") +record(seq, "$(INSTR)$(NAME):CH1_CLEAR") { field(SELM, "All") - field(LNK0, "$(INSTR)$(NAME):S1 PP") + field(LNK0, "$(INSTR)$(NAME):CH1_STS PP") field(DO0, 1) - field(LNK1, "$(INSTR)$(NAME):M1 PP") + field(LNK1, "$(INSTR)$(NAME):CH1 PP") field(DO1, 0) - field(LNK2, "$(INSTR)$(NAME):S1 PP") + field(LNK2, "$(INSTR)$(NAME):CH1_STS PP") field(DO2, 0) } # Current Status of Channel # This is only to satify the interface. -record(bi, "$(INSTR)$(NAME):S1") +record(bi, "$(INSTR)$(NAME):CH1_STS") { field(DESC, "Channel Status") field(VAL, 0) field(ZNAM, "OK") field(ONAM, "CLEARING") } -