Changeset d49c956 in sasview

Timestamp:

Jun 18, 2012 5:08:40 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

20efe7b

Parents:

b0eeabf1

Message:

fixed polydisp. array bug

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (2 diffs)
• sansmodels/src/c_models/cylinder.cpp (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -824 +824 @@
             if path == None:
                 wx.PostEvent(self.parent.parent,
-        StatusEvent(status=" Selected Distribution was not loaded: %s" % path))
+                            StatusEvent(status= \
+                            " Selected Distribution was not loaded: %s" % path))
                 return None, None
             input_f = open(path, 'r')
             buff = input_f.read()
             lines = buff.split('\n')
-            
+            input_f.close()
             angles = []
             weights = []
@@ -837 +838 @@
                     angle = float(toks[0])
                     weight = float(toks[1])
+                    angles.append(angle)
+                    weights.append(weight)
                 except:
                     # Skip non-data lines
                     pass
-                angles.append(angle)
-                weights.append(weight)
             return numpy.array(angles), numpy.array(weights)
         except:

sansmodels/src/c_models/cylinder.cpp

@@ -137 +137 @@
 
     // q vector
-    q_z = 0;
+    q_z = 0.0;
 
     // Compute the angle btw vector q and the
@@ -145 +145 @@
     // The following test should always pass
     if (fabs(cos_val)>1.0) {
-      printf("cyl_ana_2D: Unexpected error: cos(alpha)>1\n");
-      return 0;
+      printf("cyl_ana_2D: Unexpected error: |cos(alpha)=%g|>1\n", cos_val);
+      printf("cyl_ana_2D: at theta=%g and phi=%g.", theta, phi);
+      return 1.0;
     }