lin-epics-modules/sinqDAQ
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SINQSW-107 makes some changes to better cooperate with Nicos

Browse Source
This commit is contained in:
wall_e
2024-11-13 12:29:24 +01:00
parent 01839b3217
commit 3b660ca560
9 changed files with 101 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
db/channels.db
View File

@ -11,6 +11,25 @@
################################################################################ ################################################################################
# Count Commands # Count Commands
# record(ao,"$(P):$(NAME):THRESHOLD_$(CHANNEL)")
# {
# field(DESC, "Minimum rate for counting to proceed")
# field(VAL, "0") # Rate
# field(DRVL, "0") # Minimum Rate
# field(OMSL, "supervisory")
# field(OROC, "0")
# field(OUT, "@$(PROTO) setMinRate($(P):$(NAME):, $(CHANNEL)) $(ASYN_PORT)")
# field(DTYP, "stream")
# }
#
# record(ai,"$(P):$(NAME):THRESHOLD_$(CHANNEL)_RBV")
# {
# field(DESC, "Minimum rate for counting to proceed")
# field(INP, "@$(PROTO) readMinRate($(P):$(NAME):, $(CHANNEL)) $(ASYN_PORT)")
# field(DTYP, "stream")
# field(SCAN, "1 second")
# }
################################################################################ ################################################################################
# Read all monitors values # Read all monitors values
@ -18,3 +37,11 @@ record(longin, "$(P):$(NAME):M$(CHANNEL)")
{ {
field(DESC, "Counterbox CH$(CHANNEL)") field(DESC, "Counterbox CH$(CHANNEL)")
} }
record(ai, "$(P):$(NAME):R$(CHANNEL)")
{
field(DESC, "Counterbox Rate CH$(CHANNEL)")
field(INP, "@$(PROTO) readRate($(P):$(NAME):, $(CHANNEL)) $(ASYN_PORT)")
field(DTYP, "stream")
field(SCAN, "1 second")
}

34
db/counterbox.proto
View File

@ -76,19 +76,39 @@ stopCount {
@mismatch{in "%(\$1MsgTxt)s";} @mismatch{in "%(\$1MsgTxt)s";}
} }
# setMinRate{
# out "DL \$2 %.3f";
# in;
# @mismatch{in "%(\$1MsgTxt)s";}
# }
#
# readMinRate{
# out "DL \$2";
# in "%f";
# @mismatch{in "%(\$1MsgTxt)s";}
# }
setMinRate{ setMinRate{
out "DL %(\$1THRESHOLD-MONITOR)d %(\$1THRESHOLD)d"; out "DL %(\$1THRESHOLD-MONITOR_RBV)d %.3f";
in;
out "DR %(\$1THRESHOLD-MONITOR)d";
in; in;
@mismatch{in "%(\$1MsgTxt)s";} @mismatch{in "%(\$1MsgTxt)s";}
} }
readMinRate{ readMinRate{
out "DR";
in "%(\$1THRESHOLD-MONITOR_RBV)d";
out "DL %(\$1THRESHOLD-MONITOR_RBV)d"; out "DL %(\$1THRESHOLD-MONITOR_RBV)d";
in "%(\$1THRESHOLD_RBV)d"; in "%f";
@mismatch{in "%(\$1MsgTxt)s";}
}
setRateMonitor{
out "DR %d";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
readRateMonitor{
out "DR";
in "%d";
@mismatch{in "%(\$1MsgTxt)s";} @mismatch{in "%(\$1MsgTxt)s";}
} }
@ -115,7 +135,7 @@ readAll10 {
readRate { readRate {
out "RR \$2"; out "RR \$2";
in "%(\$1R\$2)f"; in "%f";
@mismatch{in "%(\$1MsgTxt)s";} @mismatch{in "%(\$1MsgTxt)s";}
} }

4
db/counterbox_4ch.db
View File

@ -8,10 +8,12 @@
################################################################################ ################################################################################
# Status Variables # Status Variables
record(longin, "$(P):$(NAME):MONITOR-CHANNEL") record(longout, "$(P):$(NAME):MONITOR-CHANNEL")
{ {
field(DESC, "PRESET-COUNT Monitors this channel") field(DESC, "PRESET-COUNT Monitors this channel")
field(VAL, 1) field(VAL, 1)
field(DRVL, "1") # Smallest Monitor Channel
field(DRVH, "1") # Largest Monitor Channel
field(DISP, 1) field(DISP, 1)
} }

4
db/counterbox_8ch.db
View File

@ -8,10 +8,12 @@
################################################################################ ################################################################################
# Status Variables # Status Variables
record(longin, "$(P):$(NAME):MONITOR-CHANNEL") record(longout, "$(P):$(NAME):MONITOR-CHANNEL")
{ {
field(DESC, "PRESET-COUNT Monitors this channel") field(DESC, "PRESET-COUNT Monitors this channel")
field(VAL, 1) field(VAL, 1)
field(DRVL, "1") # Smallest Monitor Channel
field(DRVH, "1") # Largest Monitor Channel
field(DISP, 1) field(DISP, 1)
} }

48
db/counterbox_common.db
View File

@ -12,19 +12,6 @@ record(bo, "$(P):$(NAME):INIT-CONF")
field(OUT, "@$(PROTO) initialise($(P):$(NAME):) $(ASYN_PORT)") field(OUT, "@$(PROTO) initialise($(P):$(NAME):) $(ASYN_PORT)")
field(PINI, "YES") # Run at init field(PINI, "YES") # Run at init
field(DTYP, "stream") field(DTYP, "stream")
field(FLNK, "$(P):$(NAME):INIT-BOX")
}
# As we aren't certain of the order that PINI exectutes PVs, we only set it to
# true on INIT-CONF to make sure the box is ready to receive commands, and then
# let INIT-CONF trigger the initialisation of other necessary records
record(fanout, "$(P):$(NAME):INIT-BOX")
{
field(DESC, "Rewrite PVs to Box")
field(SELM, "All")
field(LNK0, "$(P):$(NAME):MONITOR-CHANNEL_RBV PP")
field(LNK1, "$(P):$(NAME):RAW-STATUS PP")
field(LNK2, "$(P):$(NAME):THRESHOLD_RBV PP")
} }
record(longout, "$(P):$(NAME):FULL-RESET") record(longout, "$(P):$(NAME):FULL-RESET")
@ -71,7 +58,7 @@ record(longin, "$(P):$(NAME):RAW-STATUS")
{ {
field(DESC, "Raw returned status value") field(DESC, "Raw returned status value")
field(DTYP, "stream") field(DTYP, "stream")
field(SCAN, ".1 second") field(SCAN, ".5 second")
field(INP, "@$(PROTO) readStatus($(P):$(NAME):) $(ASYN_PORT)") field(INP, "@$(PROTO) readStatus($(P):$(NAME):) $(ASYN_PORT)")
field(FLNK, "$(P):$(NAME):READALL") field(FLNK, "$(P):$(NAME):READALL")
} }
@ -156,23 +143,24 @@ record(bo, "$(P):$(NAME):STOP")
field(OUT, "@$(PROTO) stopCount($(P):$(NAME):) $(ASYN_PORT)") field(OUT, "@$(PROTO) stopCount($(P):$(NAME):) $(ASYN_PORT)")
} }
# TODO should changing the monitor also set things? record(ao,"$(P):$(NAME):THRESHOLD")
# or only when actually setting a threshold?
record(longout,"$(P):$(NAME):THRESHOLD")
{ {
field(DESC, "Minimum rate for counting to proceed") field(DESC, "Minimum rate for counting to proceed")
field(VAL, "0") # Rate field(VAL, "0") # Rate
field(DRVL, "0") # Minimum Rate field(DRVL, "0.000001") # Minimum Rate
field(DTYP, "stream") field(DRVH, "100000") # Maximum Rate
field(OMSL, "supervisory")
field(OROC, "0")
field(OUT, "@$(PROTO) setMinRate($(P):$(NAME):) $(ASYN_PORT)") field(OUT, "@$(PROTO) setMinRate($(P):$(NAME):) $(ASYN_PORT)")
field(DTYP, "stream")
} }
record(longin,"$(P):$(NAME):THRESHOLD_RBV") record(ai,"$(P):$(NAME):THRESHOLD_RBV")
{ {
field(DESC, "Minimum rate for counting to proceed") field(DESC, "Minimum rate for counting to proceed")
field(DTYP, "stream")
field(INP, "@$(PROTO) readMinRate($(P):$(NAME):) $(ASYN_PORT)") field(INP, "@$(PROTO) readMinRate($(P):$(NAME):) $(ASYN_PORT)")
field(SCAN, "2 second") field(DTYP, "stream")
field(SCAN, "1 second")
} }
record(longout,"$(P):$(NAME):THRESHOLD-MONITOR") record(longout,"$(P):$(NAME):THRESHOLD-MONITOR")
@ -180,12 +168,17 @@ record(longout,"$(P):$(NAME):THRESHOLD-MONITOR")
field(DESC, "Channel monitored for minimum rate") field(DESC, "Channel monitored for minimum rate")
field(VAL, "1") # Monitor field(VAL, "1") # Monitor
field(DRVL, "1") # Smallest Threshold Channel field(DRVL, "1") # Smallest Threshold Channel
field(DRVL, "$(CHANNELS)") # Largest Threshold Channel field(DRVH, "$(CHANNELS)") # Largest Threshold Channel
field(OUT, "@$(PROTO) setRateMonitor($(P):$(NAME):) $(ASYN_PORT)")
field(DTYP, "stream")
} }
record(longin,"$(P):$(NAME):THRESHOLD-MONITOR_RBV") record(longin,"$(P):$(NAME):THRESHOLD-MONITOR_RBV")
{ {
field(DESC, "Channel monitored for minimum rate") field(DESC, "Channel monitored for minimum rate")
field(INP, "@$(PROTO) readRateMonitor($(P):$(NAME):) $(ASYN_PORT)")
field(DTYP, "stream")
field(SCAN, "1 second")
} }
################################################################################ ################################################################################
@ -204,12 +197,3 @@ record(ai,"$(P):$(NAME):ELAPSED-TIME")
field(DESC, "Counterbox Measured Time") field(DESC, "Counterbox Measured Time")
field(EGU, "seconds") field(EGU, "seconds")
} }
# Not yet sure whether we want to support this
# record(longin, "$(P):$(NAME):R1")
# {
# field(DESC, "Counterbox Rate CH1")
# field(INP, "@$(PROTO) readRate($(P):$(NAME):, 1) $(ASYN_PORT)")
# field(SCAN, ".2 second")
# field(DTYP, "stream")
# }

2
db/counterbox_v2.db
View File

@ -11,6 +11,8 @@
record(longout, "$(P):$(NAME):MONITOR-CHANNEL") record(longout, "$(P):$(NAME):MONITOR-CHANNEL")
{ {
field(DESC, "PRESET-COUNT Monitors this channel") field(DESC, "PRESET-COUNT Monitors this channel")
field(DRVL, "1") # Smallest Monitor Channel
field(DRVH, "$(CHANNELS)") # Largest Monitor Channel
field(DTYP, "stream") field(DTYP, "stream")
field(OUT, "@$(PROTO) writePresetMonitor($(P):$(NAME):) $(ASYN_PORT)") field(OUT, "@$(PROTO) writePresetMonitor($(P):$(NAME):) $(ASYN_PORT)")
field(FLNK, "$(P):$(NAME):MONITOR-CHANNEL_RBV") field(FLNK, "$(P):$(NAME):MONITOR-CHANNEL_RBV")

8
scripts/counterbox_4ch.cmd
View File

@ -16,7 +16,7 @@ dbLoadRecords("$(counterbox_DB)counterbox_common.db", "P=$(PREFIX), NAME=$(NAME)
dbLoadRecords("$(counterbox_DB)counterbox_4ch.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)") dbLoadRecords("$(counterbox_DB)counterbox_4ch.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)")
# Could also use substitions instead. # Could also use substitions instead.
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=1") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=1")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=2") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=2")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=3") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=3")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=4") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=4")

16
scripts/counterbox_8ch.cmd
View File

@ -16,11 +16,11 @@ dbLoadRecords("$(counterbox_DB)counterbox_common.db", "P=$(PREFIX), NAME=$(NAME)
dbLoadRecords("$(counterbox_DB)counterbox_8ch.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)") dbLoadRecords("$(counterbox_DB)counterbox_8ch.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)")
# Could also use substitions instead. # Could also use substitions instead.
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=1") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=1")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=2") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=2")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=3") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=3")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=4") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=4")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=5") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=5")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=6") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=6")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=7") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=7")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=8") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=8")

22
scripts/counterbox_v2.cmd
View File

@ -13,18 +13,18 @@ $(SET_SIM_MODE=#) $(SET_SIM_MODE) sleep 3
epicsEnvSet("PROTO", "$(counterbox_DB)counterbox.proto") epicsEnvSet("PROTO", "$(counterbox_DB)counterbox.proto")
drvAsynIPPortConfigure("ASYN_$(NAME)", "$($(NAME)_CNTBOX_HOST)", 0, 0, 0) drvAsynIPPortConfigure("ASYN_$(NAME)", "$($(NAME)_CNTBOX_HOST)", 0, 0, 0)
dbLoadRecords("$(counterbox_DB)counterbox_common.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNELS=10") dbLoadRecords("$(counterbox_DB)counterbox_common.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNELS=10")
dbLoadRecords("$(counterbox_DB)counterbox_v2.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)") dbLoadRecords("$(counterbox_DB)counterbox_v2.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNELS=10")
# Could also use substitions instead. # Could also use substitions instead.
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=1") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=1")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=2") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=2")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=3") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=3")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=4") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=4")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=5") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=5")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=6") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=6")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=7") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=7")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=8") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=8")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=9") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=9")
dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), CHANNEL=10") dbLoadRecords("$(counterbox_DB)channels.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME), CHANNEL=10")
$(LOAD_TEST_PVS=#) $(LOAD_TEST_PVS) dbLoadRecords("$(counterbox_DB)counterbox_v2_test.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)") $(LOAD_TEST_PVS=#) $(LOAD_TEST_PVS) dbLoadRecords("$(counterbox_DB)counterbox_v2_test.db", "P=$(PREFIX), NAME=$(NAME), PROTO=$(PROTO), ASYN_PORT=ASYN_$(NAME)")