From 70f3467f66faa603503905ace2cafe48c39f5bf1 Mon Sep 17 00:00:00 2001 From: kalt_r Date: Tue, 28 Jun 2016 11:29:39 +0200 Subject: [PATCH] added --- script/jitter_scan.py | 20 ++++++++++---------- script/local.py | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/script/jitter_scan.py b/script/jitter_scan.py index ccc0ec6..32785a6 100644 --- a/script/jitter_scan.py +++ b/script/jitter_scan.py @@ -18,22 +18,22 @@ print "Stop = ", stop print "Step = ", step # controlled variabales -#cv_rf_phase = Channel(SECTION + "-RLLE-DSP:PHASE-REFERENCE") -#cv_rf_amplt = Channel(SECTION + "-RLLE-DSP:AMPLT-REFERENCE") +#cv_rf_phase = ChannelDouble(SECTION + "-RLLE-DSP:PHASE-REFERENCE") +#cv_rf_amplt = ChannelDouble(SECTION + "-RLLE-DSP:AMPLT-REFERENCE") # measured variables -#mv_ref_jit_amplt = Channel(SECTION + "-RLLE-REF10:SIG-AMPLT-JIT-P2P-REL") -#mv_ref_jit_PHASE = Channel(SECTION + "-RLLE-REF10:SIG-PHASE-JIT-P2P") +#mv_ref_jit_amplt = ChannelDouble(SECTION + "-RLLE-REF10:SIG-AMPLT-JIT-P2P-REL") +#mv_ref_jit_PHASE = ChannelDouble(SECTION + "-RLLE-REF10:SIG-PHASE-JIT-P2P") -#mv_iqm_jit_amplt = Channel(SECTION + "-RIQM-DCP10:FOR-AMPLT-JIT-P2P-REL") -#mv_iqm_jit_PHASE = Channel(SECTION + "-RIQM-DCP10:FOR-PHASE-JIT-P2P") +#mv_iqm_jit_amplt = ChannelDouble(SECTION + "-RIQM-DCP10:FOR-AMPLT-JIT-P2P-REL") +#mv_iqm_jit_PHASE = ChannelDouble(SECTION + "-RIQM-DCP10:FOR-PHASE-JIT-P2P") -#mv_pre_jit_amplt = Channel(SECTION + "-RPRE-DCP10:FOR-AMPLT-JIT-P2P-REL") -#mv_pre_jit_PHASE = Channel(SECTION + "-RPRE-DCP10:FOR-PHASE-JIT-P2P") +#mv_pre_jit_amplt = ChannelDouble(SECTION + "-RPRE-DCP10:FOR-AMPLT-JIT-P2P-REL") +#mv_pre_jit_PHASE = ChannelDouble(SECTION + "-RPRE-DCP10:FOR-PHASE-JIT-P2P") -#mv_kly_jit_amplt = Channel(SECTION + "-RKLY-DCP10:FOR-AMPLT-JIT-P2P-REL") -#mv_kly_jit_PHASE = Channel(SECTION + "-RKLY-DCP10:FOR-PHASE-JIT-P2P") +#mv_kly_jit_amplt = ChannelDouble(SECTION + "-RKLY-DCP10:FOR-AMPLT-JIT-P2P-REL") +#mv_kly_jit_PHASE = ChannelDouble(SECTION + "-RKLY-DCP10:FOR-PHASE-JIT-P2P") diff --git a/script/local.py b/script/local.py index a724ce5..5189eb5 100755 --- a/script/local.py +++ b/script/local.py @@ -89,7 +89,8 @@ def hfit(ydata, xdata = None): return (amplitude, angular_frequency, phase, fit_max) - +# elog entry to LLRF ELOG https://elog-gfa.psi.ch/LLRF/?rsort=When +# example: elogllrf("Hallo Test", "Das ist meine Nachricht...","LLRF", "General", "SINEG01") def elogllrf(subject, message, system, subsystem, section, attachments = []): """ Add entry to ELOG.