Changeset 91db958 in sasview for Invariant

Timestamp:

Jan 21, 2010 4:58:55 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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

Children:

1a2dc10

Parents:

deeba75

Message:

return properly for v, s when no parameter is sent

File:

• Invariant/invariant.py (modified) (4 diffs)

Invariant/invariant.py

@@ -940 +940 @@
         """
         if contrast is None or porod_const is None:
-            return 
+            return None
         #Check whether we have Q star
         if self._qstar is None:
@@ -973 +973 @@
         """
         if contrast is None:
-            return 
+            return None
         if contrast < 0:
             raise ValueError, "contrast must be greater than zero"  
@@ -1033 +1033 @@
         """
         if contrast is None:
-            return 
+            return None, None
         self._qstar, self._qstar_err = self.get_qstar_with_error()
         
@@ -1068 +1068 @@
         """
         if contrast is None or porod_const is None:
-            return 
+            return None, None
         v, dv = self.get_volume_fraction_with_error(contrast)
         self._qstar, self._qstar_err = self.get_qstar_with_error()