Changeset f2ea95a in sasview for src/sas/sascalc/realspace

Timestamp:

Jun 16, 2017 12:51:12 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

940d034, fca1f50

Parents:

c0ef8da (diff), d9c1551 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-510

Location:

src/sas/sascalc/realspace

Files:

• VolumeCanvas.py (modified) (3 diffs)
• __init__.py (modified) (3 diffs)

src/sas/sascalc/realspace/VolumeCanvas.py

@@ -293 +293 @@
         """
         # If the handle is not provided, create one
-        if id == None:
+        if id is None:
             id = shapeDesc.params["type"]+str(self.shapecount)
          
@@ -325 +325 @@
         """
         # If the handle is not provided, create one
-        if id == None:
+        if id is None:
             id = "shape"+str(self.shapecount)
  
@@ -663 +663 @@
         # If this is the first simulation call, we need to generate the
         # space points
-        if self.points == None:
+        if self.points is None:
             self._create_modelObject()
             
             # Protect against empty model
-            if self.points == None:
+            if self.points is None:
                 return 0
                

src/sas/sascalc/realspace/__init__.py

@@ -1 +1 @@
 """
     Real-Space Modeling for SAS
-""" 
+"""
 ## \mainpage Real-Space Modeling for SAS
 #
 # \section intro_sec Introduction
-# This module provides SAS scattering intensity simulation 
+# This module provides SAS scattering intensity simulation
 # based on real-space modeling.
 #
-# Documentation can be found here: 
+# Documentation can be found here:
 #    http://danse.us/trac/sas/wiki/RealSpaceModeling
 #
@@ -37 +37 @@
 #
 # \section overview_sec Package Overview
-# 
+#
 # \subsection class Class Diagram:
 # \image html real-space-class-diagram.png
@@ -78 +78 @@
 # \section help_sec Contact Info
 # Code and Documentation by Jing Zhou as part of the DANSE project.
-