Changeset f7f6886 in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Sep 8, 2011 5:16:54 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

8dcc4539

Parents:

2e08a9f

Message:

working on batch fit

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fit_thread.py (modified) (1 diff)
• fitting.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -88 +88 @@
             #    self.handler.error(msg=msg)
         except:
-            raise
-            #if self.handler is not None:
-            #    self.handler.error(msg=str(sys.exc_value))
+            if self.handler is not None:
+                self.handler.error(msg=str(sys.exc_value))
            
         

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

@@ -711 +711 @@
                     value.clear_model_param()
             except:
-                raise
                 msg= "%s error: %s" % (engineType, sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",

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

@@ -22 +22 @@
         weight = dy_data
     elif flag == 2:
-        self.weight = numpy.sqrt(numpy.abs(data))
+        weight = numpy.sqrt(numpy.abs(data))
     elif flag == 3:
         weight = numpy.abs(data)