diff --git a/config/devices.properties b/config/devices.properties index d2a94fb..a46942f 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -28,7 +28,16 @@ scaler=ch.psi.pshell.epics.Scaler|X12SA-ES1-SCALER||| pico_amp_bpm3=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:image1:ArrayData|||true pico_amp_bpm5=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:image1:ArrayData|||false pico_amp_bpm5_new=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-PC-BPM5:AH501:image1:ArrayData|||false -pico_bpm5_new_range=ch.psi.pshell.epics.ChannelString|X12SA-PC-BPM5:AH501:Range_RBV|||true -pico_bpm6_new=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:SumAll:TimeSeries -1 -1 true|||false -pico_bpm6_new_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:TSTimeAxis||| -pico_bpm5_new=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:SumAll:TimeSeries -1 -1 true||| +pico_bpm5_range=ch.psi.pshell.epics.ChannelString|X12SA-PC-BPM5:AH501:Range_RBV|||true +pico_bpm6_ts_sumall=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:SumAll:TimeSeries -1 -1 true|||false +pico_bpm6_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM6:TS:TSTimeAxis||| +pico_bpm5_ts_sumall=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:SumAll:TimeSeries -1 -1 true||| +pico\u0020_bpm5_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM5:TS:TSTimeAxis||| +pico_bpm3_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:TSTimeAxis||| +pico_bpm1_ts_x=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM1:TS:TSTimeAxis||| +pico_bpm3_ts_sumall=ch.psi.pshell.epics.ChannelDoubleArray|X12SA-OP-BPM3:TS:SumAll:TimeSeries -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||| diff --git a/script/local.py b/script/local.py index d0656dc..9a26826 100644 --- a/script/local.py +++ b/script/local.py @@ -84,6 +84,19 @@ class PicoAmp(DeviceBase, Stoppable): def isReady(self): return caget (self.prefix + "Current4:TSAcquiring") == "Done" + +################################################################################################### +#Scripted dvice instantiation +################################################################################################### + +import ch.psi.pshell.epics.ChannelDoubleArray as ChannelDoubleArray +for bpm in [1, 3, 5, 6]: + for cur in range(4): + dev = ChannelDoubleArray("pico_bpm" + str(bpm) + "_ts_cur" + str(cur+1), "X12SA-OP-BPM" + str(bpm) + ":TS:Current" + str(cur+1) + ":TimeSeries", -1, -1, True) + add_device( dev, True) + #dev.monitored = True + #dev.polling = 3000 + #add_device(PicoAmp("pico_amp", "X12SA-PC-BPM5:AH501:"), force = True) #add_device(PicoAmp("pico_amp_2", "X12SA-PC-BPM5:AH501:"), force = True) add_device(PicoAmp("pico_amp", "X12SA-OP-BPM5:"), force = True)