diff --git a/aliases/bernina.py b/aliases/bernina.py index 6fe6dfc..cf53fd1 100755 --- a/aliases/bernina.py +++ b/aliases/bernina.py @@ -79,7 +79,8 @@ aliases = { 'SAROP21-PBPS133' : { 'alias' : 'MonOpt', 'z_und' : 133, - 'desc' : 'Intensity/position monitor after Optics hutch'}, + 'desc' : 'Intensity/position monitor after Optics hutch', + 'eco_type' : 'xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS'}, 'SAROP21-PPRM133' : { 'alias' : 'ProfOpt', 'z_und' : 133, diff --git a/eco_epics/utilities_epics.py b/eco_epics/utilities_epics.py index da34b33..06cbfae 100755 --- a/eco_epics/utilities_epics.py +++ b/eco_epics/utilities_epics.py @@ -1,9 +1,10 @@ from epics import PV class EnumWrapper: - def __init__(self,pvname): + def __init__(self,pvname,elog=None): + self._elog = elog self._pv = PV(pvname) - self.names = self.pv.enum_strs + self.names = self._pv.enum_strs self.setters = \ Positioner(\ [(nam,lambda:self.set(nam)) @@ -18,13 +19,25 @@ class EnumWrapper: assert target>0, 'set integer needs to be greater equal zero' assert target