Changeset 3be2eb6 in sasview for sansmodels/src/sans/models

Timestamp:

Sep 4, 2012 11:19:20 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:

e558e0b

Parents:

469bcd9c

Message:

GuinierPorod?: removed some singular points

File:

• sansmodels/src/sans/models/GuinierPorodModel.py (modified) (1 diff)

sansmodels/src/sans/models/GuinierPorodModel.py

@@ -62 +62 @@
         n = 3.0 - s
         qval = x
-        
+        # take care of the singular points
+        if Rg <= 0.0:
+            return bgd
+        if (n-3.0+m) <= 0.0:
+            return bgd
         #do the calculation and return the function value
         q1 = sqrt((n-3.0+m)*n/2.0)/Rg