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

Commiting state after implementing gating etc before cleaning and refactoring

Browse Source
This commit is contained in:
wall_e
2025-02-13 16:06:31 +01:00
parent 65d6f681b9
commit d4b111ce6d
9 changed files with 419 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
db/channels.db
View File

@ -11,25 +11,6 @@
################################################################################
# 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")
# }
record(bo, "$(P):$(NAME):C$(CHANNEL)")
{
field(DESC, "Clear the current channel count")

175
db/counterbox.proto
View File

@ -46,18 +46,6 @@ writePresetMonitor {
################################################################################
# Count Commands
startWithCountPreset {
out "MP %d";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
startWithTimePreset {
out "TP %#.2f";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
pauseCount {
out "PS";
in;
@ -76,17 +64,65 @@ stopCount {
@mismatch{in "%(\$1MsgTxt)s";}
}
# setMinRate{
# out "DL \$2 %.3f";
# in;
# @mismatch{in "%(\$1MsgTxt)s";}
# }
#
# readMinRate{
# out "DL \$2";
# in "%f";
# @mismatch{in "%(\$1MsgTxt)s";}
# }
clearTimer{
# We first stop the count, as otherwise on the newest counterboxes
# it starts counting again if a time preset was set.
# Not a problem with the older boxes
stopCount;
out "CT";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
clearChannel{
out "CC \$2";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
clearCounter4 {
out "CC 1";
in;
out "CC 2";
in;
out "CC 3";
in;
out "CC 4";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
clearCounter8 {
out "CC 5";
in;
out "CC 6";
in;
out "CC 7";
in;
out "CC 8";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
clearCounter10 {
out "CC 9";
in;
out "CC 10";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
startWithCountPreset {
out "MP %d";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
startWithTimePreset {
out "TP %#.2f";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
setMinRate{
out "DL %(\$1THRESHOLD-MONITOR_RBV)d %.3f";
@ -112,18 +148,6 @@ readRateMonitor{
@mismatch{in "%(\$1MsgTxt)s";}
}
clearTimer{
out "CT";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
clearChannel{
out "CC \$2";
in;
@mismatch{in "%(\$1MsgTxt)s";}
}
################################################################################
# Read Values From Monitors
@ -141,7 +165,13 @@ readAll8 {
readAll10 {
out "RA";
in "%(\$1ELAPSED-TIME)f %(\$1M1)d %(\$1M2)d %(\$1M3)d %(\$1M4)d %(\$1M5)d %(\$1M6)d %(\$1M7)d %(\$1M8)d %(\$1M9)d %(\$1M10)d";
in "%(\$1ELAPSED-TIME)f %(\$1M1)d %(\$1M2)d %(\$1M3)d %(\$1M4)d %(\$1M5)d %(\$1M6)d %(\$1M7)d %(\$1M8)d";
# At least on the sinqtest variant this is broken
# requiring channels 9 and 10 to be manually queried
out "RC 9";
in "%(\$1M9)d";
out "RC 10";
in "%(\$1M10)d";
@mismatch{in "%(\$1MsgTxt)s";}
}
@ -164,3 +194,76 @@ setTestSignal {
out "TG 1 %(\$1TESTGEN-HIGHRATE)d %(\$1TESTGEN-LOWRATE)d";
@mismatch{in "%(\$1MsgTxt)s";}
}
################################################################################
# Gating Settings
getGateStatus {
out "GT \$2";
in "%d %(\$1GATE-ON-\$2_RBV)d";
@mismatch{in "%(\$1MsgTxt)s";}
}
setGateStatus {
extrainput = ignore;
out "GT \$2 %(\$1GATE-\$2)d %(\$1GATE-ON-\$2)d";
in "Gate \$2";
@mismatch{in "%(\$1MsgTxt)s";}
}
setGate {
out "GATE \$2 %d";
in "";
@mismatch{in "%(\$1MsgTxt)s";}
}
################################################################################
# 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;
}

11
db/counterbox_common.db
View File

@ -105,19 +105,21 @@ record(ao,"$(P):$(NAME):PRESET-COUNT")
{
field(DESC, "Count until preset reached")
field(DTYP, "stream")
field(OUT, "@$(PROTO) startWithCountPreset($(P):$(NAME):) $(ASYN_PORT)")
field(OUT, "@$(PROTO) startWithCountPreset$(CHANNELS)($(P):$(NAME):) $(ASYN_PORT)")
field(VAL, 0)
field(PREC, 2)
field(FLNK, "$(P):$(NAME):RAW-STATUS")
}
record(ao,"$(P):$(NAME):PRESET-TIME")
{
field(DESC, "Count for specified time")
field(DTYP, "stream")
field(OUT, "@$(PROTO) startWithTimePreset($(P):$(NAME):) $(ASYN_PORT)")
field(OUT, "@$(PROTO) startWithTimePreset$(CHANNELS)($(P):$(NAME):) $(ASYN_PORT)")
field(VAL, 0)
field(PREC, 2)
field(EGU, "seconds")
field(FLNK, "$(P):$(NAME):RAW-STATUS")
}
record(bo,"$(P):$(NAME):PAUSE")
@ -126,6 +128,7 @@ record(bo,"$(P):$(NAME):PAUSE")
field(DTYP, "stream")
field(OUT, "@$(PROTO) pauseCount($(P):$(NAME):) $(ASYN_PORT)")
field(VAL, "0")
field(FLNK, "$(P):$(NAME):RAW-STATUS")
}
record(bo,"$(P):$(NAME):CONTINUE")
@ -134,6 +137,7 @@ record(bo,"$(P):$(NAME):CONTINUE")
field(DTYP, "stream")
field(OUT, "@$(PROTO) continueCount($(P):$(NAME):) $(ASYN_PORT)")
field(VAL, "0")
field(FLNK, "$(P):$(NAME):RAW-STATUS")
}
record(bo, "$(P):$(NAME):STOP")
@ -141,6 +145,7 @@ record(bo, "$(P):$(NAME):STOP")
field(DESC, "Stop the current counting operation")
field(DTYP, "stream")
field(OUT, "@$(PROTO) stopCount($(P):$(NAME):) $(ASYN_PORT)")
field(FLNK, "$(P):$(NAME):RAW-STATUS")
}
record(ao,"$(P):$(NAME):THRESHOLD")
@ -167,7 +172,7 @@ record(longout,"$(P):$(NAME):THRESHOLD-MONITOR")
{
field(DESC, "Channel monitored for minimum rate")
field(VAL, "1") # Monitor
field(DRVL, "1") # Smallest Threshold Channel
field(DRVL, "0") # Smallest Threshold Channel (0 is off)
field(DRVH, "$(CHANNELS)") # Largest Threshold Channel
field(OUT, "@$(PROTO) setRateMonitor($(P):$(NAME):) $(ASYN_PORT)")
field(DTYP, "stream")

26
db/counterbox_simcontrol.db Normal file
View File

@ -0,0 +1,26 @@
# Sinq Counterbox EPICS Database for StreamDevice Communication with Simulation
# Macros
# P - Prefix
# NAME - just a name, e.g. EL737
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to EL737
################################################################################
record(bo, "$(P):$(NAME):G1")
{
field(DESC, "Set Gate 1 Low/High")
field(ZNAM, "Low")
field(ONAM, "High")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGate($(P):$(NAME):, 1) $(ASYN_PORT)")
}
record(bo, "$(P):$(NAME):G2")
{
field(DESC, "Set Gate 2 Low/High")
field(ZNAM, "Low")
field(ONAM, "High")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGate($(P):$(NAME):, 2) $(ASYN_PORT)")
}

73
db/counterbox_v2.db
View File

@ -31,3 +31,76 @@ record(longin, "$(P):$(NAME):MONITOR-CHANNEL_RBV")
################################################################################
# Read all monitors values
################################################################################
# Gating Settings
record(bo, "$(P):$(NAME):GATE-1")
{
field(DESC, "First Gating Channel")
field(ZNAM, "Disabled")
field(ONAM, "Enabled")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGateStatus($(P):$(NAME):, 1) $(ASYN_PORT)")
}
record(bo, "$(P):$(NAME):GATE-ON-1")
{
field(DESC, "Count when first Gate high/low")
field(ZNAM, "Low")
field(ONAM, "High")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGateStatus($(P):$(NAME):, 1) $(ASYN_PORT)")
}
record(bi, "$(P):$(NAME):GATE-1_RBV")
{
field(DESC, "First Gating Channel")
field(ZNAM, "Disabled")
field(ONAM, "Enabled")
field(DTYP, "stream")
field(INP, "@$(PROTO) getGateStatus($(P):$(NAME):, 1) $(ASYN_PORT)")
field(SCAN, "2 second")
}
record(bi, "$(P):$(NAME):GATE-ON-1_RBV")
{
field(DESC, "Count when first Gate high/low")
field(ZNAM, "Low")
field(ONAM, "High")
}
record(bo, "$(P):$(NAME):GATE-2")
{
field(DESC, "First Gating Channel")
field(ZNAM, "Disabled")
field(ONAM, "Enabled")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGateStatus($(P):$(NAME):, 2) $(ASYN_PORT)")
}
record(bo, "$(P):$(NAME):GATE-ON-2")
{
field(DESC, "Count when first Gate high/low")
field(ZNAM, "Low")
field(ONAM, "High")
field(DTYP, "stream")
field(OUT, "@$(PROTO) setGateStatus($(P):$(NAME):, 2) $(ASYN_PORT)")
}
record(bi, "$(P):$(NAME):GATE-2_RBV")
{
field(DESC, "Second Gating Channel")
field(ZNAM, "Disabled")
field(ONAM, "Enabled")
field(DTYP, "stream")
field(INP, "@$(PROTO) getGateStatus($(P):$(NAME):, 2) $(ASYN_PORT)")
field(SCAN, "2 second")
}
record(bi, "$(P):$(NAME):GATE-ON-2_RBV")
{
field(DESC, "Count when second Gate high/low")
field(ZNAM, "Low")
field(ONAM, "High")
}