Changeset e262dd6 in sasmodels for explore/beta/sasfit_compare.py

Timestamp:

Jul 6, 2018 10:49:00 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

9f2216f

Parents:

0076d6e

Message:

futher cleanup; include Yun's hardsphere and sphere models from matlab

File:

• explore/beta/sasfit_compare.py (modified) (4 diffs)

explore/beta/sasfit_compare.py

@@ -222 +222 @@
     if radius_effective is None:
         radius_effective = radius_eff/total_weight
-    SQ = hardsphere_simple(q, radius_effective, volfraction)
     if norm == 'sasfit':
-        beta = F1**2/F2
-        SQ_EFF = 1 + beta*(SQ - 1)
         IQD = F2
-        IQSD = IQD*SQ
-        IQBD = IQD*SQ_EFF
     elif norm == 'sasview':
-        SQ_EFF = None
         # Note: internally, sasview uses F2/total_volume because:
         #   average_volume = total_volume/total_weight
@@ -237 +231 @@
         #     = F2/total_volume
         IQD = F2/average_volume*1e-4*volfraction
-        IQSD = IQD*SQ
-        IQBD = None
     elif norm == 'yun':
-        #F1 /= average_volume
-        #F2 /= average_volume**2
         F1 *= 1e-6  # Yun is using sld in 1/A^2, not 1e-6/A^2
         F2 *= 1e-12
-        beta = F1**2/F2
-        SQ_EFF = 1 + beta*(SQ - 1)
         IQD = F2/average_volume*1e8*volfraction
-        IQSD = IQD*SQ
-        IQBD = IQD*SQ_EFF
+    SQ = hardsphere_simple(q, radius_effective, volfraction)
+    beta = F1**2/F2
+    SQ_EFF = 1 + beta*(SQ - 1)
+    IQSD = IQD*SQ
+    IQBD = IQD*SQ_EFF
     return Theory(Q=q, F1=F1, F2=F2, P=IQD, S=SQ, I=IQSD, Seff=SQ_EFF, Ibeta=IQBD)
 
@@ -279 +270 @@
     if radius_effective is None:
         radius_effective = radius
-    SQ = hardsphere_simple(q, radius_effective, volfraction)
-    volume = 4./3.*pi*radius**3
     average_volume = total_volume/total_weight
     if norm == 'sasfit':
-        beta = F1**2/F2
-        SQ_EFF = 1 + beta*(SQ - 1)
         IQD = F2
-        IQSD = IQD*SQ
-        IQBD = IQD*SQ_EFF
     elif norm == 'sasview':
-        SQ_EFF = None
         IQD = F2/average_volume*1e-4*volfraction
-        IQSD = IQD*SQ
-        IQBD = None
     elif norm == 'yun':
-        # Note: yun uses gauss limits from R0/10 to R0 + 5 sigma steps sigma/100
-        # With pd = 0.1, that's 14 sigma, or 1400 points.
         F1 *= 1e-6  # Yun is using sld in 1/A^2, not 1e-6/A^2
         F2 *= 1e-12
-        beta = F1**2/F2
-        SQ_EFF = 1 + beta*(SQ - 1)
         IQD = F2/average_volume*1e8*volfraction
-        IQSD = IQD*SQ
-        IQBD = IQD*SQ_EFF
+    SQ = hardsphere_simple(q, radius_effective, volfraction)
+    beta = F1**2/F2
+    SQ_EFF = 1 + beta*(SQ - 1)
+    IQSD = IQD*SQ
+    IQBD = IQD*SQ_EFF
     return Theory(Q=q, F1=F1, F2=F2, P=IQD, S=SQ, I=IQSD, Seff=SQ_EFF, Ibeta=IQBD)
 
@@ -454 +435 @@
 
 def compare_yun_sphere_gauss():
+    # Note: yun uses gauss limits from R0/10 to R0 + 5 sigma steps sigma/100
+    # With pd = 0.1, that's 14 sigma and 1400 points.
     pars = {
         'radius': 20, 'radius_pd': 0.1, 'radius_pd_type': 'gaussian',