diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index 602dd4f..487684d 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -6,7 +6,7 @@ sleep(0.5) #TODO: Set the diplay names of positioners and detectors #ManualScan(writables, readables, start = None, end = None, steps = None, relative = False) -scan = ManualScan(['time'], ['SetVA', 'ActualVA'] , [0.0], [50.0], [10]) #????????????????????? what does this really do? what is writeables? what is readables? +scan = ManualScan(['time'], ['SetVA', 'ActualVA', 'ÁctualIA'] , [0.0], [50.0], [10]) #????????????????????? what does this do? what is writeables? what is readables? scan.start() #Creating channels: dimension 1 @@ -15,6 +15,8 @@ SetVA = Channel('PO2DV-NCS-VHQ1:Set-VA', type = 'd') #Timestamp time #ScalarDetector ActualVA ActualVA = Channel('PO2DV-NCS-VHQ1:Actual-VA', type = 'd') +#ScalarDetector ActualIA +ActualIA = Channel('PO2DV-NCS-VHQ1:Actual-IA', type = 'd') #set voltage to 0 caput('PO2DV-NCS-VHQ1:Set-VA', '0') @@ -41,10 +43,11 @@ for setpoint1 in frange(0.0, 50.0, 10.0, True): detector1 = float(java.lang.System.currentTimeMillis()) #Detector ActualVA detector2 = ActualVA.get() + detector3 = ActualIA.get() #scan.append ([setpoint1], [readback1], [detector1, detector2]) #append(setpoints, positions, values) - scan.append ([detector1], [detector1], [readback1, detector2]) #?????????????????????? what is setpoint? what is position? + scan.append ([detector1], [detector1], [readback1, detector2, detector3]) #?????????????????????? what is setpoint? is position = X-axis? print 'detector1' print detector1 sleep( 0.1 ) # Settling time