From 9ed8f072fd827e80dde05d8840f4acef7515525f Mon Sep 17 00:00:00 2001 From: follath_r Date: Fri, 1 Sep 2017 17:10:02 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 1 + script/PbpsPosXScan.py | 8 +++----- script/local.py | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 01bc645..9723e4e 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -9,3 +9,4 @@ pbpg_my=ch.psi.pshell.epics.Motor|SARFE10-PBPG050:MOTOR_Y|||true adc_xh1=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-014-x-h1-DATA-SUM|||true adc_yh2=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-011-y-h2-DATA-SUM|||true camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| +m2rx=ch.psi.pshell.epics.Motor|SAROP21-OOMV096:W_RX|||true diff --git a/script/PbpsPosXScan.py b/script/PbpsPosXScan.py index 480a08e..eaaf74b 100644 --- a/script/PbpsPosXScan.py +++ b/script/PbpsPosXScan.py @@ -6,13 +6,12 @@ print "Starting" #Creating averaging devices -av_hamp_x = create_averager(hamp_x, count = 10, interval = -1, name = "av_hamp_x") -av_xbpm_x = create_averager(xbpm_x, count = 10, interval = -1, name = "av_xbpm_x") +av_pos_x = create_averager(pbps53_xpos, count = 10, interval = -1, name = "av_pos_x") #av_hamp_x.monitored = True -av_xbpm_x.monitored = True +#av_pos_x.monitored = True #The actuals scan -r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -0.5, 0.5, 20, latency = 0.0) +r=lscan(pbps53_mx, [av_pos_x], -0.5, 0.5, 20, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd') @@ -23,7 +22,6 @@ pars_polynomial = (a0, a1) = fit_polynomial(values, positions, 1) path = get_exec_pars().scanPath set_attribute(path, "a0", a0) set_attribute(path, "a1", a1) -#set_attribute(path, "a2", a2) #Plotting fit and writing fitting parameters outp = "a0="+ ("%0.4f" % a0) + "a1="+ ("%0.4f" % a1) diff --git a/script/local.py b/script/local.py index 7ca759e..cbadca9 100644 --- a/script/local.py +++ b/script/local.py @@ -5,6 +5,7 @@ #Device pool customization pbpg_mx.setTrustedWrite(False) pbpg_my.setTrustedWrite(False) +m2rx.setTrustedWrite(False) #Utilities