From 0480072aee40474e94ccc08e78134a57cc35d8a5 Mon Sep 17 00:00:00 2001 From: nmaytan Date: Tue, 20 Jun 2023 11:33:18 -0400 Subject: [PATCH 1/2] Update PV signal suffix for trigger system input monitor --- startup/999_user_PTA.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/startup/999_user_PTA.py b/startup/999_user_PTA.py index ae91588..83e9c7d 100644 --- a/startup/999_user_PTA.py +++ b/startup/999_user_PTA.py @@ -131,8 +131,8 @@ class Laser(Device): # Read inputs # 1 = PV trigger, 2 = physical trigger - input1 = Cpt(EpicsSignalRO, 'Input:1-RB') - input2 = Cpt(EpicsSignalRO, 'Input:2-RB') + input1 = Cpt(EpicsSignalRO, 'Input:1-Sts') + input2 = Cpt(EpicsSignalRO, 'Input:2-Sts') # Enable/disable trigger inputs # 1 = PV trigger, 2 = physical trigger From 1fe5cebf779559172b7d5c59525db4f256a0af2b Mon Sep 17 00:00:00 2001 From: nmaytan Date: Fri, 23 Jun 2023 10:53:28 -0400 Subject: [PATCH 2/2] Add PVs for laser voltage input --- startup/999_user_PTA.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/startup/999_user_PTA.py b/startup/999_user_PTA.py index 83e9c7d..9c92f9e 100644 --- a/startup/999_user_PTA.py +++ b/startup/999_user_PTA.py @@ -149,6 +149,10 @@ class Laser(Device): # Override only works when trigger disabled manual_button = Cpt(PairSEL, 'Output:1') + # Set voltage to control laser intensity + # Volts units + laser_voltage = Cpt(PairSP, 'LaserVoltsSet:1') + def manual_mode(self): yield from bps.mv(self.trigger, 0)