Changeset 7d64b0e in sasview for src/sas/models/c_extension/c_models/lamellarPS.cpp

Timestamp:

Mar 12, 2015 8:32:08 AM (10 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

bb074b3

Parents:

d26dea0 (diff), ac1670a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

File:

• src/sas/models/c_extension/c_models/lamellarPS.cpp (modified) (2 diffs)

src/sas/models/c_extension/c_models/lamellarPS.cpp

@@ -68 +68 @@
   ii=0;
   Sq = 0.0;
-  for(ii=1;ii<(NNint-1);ii+=1) {
+  for(ii=1;ii<=(NNint-1);ii+=1) {
 
     fii = (double)ii;   //do I really need to do this?
@@ -144 +144 @@
   for(int i=0; i< (int)weights_spacing.size(); i++) {
     dp[1] = weights_spacing[i].value;
-    for(int j=0; j< (int)weights_spacing.size(); j++) {
-      dp[2] = weights_delta[i].value;
+    //for(int j=0; j< (int)weights_spacing.size(); j++) {    BUGS fixed March 2015
+    for(int j=0; j< (int)weights_delta.size(); j++) {
+      //dp[2] = weights_delta[i].value;        BUG
+      dp[2] = weights_delta[j].value;
 
       sum += weights_spacing[i].weight * weights_delta[j].weight * LamellarPS_kernel(dp, q);