diff --git a/phoenix_bec/devices/phoenix_trigger.py b/phoenix_bec/devices/phoenix_trigger.py index 2d6426c..232a709 100644 --- a/phoenix_bec/devices/phoenix_trigger.py +++ b/phoenix_bec/devices/phoenix_trigger.py @@ -52,11 +52,11 @@ class PhoenixTriggerSetup(CustomDetectorMixin): def on_done(self): - done = self.parent.smpl_done.get() - return done - - def on_done_cpt(self): - done = self.parent.smpl_done_cpt.get() + done_out = self.parent.smpl_done.get() + if done_out =='1': + done=True + if done_out == '0': + done=False return done def on_dwell(self,t): @@ -243,19 +243,10 @@ class PhoenixTrigger(PSIDetectorBase): intr_count = Cpt(EpicsSignal,'INTR-COUNT') # conter run up total_cycles = Cpt(EpicsSignal,'TOTAL-CYCLES') # cycles set smpl = Cpt(EpicsSignal,'SMPL') # start sampling --> aquire - # Done field is of type bi - smpl_done_cpt = Cpt(EpicsSignal,'SMPL-DONE') # show trigger is done - smpl_done = EpicsSignal(name='SMPL-DONE',read_pv='X07MB-OP2:SMPL') + # Signal is of type string + smpl_done = Cpt(EpicsSignal,'SMPL-DONE',string=True) # show trigger is done - def SMPL(): - s= EpicsSignal(name='SMPL-DONE',read_pv='X07MB-OP2:SMPL') - return s - - # link to reasonable names - # start with a_ to see functions quicklz in listing - # - # def a_acquire(self): self.custom_prepare.on_acquire() @@ -269,9 +260,5 @@ class PhoenixTrigger(PSIDetectorBase): done=self.custom_prepare.on_done() return done - def a_done_cpt(self): - done=self.custom_prepare.on_done_cpt() - return done - def a_dwell(self): self.custom_prepare.on_dwell() \ No newline at end of file