diff --git a/sis8300bcmApp/Db/sis8300bcm-acct.template b/sis8300bcmApp/Db/sis8300bcm-acct.template index ee41c8a67c2e8b3201356f4e1b2e06d9696a0a29..38ec984c73efedf7d01a85fa29e7b862179ebb8d 100644 --- a/sis8300bcmApp/Db/sis8300bcm-acct.template +++ b/sis8300bcmApp/Db/sis8300bcm-acct.template @@ -122,9 +122,10 @@ record(calcout, "$(P)$(R)AdcScaleCalc") { field(INPA, "$(P)$(R)CalibrationSample1R") field(INPB, "$(P)$(R)CalibrationSample2R") - field(INPC, "$(P_BCM=$(P))$(R)CalibrationActualCurrent") - field(INPD, "$(P_BCM=$(P))$(R)CalibrationPulseCounter CPP") - field(CALC, "(163.84*C) / (B-A)") + field(INPC, "$(P)$(R)CalibrationSample3R") + field(INPD, "$(P_BCM=$(P))$(R)CalibrationActualCurrent") + field(INPE, "$(P_BCM=$(P))$(R)CalibrationPulseCounter CPP") + field(CALC, "(163.84*D) / (1.125*B-A-0.125*C)") field(FLNK, "$(P)$(R)AdcScaleCalcCheck.PROC") } @@ -250,10 +251,11 @@ record(ai, "$(P)$(R)DroopRateR") record(calcout, "$(P)$(R)DroopRateCalc") { + field(INPA, "$(P)$(R)CalibrationSample1R") field(INPB, "$(P)$(R)CalibrationSample2R") field(INPC, "$(P)$(R)CalibrationSample3R") field(INPD, "$(P_BCM=$(P))$(R)CalibrationPulseCounter CPP") - field(CALC, "100*(B-C) / (2.86*B)") + field(CALC, "100*(B-C) / (2.4*(B-A))") field(OUT, "$(P)$(R)DroopRate PP") }