From b8174c2c9bd45a24c3a04b242d68a1aee843eeed Mon Sep 17 00:00:00 2001 From: sfop Date: Mon, 3 Apr 2017 08:44:58 +0200 Subject: [PATCH] Script execution --- script/RFscan/SchottkyScan.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index 37ee149..b58acc4 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 = -45.0 - stop = 180.0 + start = 50.0 + stop = 230.0 step = 5.0 nb = 1 lat = 0.100 @@ -14,16 +14,17 @@ else: lat = args[4] -phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:GET-VSUM-PHASE") +phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE-SIM", "SINEG01-RSYS:GET-VSUM-PHASE-SIM") 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", 1, 0) -st.initialize() -st.start(True) +#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') try: qb = create_averager(q, nb, 0.100) @@ -33,9 +34,11 @@ try: chargerms = [val.stdev for val in r.getReadable(0)] finally: phase.close() - st.close() + q.close() + #st.close() #Setting the return value +#set_return(50.0) y = charge x = rf_phase index_max = y.index(max(y))