From c7aae03ed71da4d5ab97c677d0bd70ea38a8ff04 Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Thu, 10 Aug 2017 15:00:07 +0200 Subject: [PATCH] Script execution --- script/Bpm6ParallelScan.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/script/Bpm6ParallelScan.py b/script/Bpm6ParallelScan.py index a3e0b71..2449ff6 100644 --- a/script/Bpm6ParallelScan.py +++ b/script/Bpm6ParallelScan.py @@ -68,16 +68,9 @@ caputq ("X12SA-OP-BPM6:TS:TSAcquire", 1) for sensor in sensors: sensor.setMonitored(True) caput ("X12SA-ES1-TTL:OUT_02", "HIGH") +set_parallel_layout() -import ch.psi.pshell.data.LayoutDefault as LayoutDefault - -class LayoutParallelScan(LayoutDefault): - def getDefaultGroup(self, scan): - return scan.writables.[0].name - -set_exec_pars(layout = LayoutParallelScan()) - #x_axis = SensorXAxis(pico_bpm6_ts_sumall) #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) @@ -103,8 +96,8 @@ try: #parallelize([fixed_time_scan, [pico_bpm6_ts_sumall, time]], [fixed_time_scan, [pico_bpm6_ts_cur1, time]], \ # [fixed_time_scan, [pico_bpm6_ts_cur2, time]], [fixed_time_scan, [pico_bpm6_ts_cur3, time]], \ # [fixed_time_scan, [pico_bpm6_ts_cur4, time]]) -finally: - set_exec_pars(layout = LayoutDefault()) +finally: + set_default_layout() for sensor in sensors: sensor.setMonitored(False) caput ("X12SA-ES1-TTL:OUT_02", "LOW") caputq ("X12SA-OP-BPM6:TS:TSAcquire", 0)