From d5b699da204ba791d69043ff4ac125621590e5d8 Mon Sep 17 00:00:00 2001 From: sfop Date: Mon, 3 Apr 2017 08:45:51 +0200 Subject: [PATCH] Script execution --- script/RFscan/SchottkyScan.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index b58acc4..37ee149 100644 --- a/script/RFscan/SchottkyScan.py +++ b/script/RFscan/SchottkyScan.py @@ -1,8 +1,8 @@ import ch.psi.pshell.epics.ControlledVariable as ControlledVariable if get_exec_pars().source == CommandSource.ui: - start = 50.0 - stop = 230.0 + start = -45.0 + stop = 180.0 step = 5.0 nb = 1 lat = 0.100 @@ -14,17 +14,16 @@ else: lat = args[4] -phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE-SIM", "SINEG01-RSYS:GET-VSUM-PHASE-SIM") +phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:GET-VSUM-PHASE") phase.config.minValue =-45.0 phase.config.maxValue = 360.0 phase.config.resolution = 0.5 phase.initialize() -#st = Stream("ICTstream", dispatcher) -#q = st.addScalar("Charge", "SINEG01-DICT215:B1_CHARGE-SIM", 1, 0) -#st.initialize() -#st.start(True) -q = Channel("SINEG01-DICT215:B1_CHARGE-SIM", type = 'd', alias='ICT-Q') +st = Stream("ICTstream", dispatcher) +q = st.addScalar("Charge", "SINEG01-DICT215:B1_CHARGE", 1, 0) +st.initialize() +st.start(True) try: qb = create_averager(q, nb, 0.100) @@ -34,11 +33,9 @@ try: chargerms = [val.stdev for val in r.getReadable(0)] finally: phase.close() - q.close() - #st.close() + st.close() #Setting the return value -#set_return(50.0) y = charge x = rf_phase index_max = y.index(max(y))