Changeset 60eab2a in sasmodels for sasmodels/kernel_iq.c

Timestamp:

Mar 24, 2016 6:12:07 AM (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:

380e8c9

Parents:

e69b36f

Message:

support autogenerated Iqxy in C models

File:

• sasmodels/kernel_iq.c (modified) (7 diffs)

sasmodels/kernel_iq.c

@@ -16 +16 @@
 
 typedef struct {
+#if MAX_PD > 0
     int32_t pd_par[MAX_PD];     // id of the nth polydispersity variable
     int32_t pd_length[MAX_PD];  // length of the nth polydispersity weight vector
@@ -21 +22 @@
     int32_t pd_stride[MAX_PD];  // stride to move to the next index at this level
     int32_t pd_isvol[MAX_PD];   // True if parameter is a volume weighting parameter
+#endif // MAX_PD > 0
     int32_t par_offset[NPARS];  // offset of par values in the value & weight vector
     int32_t par_coord[NPARS];   // polydispersity coordination bitvector
@@ -52 +54 @@
   double *pvec = (double *)(&local_values);  // Alias named parameters with a vector
 
-  local int offset[NPARS];  // NPARS excludes scale/background
-
-#if 0 // defined(USE_SHORTCUT_OPTIMIZATION)
+#if MAX_PD > 0
   if (problem->pd_length[0] == 1) {
+#endif // MAX_PD > 0
     // Shouldn't need to copy!!
-
     for (int k=0; k < NPARS; k++) {
       pvec[k] = values[k+2];  // skip scale and background
@@ -67 +67 @@
     #endif
     for (int i=0; i < nq; i++) {
-      const double scattering = CALL_IQ(q, i, local_values);
-      result[i] = values[0]*scattering/volume + values[1];
+      double scattering = CALL_IQ(q, i, local_values);
+      if (volume != 0.0) scattering /= volume;
+      result[i] = values[0]*scattering + values[1];
     }
     return;
-  }
-  printf("falling through\n");
-#endif
+#if MAX_PD > 0
+  }
+
+  // polydispersity loop index positions
+  local int offset[NPARS];  // NPARS excludes scale/background
 
   printf("Entering polydispersity\n");
@@ -177 +180 @@
       }
     }
-    printf("rad len %f %f\n",local_values.radius, local_values.length);
     #ifdef INVALID
     if (INVALID(local_values)) continue;
@@ -199 +201 @@
   }
 
-  //Makes a normalization avialable for the next round
+  //Makes a normalization available for the next round
   result[nq] = norm;
   result[nq+1] = vol;
@@ -216 +218 @@
     }
   }
+#endif // MAX_PD > 0
 }