diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index f7ac36d..4ca3724 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -20,7 +20,7 @@ ActualIA = Channel('PO2DV-NCS-VHQ1:Actual-IA', type = 'd') #set voltage to 0 print 'Ramping down power supply to 0V' -caput('PO2DV-NCS-VHQ1:Set-VA', '0') +SetVA.put(0.0, timeout=None) #wait up to 2 minutes for voltage to be ~0 for setpoint1 in frange(0.0, 120.0, 1.0, True): @@ -32,7 +32,7 @@ for setpoint1 in frange(0.0, 120.0, 1.0, True): #Dimension 1 #LinearPositioner SetVA print 'Ramping up power supply' -for setpoint1 in frange(0.0, 80.0, 10.0, True): +for setpoint1 in frange(0.0, 50.0, 10.0, True): #?????????????????? What is the relationship between this FOR loop and the ManualScan? if setpoint1 > 50.0 or setpoint1 < 0.0: break SetVA.put(setpoint1, timeout=None) # TODO: Set appropriate timeout