diff --git a/services/taupct/current/app/src/agebd_taupct/service.py b/services/taupct/current/app/src/agebd_taupct/service.py index ec2f515..2b0f9bb 100644 --- a/services/taupct/current/app/src/agebd_taupct/service.py +++ b/services/taupct/current/app/src/agebd_taupct/service.py @@ -3,7 +3,7 @@ from time import sleep import numpy as np from epics import dbr -from agebd.pv import get_pv_class +from agebd.pv import get_pv_class, get_pv_external_class from agebd.service.base import BaseService from agebd.service.pvs import BasePVs from agebd.utils import printgetversion @@ -11,6 +11,7 @@ from agebd.utils import printgetversion __version__ = printgetversion(__file__) PV = get_pv_class() +PV_EXTERNAL = get_pv_external_class() class PVs(BasePVs): @@ -26,15 +27,14 @@ class PVs(BasePVs): inj_rate_err = PV("AGEBD-TAUPCT:INJRATE-ERR.VAL") ## Service specific PVs from other IOCs - inj_active = PV("AGEBD-PARAMS:INJECTION-ACTIVE.VAL") - dump_valve = PV("ARS01-VVPG-0210:PLC_STATUS.VAL") + inj_active = PV_EXTERNAL("AGEBD-PARAMS:INJECTION-ACTIVE.VAL") + dump_valve = PV_EXTERNAL("ARS01-VVPG-0210:PLC_STATUS.VAL") def __init__(self, service_name: str, pv_factory=PV): super().__init__(service_name, pv_factory) - PV = pv_factory - self.CallbackPV = PV("ARS07-CECL-DPCT0:CURR.VAL", auto_monitor=dbr.DBE_VALUE) - # CallbackPV = PV('ARS07-DPCT-0000:AVG-CURR.VAL', auto_monitor = dbr.DBE_VALUE) + self.CallbackPV = PV_EXTERNAL("ARS07-CECL-DPCT0:CURR.VAL", auto_monitor=dbr.DBE_VALUE) + # CallbackPV = PV_EXTERNAL('ARS07-DPCT-0000:AVG-CURR.VAL', auto_monitor = dbr.DBE_VALUE) # ARS07-DPCT-0000:CURR (5 Hz, i.e., dt = 0.2 s) # ARS07-DPCT-0000:AVG-CURR (5 Hz, i.e., dt = 0.2 s)