Changeset 7f81665 in sasview

Timestamp:

Aug 8, 2009 9:01:22 AM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b293683

Parents:

d9dc518

Message:

park_integration: remove try-except block that lets evalDistribution silently fail.

File:

• park_integration/AbstractFitEngine.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -115 +115 @@
             return self.model.evalDistribution(x)
         except:
-            return self.model.runXY(x)
-   
-   
-
+            print "AbstractFitEngine.Model.eval [FIXME]:", sys.exc_value
+            raise
 
 class Data(object):
@@ -386 +384 @@
      
     def residuals(self, fn): 
-        try:
-            res=self.index_model*(self.image - fn([self.y_bins_array,
-                             self.x_bins_array]))/self.res_err_image
-            return res.ravel() 
-        except:
-            print "Using old residual method"
-            return self.old_residuals( fn)
+        res=self.index_model*(self.image - fn([self.y_bins_array,
+                         self.x_bins_array]))/self.res_err_image
+        return res.ravel()