More work

db/daq_soft_proton.db

@@ -194,15 +194,19 @@ record(aSub, "$(INSTR)$(NAME):EMULATION")
  field(FTC,  "DOUBLE")
  field(OUTD, "$(INSTR)$(NAME):COMMAND-TRIG")
  field(FTD,  "ULONG")
- field(INPE, "$(INSTR)$(NAME):COMMAND-TRIG")
- field(FTE,  "ULONG")
+ field(OUTE, "$(INSTR)$(NAME):THRESHOLD")
+ field(FTE,  "DOUBLE")
 
  # Address the PV which are mapped as input backwards
+ field(INPF, "$(INSTR)$(NAME):COUNT-TYPE")
+ field(FTF,  "ULONG")
  field(INPG, "$(INSTR)$(NAME):PRESET-COUNT")
  field(FTG,  "INT64")
  field(INPH, "$(INSTR)$(NAME):PRESET-TIME")
  field(FTH,  "DOUBLE")
  # L is last input before EPICS 7.0.10
+ field(INPJ, "$(INSTR)$(NAME):R0-PREV")
+ field(FTJ,  "DOUBLE")
  field(INPL, "$(INSTR)$(NAME):R0 PP")
  field(FTL,  "DOUBLE")
 
@@ -215,6 +219,8 @@ record(aSub, "$(INSTR)$(NAME):EMULATION")
  field(FTVC, "DOUBLE")
  field(OUTD, "$(INSTR)$(NAME):COMMAND-TRIG PP")
  field(FTVD, "ULONG")
+ field(INPE, "$(INSTR)$(NAME):R0-PREV PP")
+ field(FTE,  "DOUBLE")
 }
 
 #######################
@@ -241,6 +247,11 @@ record(calc, "$(INSTR)$(NAME):R0")
  field(EGU,  "cts/sec")
 }
 
+# Store previous rate value, so we can average over the period
+record(ai, "$(INSTR)$(NAME):R0-PREV") {
+ field(DESC, "Previous rate of DAQ CH0 proton current")
+}
+
 # Clear channel, has to be calcout due to client
 # writing 1 to it.
 record(calcout, "$(INSTR)$(NAME):C0")