diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db index 025c5a2..5033c1a 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db @@ -4,15 +4,15 @@ record (longin, "$(P)$(R)P001:M") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)") field (SCAN, "1 second") - field (FLNK, "$(P)$(R)P001") + field (FLNK, "$(P)$(R)VVessel-Pressure") } record (longin, "$(P)$(R)P001:E") { field (DESC, "Pressure001 exponent $(bus)") } -record (calc, "$(P)$(R)P001") +record (calc, "$(P)$(R)VVessel-Pressure") { - field (DESC, "ex ISTTOK:vacuum:Pressure_Chamber1") + field (DESC, "ISTTOK:central:VVessel-Pressure") field(INPA, "$(P)$(R)P001:M") field(INPB, "$(P)$(R)P001:E") field(CALC, "(A*0.001)*10.0**(B-20)") @@ -26,15 +26,15 @@ record (longin, "$(P)$(R)P002:M") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)") field (SCAN, "2 second") - field (FLNK, "$(P)$(R)P002") + field (FLNK, "$(P)$(R)RPump1-Pressure") } record (longin, "$(P)$(R)P002:E") { field (DESC, "Pressure002 exponent $(bus)") } -record (calc, "$(P)$(R)P002") +record (calc, "$(P)$(R)RPump1-Pressure") { - field (DESC, "Pressure_Primary1") + field (DESC, "ISTTOK:central:RPump1-Pressure") field(INPA, "$(P)$(R)P002:M") field(INPB, "$(P)$(R)P002:E") field(CALC, "(A*0.001)*10.0**(B-20)") @@ -49,16 +49,16 @@ record (longin, "$(P)$(R)P003:M") field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)") field (SCAN, "1 second") # field (SCAN, "I/O Intr") - field (FLNK, "$(P)$(R)P003") + field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") } record (longin, "$(P)$(R)P003:E") { field (DESC, "Pressure003 Exponent $(bus)") } -record (calc, "$(P)$(R)P003") +record (calc, "$(P)$(R)TMPump1-PressureAdmission") { - field(DESC, "Pressure_Primary2") + field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") field(INPA, "$(P)$(R)P003:M") field(INPB, "$(P)$(R)P003:E") field(CALC, "(A*0.001)* 10.0**(B-20)") @@ -66,21 +66,23 @@ record (calc, "$(P)$(R)P003") field(EGU, "mBar") } + record (longin, "$(P)$(R)P004:M") { field (DESC, "getPressure004 Mantissa $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)") field (SCAN, "1 second") - field (FLNK, "$(P)$(R)P004") + field (FLNK, "$(P)$(R)RPump2-Pressure") } record (longin, "$(P)$(R)P004:E") { field (DESC, "Pressure004 Exponent $(bus)") } -record (calc, "$(P)$(R)P004") + +record (calc, "$(P)$(R)RPump2-Pressure") { - field(DESC, "Pressure_TMP_Admission") + field(DESC, "ISTTOK:central:RPump2-Pressure") field(INPA, "$(P)$(R)P004:M") field(INPB, "$(P)$(R)P004:E") field(CALC, "(A*0.001)* 10.0**(B-20)") diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt index 7d1cc9f..d7593c6 100644 --- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt +++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt @@ -197,11 +197,13 @@ assign IsttokTurbo2_Emergency to "ISTTOK:central:Turbo2_Emergency"; monitor IsttokTurbo2_Emergency; float IsttokPressure_Primary1; -assign IsttokPressure_Primary1 to "ISTTOK:vacuum:Pressure_Primary1"; +/* assign IsttokPressure_Primary1 to "ISTTOK:vacuum:Pressure_Primary1"; */ +assign IsttokPressure_Primary1 to "ISTTOK:central:RPump1-Pressure"; monitor IsttokPressure_Primary1; float IsttokPressure_Primary2; -assign IsttokPressure_Primary2 to "ISTTOK:vacuum:Pressure_Primary2"; +/* assign IsttokPressure_Primary2 to "ISTTOK:vacuum:Pressure_Primary2"; */ +assign IsttokPressure_Primary2 to "ISTTOK:central:RPump2-Pressure"; monitor IsttokPressure_Primary2; float IsttokPressure_PrimaryCondition;