Changeset a10da8b in sasmodels

Timestamp:

Mar 20, 2016 5:03:27 AM (9 years ago)

Author:

wojciech

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:

44f39a2

Parents:

6eee37f

Message:

Bug fix in bit mask

File:

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

sasmodels/kernel_iq.c

@@ -89 +89 @@
 starting location of parameter k in the vector.  Each parameter defines
 coord[k] as a bit mask indicating which polydispersity parameters the
-parameter depends upon.  Usually this is zero, indicating that the parameter
+parameter depends upon. Usually this is zero, indicating that the parameter
 is independent, but for the cylinder example given, the bits for the
 radius and length polydispersity parameters would both be set, the result
@@ -197 +197 @@
 
   // Location in the polydispersity cube, one index per dimension.
+  local int pd_index[PD_MAX];
+
   // Set the initial index greater than its vector length in order to
   // trigger the reset behaviour that happens at the end the fast loop.
-  local int pd_index[PD_MAX];
-  pd_index[0] = pd_length[0]
+  pd_index[0] = pd_length[0];
 
   // Loop over the weights then loop over q, accumulating values
@@ -224 +225 @@
               block_size *= pd_length[bit];
           }
+          coord /= 2;
         }
         offset[k] = this_offset;
@@ -264 +266 @@
         result[i] *= norm_vol[i]/vol[i];
       }
+      //TODO: Ask Richard if scale and background may be corridanted parameters
       result[i] = scale*result[i]/norm[i]+background;
     }
   }
 }
-
+}