diff --git a/script/RFscan/GunScan.py b/script/RFscan/GunScan.py index c37b8c0..3df5e52 100644 --- a/script/RFscan/GunScan.py +++ b/script/RFscan/GunScan.py @@ -28,12 +28,22 @@ camtool.start("simulation") x = camtool.getValue("gr_x_fit_mean") dx = camtool.getValue("gr_x_fit_standard_deviation") +class FitMean(Readable): + def read(self): + return camtool.getValue("gr_x_fit_mean") + +class FitStdev(Readable): + def read(self): + return camtool.getValue("gr_x_fit_standard_deviation") + #x = Channel("SINEG01-DSCR190:X-SIM", type = 'd', alias='SCR-X') #dx = Channel("SINEG01-DSCR190:DX-SIM", type = 'd', alias='SCR-DX') try: - r = lscan(phase, [x, dx], start, stop, step , latency=lat) + xb = create_averager(FitMean(), nb, 0.100) + dxb = create_averager(FitStdev(), nb, 0.100) + r = lscan(phase, [xb, dxb], start, stop, step , latency=lat) rf_phase = r.getPositions(0) E = [val.mean/1000.0/disp*energy0 for val in r.getReadable(0)] dE = [val.mean/1000.0/disp*energy0 for val in r.getReadable(1)]