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

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'

Location:

src/sas/sascalc/calculator

Files:

• resolution_calculator.py (modified) (1 diff)
• sas_gen.py (modified) (2 diffs)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -608 +608 @@
         a_value *= 1.0E-16
         # if lamda is give (broad meanning of A)  return 2* lamda^2 * A
-        if lamda != None:
+        if lamda is not None:
             a_value *= (4 * lamda * lamda)
         return a_value

src/sas/sascalc/calculator/sas_gen.py

@@ -691 +691 @@
             output.set_pix_type('pixel')
             output.set_pixel_symbols('pixel')
-            if vol_pix != None:
+            if vol_pix is not None:
                 output.set_pixel_volumes(vol_pix)
             return output
@@ -867 +867 @@
         self.sld_theta = None
         self.pix_symbol = None
-        if sld_mx != None and sld_my != None and sld_mz != None:
+        if sld_mx is not None and sld_my is not None and sld_mz is not None:
             self.set_sldms(sld_mx, sld_my, sld_mz)
         self.set_nodes()