diff --git a/config/devices.properties b/config/devices.properties index 9b5ba7a..4a58621 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -44,6 +44,11 @@ pico_bpm6_ts_cur1=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:Curren pico_bpm6_ts_cur2=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:Current2:TimeSeties -1 -1 true||| pico_bpm6_ts_cur3=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:Current3:TimeSeries -1 -1 true||| pico_bpm6_ts_cur4=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:Current4:TimeSeries -1 -1 true||| +pico_bpm6_fft_sumal_f_absval=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:FFT:SumAll:FFTAbsValue -1 -1 true||| +pico_bpm6_fft_sumal_f_real=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:FFT:SumAll:FFTReal -1 -1 true||| +pico_bpm6_fft_sumal_f_imag=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:FFT:SumAll:FFTImaginary -1 -1 true||| +pico_bpm6_fft_x_freq=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:FFT:SumAll:FFTFreqAxis -1 -1 true||| + pico_bpm5_ts_sumall=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:SumAll:TimeSeries -1 -1 true||| pico_bpm5_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:TSTimeAxis||| pico_bpm5_ts_cur1=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:Current1:TimeSeries -1 -1 true||| @@ -60,9 +65,18 @@ pico_bpm3_ts_cur1=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:Curren pico_bpm3_ts_cur2=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:Current2:TimeSeties -1 -1 true||| pico_bpm3_ts_cur3=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:Current3:TimeSeries -1 -1 true||| pico_bpm3_ts_cur4=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:Current4:TimeSeries -1 -1 true||| +pico_bpm3_fft_sumal_f_absval=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:FFT:SumAll:FFTAbsValue -1 -1 true||| +pico_bpm3_fft_sumal_f_real=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:FFT:SumAll:FFTReal -1 -1 true||| +pico_bpm3_fft_sumal_f_imag=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:FFT:SumAll:FFTImaginary -1 -1 true||| +pico_bpm3_fft_x_freq=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:FFT:SumAll:FFTFreqAxis -1 -1 true||| + pico_bpm1_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:TSTimeAxis -1 -1 true||| pico_bpm1_ts_sumall=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:SumAll:TimeSeries -1 -1 true||| pico_bpm1_ts_cur1=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:Current1:TimeSeries -1 -1 true||| pico_bpm1_ts_cur2=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:Current2:TimeSeties -1 -1 true||| pico_bpm1_ts_cur3=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:Current3:TimeSeries -1 -1 true||| pico_bpm1_ts_cur4=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:Current4:TimeSeries -1 -1 true||| +pico_bpm1_fft_sumal_f_absval=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:FFT:SumAll:FFTAbsValue -1 -1 true||| +pico_bpm1_fft_sumal_f_real=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:FFT:SumAll:FFTReal -1 -1 true||| +pico_bpm1_fft_sumal_f_imag=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:FFT:SumAll:FFTImaginary -1 -1 true||| +pico_bpm1_fft_x_freq=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:FFT:SumAll:FFTFreqAxis -1 -1 true||| diff --git a/script/Bmp6TimeScan.py b/script/Bmp6TimeScan.py index 16646a1..f26d7ea 100644 --- a/script/Bmp6TimeScan.py +++ b/script/Bmp6TimeScan.py @@ -25,9 +25,9 @@ caput ("X12SA-ES1-TTL:OUT_02", "HIGH") for sensor in sensors: sensor.setMonitored(True) try: - #mscan(pico_bpm6_ts_sumall, sensors + [pico_bpm6_x_axis,], 100) # 100 samples + mscan(pico_bpm6_ts_sumall, sensors + [pico_bpm6_x_axis,], 100) # 100 samples #mscan(pico_bpm6_ts_sumall, sensors, -1, 2.0) #Samples for 2s - tscan(pico_bpm6_ts_sumall, 100, 0.01) #100 samples every 0.01s + #tscan(pico_bpm6_ts_sumall, 100, 0.1) #100 samples every 0.1s finally: for sensor in sensors: sensor.setMonitored(False) caput ("X12SA-ES1-TTL:OUT_02", "LOW")