Changeset 07eb396 in sasview for sansinvariant/src/sans/invariant

Timestamp:

Jul 19, 2012 11:07:32 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

3df5ecf

Parents:

80ff71e

Message:

Invaraint freeze fix

File:

• sansinvariant/src/sans/invariant/invariant.py (modified) (1 diff)

sansinvariant/src/sans/invariant/invariant.py

@@ -132 +132 @@
         """
         self.scale = math.exp(constant)
+        if slope > 0:
+            slope = 0.0
         self.radius = math.sqrt(-3 * slope)
-        
         # Errors
         self.dscale = math.exp(constant)*dconstant
-        self.dradius = -3.0/2.0/math.sqrt(-3 * slope)*dslope
+        if slope == 0.0:
+            n_zero = -1.0e-24
+            self.dradius = -3.0/2.0/math.sqrt(-3 * n_zero)*dslope
+        else:
+            self.dradius = -3.0/2.0/math.sqrt(-3 * slope)*dslope
         
         return [self.radius, self.scale], [self.dradius, self.dscale]