diff --git a/script/Bpm6ParallelScan.py b/script/Bpm6ParallelScan.py index e715c7a..5db8682 100644 --- a/script/Bpm6ParallelScan.py +++ b/script/Bpm6ParallelScan.py @@ -20,30 +20,33 @@ class SensorXAxis(ReadableArray): 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], samples, title = sensor.name) + r = mscan(sensor, [sensor, x_axis] + sensors, samples, title = sensor.name) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Fixed samples: " + str(samples)) 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], -1, time) + r = mscan(sensor, [sensor, x_axis] + sensors, -1, time) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Fixed time: " + str(time)) 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], samples, interval) + r = tscan([sensor, x_axis] + sensors , samples, interval) set_attribute( r.group, "Sensor", sensor.channelName) set_attribute( r.group, "Scan Type", "Time interval samples: " + str(samples) + " interval:" + str(interval)) sensors = [pico_bpm6_ts_sumall, pico_bpm6_ts_cur1, pico_bpm6_ts_cur2, pico_bpm6_ts_cur3, pico_bpm6_ts_cur4] -sensors = sensors + [pico_bpm6_fft_sumal_f_absval, pico_bpm6_fft_x_freq] +sensors = sensors + [pico_bpm6_fft_sumal_f_absval, pico_bpm6_fft_sumal_f_real, pico_bpm6_fft_sumal_f_imag, pico_bpm6_fft_x_freq] setup_plotting(line_plots = sensors, plot_list =sensors )