diff --git a/script/Bpm6ParallelScan.py b/script/Bpm6ParallelScan.py index 79fbe52..a7d5ab3 100644 --- a/script/Bpm6ParallelScan.py +++ b/script/Bpm6ParallelScan.py @@ -23,7 +23,7 @@ def fixed_samples_scan(sensor, samples): global sensors x_axis = SensorXAxis(sensor) set_device_alias(x_axis, sensor.name+"_x_axis") - r = mscan(sensor, [sensor, x_axis] + sensors, samples, title = sensor.name) + r = mscan(sensor, [sensor, x_axis] , samples, title = sensor.name) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Fixed samples: " + str(samples)) @@ -31,7 +31,7 @@ def fixed_time_scan(sensor, time): global sensors x_axis = SensorXAxis(sensor) set_device_alias(x_axis, sensor.name+"_x_axis") - r = mscan(sensor, [sensor, x_axis] + sensors, -1, time) + r = mscan(sensor, [sensor, x_axis] , -1, time) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Fixed time: " + str(time)) @@ -40,7 +40,7 @@ def time_interval_scan(sensor, samples, interval): global sensors x_axis = SensorXAxis(sensor) set_device_alias(x_axis, sensor.name+"_x_axis") - r = tscan([sensor, x_axis] + sensors , samples, interval) + r = tscan([sensor, x_axis] , samples, interval) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Time interval samples: " + str(samples) + " interval:" + str(interval)) @@ -60,7 +60,7 @@ caput ("X12SA-ES1-TTL:OUT_02", "HIGH") #r = tscan([pico_bpm6_ts_sumall, pico_bpm6_ts_cur1, pico_bpm6_ts_cur2, pico_bpm6_ts_cur3, pico_bpm6_ts_cur4, x_axis], 10, 0.2) try: - time_interval_scan(pico_bpm6_ts_sumall, 10, 0.001)\ + time_interval_scan(pico_bpm6_ts_sumall, 10, 0.001) samples = 10 parallelize([fixed_samples_scan, [pico_bpm6_ts_sumall, samples]], [fixed_samples_scan, [pico_bpm6_ts_cur1, samples]], \ [fixed_samples_scan, [pico_bpm6_ts_cur2, samples]], [fixed_samples_scan, [pico_bpm6_ts_cur3, samples]], \