scnc
/
pyFAI
mirror of https://github.com/silx-kit/pyFAI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

isnan(None) fails under certain versions of numpy

This commit is contained in:
Jerome Kieffer 2019-05-17 14:49:36 +02:00
parent a539b17587
commit 1b2676710e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pyFAI/gui/tasks/GeometryTask.py
View File

@ -27,7 +27,7 @@ from __future__ import absolute_import
__authors__ = ["V. Valls"]
__license__ = "MIT"
__date__ = "16/05/2019"
__date__ = "17/05/2019"
import logging
import numpy
@ -110,7 +110,7 @@ class _StatusBar(qt.QStatusBar):
self.clearValues()
def clearValues(self):
self.setValues(None, None, float("nan"), float("nan"), float("nan"))
self.setValues(None, None, numpy.nan, numpy.nan, numpy.nan)
def setValues(self, x, y, pixel, chi, tth):
if x is None:
@ -120,15 +120,16 @@ class _StatusBar(qt.QStatusBar):
self.__position.setValue(pos)
self.__pixel.setValue(pixel)
self.__chi.setValue(chi)
tth = numpy.nan if tth is None else tth
self.__2theta.setValue(tth)
if not numpy.isnan(tth):
# NOTE: warelength could be updated, and the the display would not
# NOTE: wavelength could be updated, and the the display would not
# be updated. But here it is safe enougth.
wavelength = CalibrationContext.instance().getCalibrationModel().fittedGeometry().wavelength().value()
q = unitutils.from2ThRad(tth, core_units.Q_A, wavelength)
self.__q.setValue(q)
else:
self.__q.setValue(float("nan"))
self.__q.setValue(numpy.nan)
class CalibrationState(qt.QObject):