Changeset f4cf580 in sasmodels for sasmodels/gen.py

Timestamp:

Sep 2, 2014 1:15:40 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

87985ca

Parents:

5d4777d

Message:

resolve remaining differences between sasview and sasmodels

File:

• sasmodels/gen.py (modified) (4 diffs)

sasmodels/gen.py

@@ -352 +352 @@
   const real I = %(fn)s(%(qcall)s, %(pcall)s);
   if (I>=REAL(0.0)) { // scattering cannot be negative
-    ret += weight*I;
+    ret += weight*I%(sasview_spherical)s;
     norm += weight;
     %(volume_norm)s
@@ -364 +364 @@
 SPHERICAL_CORRECTION="""\
 // Correction factor for spherical integration p(theta) I(q) sin(theta) dtheta
-real spherical_correction = (Ntheta>1 ? fabs(cos(M_PI_180*phi)) : REAL(1.0));\
+real spherical_correction = (Ntheta>1 ? fabs(sin(M_PI_180*theta)) : REAL(1.0));\
+"""
+# Use this to reproduce sasview behaviour
+SASVIEW_SPHERICAL_CORRECTION="""\
+// Correction factor for spherical integration p(theta) I(q) sin(theta) dtheta
+real spherical_correction = (Ntheta>1 ? fabs(cos(M_PI_180*theta))*M_PI_2 : REAL(1.0));\
 """
 
@@ -472 +477 @@
     fq_pars = [p[0] for p in info['parameters'][len(COMMON_PARAMETERS):]
                if p[0] in set(fixed_pars+pd_pars)]
-    if False and "phi" in pd_pars:
+    if False and "theta" in pd_pars:
         spherical_correction = [indent(SPHERICAL_CORRECTION, depth)]
         weights = [p+"_w" for p in pd_pars]+['spherical_correction']
+        sasview_spherical = ""
+    elif "theta" in pd_pars:
+        spherical_correction = [indent(SASVIEW_SPHERICAL_CORRECTION,depth)]
+        weights = [p+"_w" for p in pd_pars]
+        sasview_spherical = "*spherical_correction"
     else:
         spherical_correction = []
         weights = [p+"_w" for p in pd_pars]
+        sasview_spherical = ""
     subst = {
         'weight_product': "*".join(weights),
@@ -484 +495 @@
         'qcall': q_pars['qcall'],
         'pcall': ", ".join(fq_pars), # skip scale and background
+        'sasview_spherical': sasview_spherical,
         }
     loop_body = [indent(LOOP_BODY%subst, depth)]