Skip to content

Commit b98d4ef

Browse files
committed
return scalars as doubles
1 parent d4a7956 commit b98d4ef

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

camera/Xspress3.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ def ReadHistogram(self, argin):
180180
def ReadScalers(self, argin):
181181
data = _Xspress3Camera.readScalers(*argin)
182182
__dataflat_cache = numpy.array(data.buffer.ravel())
183-
if _Xspress3Camera.getUseDtc():
184-
__dataflat_cache.dtype = numpy.double
185-
else:
186-
__dataflat_cache.dtype = numpy.uint32
183+
__dataflat_cache.dtype = numpy.double
187184
data.releaseBuffer()
188185
return __dataflat_cache
189186

@@ -468,7 +465,7 @@ class Xspress3Class(PyTango.DeviceClass):
468465
[PyTango.DevVarULongArray,"the histogram data"]],
469466
'ReadScalers':
470467
[[PyTango.DevVarLongArray,"frame, channel"],
471-
[PyTango.DevVarULongArray,"the scaler data"]],
468+
[PyTango.DevVarDoubleArray,"the scaler data"]],
472469
'StartScope':
473470
[[PyTango.DevVoid, "none"],
474471
[PyTango.DevVoid, "none"]],

0 commit comments

Comments
 (0)