Changeset 062c56d in sasmodels for sasmodels/kernel_template.c

Timestamp:

Nov 24, 2015 3:41:47 PM (8 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:

b514adf

Parents:

5753e4e

git-author:

Paul Kienzle <pkienzle@…> (11/24/15 15:38:56)

git-committer:

Paul Kienzle <pkienzle@…> (11/24/15 15:41:47)

Message:

allow negative I(q) in models

File:

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

sasmodels/kernel_template.c

@@ -125 +125 @@
     if (weight > cutoff) {
       const double scattering = Iq(qi, IQ_PARAMETERS);
-      if (scattering >= 0.0) { // scattering cannot be negative
+      //if (scattering >= 0.0) { // scattering cannot be negative
         ret += weight*scattering;
         norm += weight;
@@ -133 +133 @@
         norm_vol += vol_weight;
       #endif
-      }
+      //}
     //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }
@@ -198 +198 @@
 
       const double scattering = Iqxy(qxi, qyi, IQXY_PARAMETERS);
-      if (scattering >= 0.0) { // scattering cannot be negative
+      //if (scattering >= 0.0) { // scattering cannot be negative
         // TODO: use correct angle for spherical correction
         // Definition of theta and phi are probably reversed relative to the
@@ -219 +219 @@
       #endif
         norm_vol += vol_weight;
-      }
+      //}
       //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }