Changes in / [d26dea0:7d64b0e] in sasview

Files:

• src/sas/models/c_extension/c_models/lamellarPS.cpp (modified) (2 diffs)
• src/sas/models/c_extension/libigor/libCylinder.c (modified) (2 diffs)
• test/sasmodels/test/utest_other_models.py (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);

src/sas/models/c_extension/libigor/libCylinder.c

@@ -1379 +1379 @@
         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?
@@ -1451 +1451 @@
         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?

test/sasmodels/test/utest_other_models.py

@@ -899 +899 @@
     def test1D(self):
         """ Test 1D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run(0.001), 27899.30836, 1)
+        self.assertAlmostEquals(self.comp.run(0.001), 28895.13397, 1)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPS Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),27899.30836, 1) 
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),28895.13397, 1) 
     
     def testEval_1D(self):
@@ -948 +948 @@
     def test1D(self):
         """ Test 1D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run(0.001),6831387.29466, 3)
+        self.assertAlmostEquals(self.comp.run(0.001),6838238.571488, 3)
         
     def test1D_2(self):
         """ Test 2D model for a LamellarPSHG Model"""
-        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6831387.29466,3)
+        self.assertAlmostEquals(self.comp.run([0.001, 1.3]),6838238.571488,3)
         
     def testEval_1D(self):