diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index 29edcdf..1d2a28a 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -33,7 +33,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, 50.0, 10.0, True): #?????????????????? What is the relationship between this FOR loop and the ManualScan? +for setpoint1 in frange(0.0, 20.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 @@ -60,7 +60,7 @@ SetVA.close() ActualVA.close() ActualIA.close() -readable = scan.readables(1) +readable = scan.readables positions = scan.writables threshold = (min(readable) + max(readable))/2