diff --git a/config/devices.properties b/config/devices.properties index 83df41db..98cdf479 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -17,11 +17,6 @@ SampleCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-1:READOUT 15|Read RefCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-2:READOUT 15|Read||true AuxCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CURRENT3 15|Read||true #AuxCurrentRaw=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3|Read||true -#Counts=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats5:Total_RBV 3|Read|| -#CountsR1=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats1:Total_RBV 3|Read|| -#CountsR2=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats2:Total_RBV 3|Read|| -#CountsR3=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats3:Total_RBV 3|Read|| -#CountsR4=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats4:Total_RBV 3|Read|| #sizex=ch.psi.pshell.epics.ChannelInteger|X03DA-SCIENTA:cam1:SizeX_RBV||| #lowen=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:LOW_ENERGY 6||| #highen=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:HIGH_ENERGY 6||| diff --git a/script/local.py b/script/local.py index 120dafc6..bbab99d8 100644 --- a/script/local.py +++ b/script/local.py @@ -85,14 +85,12 @@ class ImageAngleDistribution(ReadableCalibratedArray): AngleDistribution = ImageAngleDistribution() class ImageCounts(Readable): - def __init__(self): - self.x = 0.0 - def read(self): data = Scienta.dataArray.read() counts = sum(data) return counts +Counts = ImageCounts() def init_scienta(): """