Skip to content
Snippets Groups Projects
Commit 90edc8c7 authored by Hinko Kocevar's avatar Hinko Kocevar
Browse files

Merge branch 'fix_calibration_init' into 'master'

ICSHWI-9569 Fix calibration init

See merge request beam-diagnostics/bde/modules/adsis8300bcm!41
parents b1003efd d8ba7a44
No related branches found
No related tags found
No related merge requests found
Pipeline #124022 failed
...@@ -256,6 +256,16 @@ record(calcout, "$(P)$(R)DroopRateCalc") ...@@ -256,6 +256,16 @@ record(calcout, "$(P)$(R)DroopRateCalc")
field(INPC, "$(P)$(R)CalibrationSample3R") field(INPC, "$(P)$(R)CalibrationSample3R")
field(INPD, "$(P_BCM=$(P))$(R)CalibrationPulseCounter CPP") field(INPD, "$(P_BCM=$(P))$(R)CalibrationPulseCounter CPP")
field(CALC, "100*(B-C) / (2.4*(B-A))") field(CALC, "100*(B-C) / (2.4*(B-A))")
field(FLNK, "$(P)$(R)DroopRateCalcCheck.PROC")
}
record(calcout, "$(P)$(R)DroopRateCalcCheck")
{
field(INPA, "$(P)$(R)DroopRateCalc")
field(CALC, "(0 <= A) AND (A <= 5) ? 1 : 0")
field(OOPT, "When Non-zero")
field(OCAL, "A")
field(DOPT, "Use OCAL")
field(OUT, "$(P)$(R)DroopRate PP") field(OUT, "$(P)$(R)DroopRate PP")
} }
......
...@@ -674,8 +674,7 @@ record(calc, "$(P)$(R)CalibrationPulseCounter") ...@@ -674,8 +674,7 @@ record(calc, "$(P)$(R)CalibrationPulseCounter")
{ {
field(INPA, "$(P)$(R)CalibrationPulseCounter") field(INPA, "$(P)$(R)CalibrationPulseCounter")
field(CALC, "A + 1") field(CALC, "A + 1")
field(VAL, "-1") field(VAL, "0")
field(PINI, "YES")
} }
record(ao, "$(P)$(R)CalibrationActualCurrent") record(ao, "$(P)$(R)CalibrationActualCurrent")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment