diff --git a/startup/999_user_PTA.py b/startup/999_user_PTA.py index ae91588..9c92f9e 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 @@ -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)