diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index ad032be..12562ae 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -5,8 +5,8 @@ caput('PO2DV-NCS-VHQ1:Set-RampA', '10') sleep(0.5) #TODO: Set the diplay names of positioners and detectors -#scan = ManualScan(['time'], ['SetVA', 'ActualVA'] , [0.0], [50.0], [50]) -scan = ManualScan(['time'], ['SetVA'], ['ActualVA'] , [0.0], [50.0], [50]) +#ManualScan(writables, readables, start = None, end = None, steps = None, relative = False) +scan = ManualScan(['time'], ['SetVA', 'ActualVA'] , [0.0], [50.0], [10]) scan.start() #Creating channels: dimension 1 @@ -28,7 +28,7 @@ for setpoint1 in frange(0.0, 120.0, 1.0, True): #Dimension 1 #LinearPositioner SetVA -for setpoint1 in frange(0.0, 50.0, 5.0, True): +for setpoint1 in frange(0.0, 50.0, 10.0, True): if setpoint1 > 50.0 or setpoint1 < 0.0: break SetVA.put(setpoint1, timeout=None) # TODO: Set appropriate timeout @@ -42,7 +42,11 @@ for setpoint1 in frange(0.0, 50.0, 5.0, True): #Detector ActualVA detector2 = ActualVA.get() #scan.append ([setpoint1], [readback1], [detector1, detector2]) + + #append(setpoints, positions, values) scan.append ([detector1], [detector1], [readback1, detector2]) + print 'detector1' + print detector1 sleep( 0.1 ) # Settling time #Closing channels