Changeset 7432acb in sasview for src/sas/sascalc/invariant

Timestamp:

Apr 9, 2017 6:11:31 AM (8 years ago)

Author:

andyfaff

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

45dffa69

Parents:

ac07a3a

Message:

MAINT: search+replace '!= None' by 'is not None'

File:

• src/sas/sascalc/invariant/invariant.py (modified) (3 diffs)

src/sas/sascalc/invariant/invariant.py

@@ -329 +329 @@
 
         ##power is given only for function = power_law
-        if power != None:
+        if power is not None:
             sigma2 = linearized_data.dy * linearized_data.dy
             a = -(power)
@@ -389 +389 @@
         self._data = self._get_data(data)
         # get the dxl if the data is smeared: This is done only once on init.
-        if self._data.dxl != None and self._data.dxl.all() > 0:
+        if self._data.dxl is not None and self._data.dxl.all() > 0:
             # assumes constant dxl
             self._smeared = self._data.dxl[0]
@@ -579 +579 @@
 
         result_data = LoaderData1D(x=q, y=iq, dy=diq)
-        if self._smeared != None:
+        if self._smeared is not None:
             result_data.dxl = self._smeared * np.ones(len(q))
         return result_data