Changeset 9c79c32 in sasmodels

Timestamp:

Jan 6, 2016 9:20:31 PM (9 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:

74667d3

Parents:

8b25ee1

Message:

use cos(theta) scaling on theta polydispersity to match sasview; allow kernels to return NaN to ignore invalid parameter values

File:

• sasmodels/kernel_template.c (modified) (3 diffs)

sasmodels/kernel_template.c

@@ -204 +204 @@
 
       const double scattering = Iqxy(qxi, qyi, IQXY_PARAMETERS);
+      if (!isnan(scattering)) { // if scattering is bad, exclude it from sum
       //if (scattering >= 0.0) { // scattering cannot be negative
         // TODO: use correct angle for spherical correction
@@ -214 +215 @@
       #if defined(IQXY_HAS_THETA) // && 0
         const double spherical_correction
-          = (Ntheta>1 ? fabs(cos(M_PI_180*phi))*M_PI_2:1.0);
+          = (Ntheta>1 ? fabs(cos(M_PI_180*theta))*M_PI_2:1.0);
         const double next = spherical_correction * weight * scattering;
       #else
@@ -233 +234 @@
       #endif
         norm_vol += vol_weight;
-      //}
+      }
       //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }