From 098304eb5c50339aa4def78ac25f3865a99c701c Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Tue, 6 Sep 2016 17:30:46 +0200 Subject: [PATCH] Script execution --- script/OPD_accurracy_check_scan.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/script/OPD_accurracy_check_scan.py b/script/OPD_accurracy_check_scan.py index 3bfe188..7dfc44c 100644 --- a/script/OPD_accurracy_check_scan.py +++ b/script/OPD_accurracy_check_scan.py @@ -38,12 +38,12 @@ set_context(path = "{data}/{year}_{month}/{date}/{date}_{time}_" + str(SECTION) import ch.psi.pshell.epics.ChannelDouble as PV # controlled variabales -cv_kly_pow = PV("phase_ref", SECTION + "-RSYS:SET-KLY-POWER") +cv_kly_pow = PV("set_power", SECTION + "-RSYS:SET-KLY-POWER") cv_kly_headroom = PV("headroom" , SECTION + "-RHLA-JOBRMP:SET-KLY-POWER-HR") # measured variables -mv_kly_pow_avg = PV("REF_amplt_jit" ,SECTION + "-RKLY-DCP10:FOR-POWER-AVG") -mv_kly_pow_avg_gated = PV("REF_amplt_jit" ,SECTION + "-RKLY-DCP10:FOR-POWER-AVG-GATED") +mv_kly_pow_avg = PV("meas_power" ,SECTION + "-RKLY-DCP10:FOR-POWER-AVG") +mv_kly_pow_avg_gated = PV("meas_power_gated" ,SECTION + "-RKLY-DCP10:FOR-POWER-AVG-GATED") # auxiliary measured variables, but not scanned @@ -66,8 +66,7 @@ mv_kly_pow_avg_gated.initialize() - scan_result = ascan((cv_kly_pow, cv_kly_headroom), (mv_kly_pow_avg,mv_kly_pow_avg_gated), ( 1.0, 0), (17.0, 0.1), (1.0, 0.05) , latency=latency, title="OPD Power Scan", zigzag=False) -%scan_result = ascan((cv_rf_amplt, cv_rf_phase), (mv_ref_jit_amplt,mv_ref_jit_phase,mv_iqm_jit_amplt,mv_iqm_jit_phase,mv_pre_jit_amplt,mv_pre_jit_phase,mv_kly_jit_amplt,mv_kly_jit_phase,mv_vsum_jit_amplt,mv_vsum_jit_phase), ( 0.2, -170.0), (0.3, 180.0), (0.05, 10.0) , latency=latency, title="OPD Power Scan", zigzag=False) +scan_result = ascan((cv_kly_pow, cv_kly_headroom), (mv_kly_pow_avg,mv_kly_pow_avg_gated), ( 1.0, 0), (17.0, 0.1), (1.0, 0.05) , latency=latency, title="OPD Power Scan", zigzag=False)