Changeset 0eb801a in sasview for park_integration

Timestamp:

Aug 8, 2008 1:04:05 PM (16 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:

ee5b04c

Parents:

f1181977

Message:

protect scipy against simultaneous fitting

File:

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

park_integration/ScipyFitting.py

@@ -55 +55 @@
             @return cov: Covariance matrix
         """
+        # Protect against simultanous fitting attempts
+        if len(self.fitArrangeList)>1: 
+            raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
+        
         # fitproblem contains first fitArrange object(one model and a list of data)
         fitproblem=self.fitArrangeList.values()[0]
@@ -123 +127 @@
     p = [param() for param in pars]
     out, cov_x, info, mesg, success = optimize.leastsq(f, p, full_output=1, warning=True)
-    print info, mesg, success
+    #print info, mesg, success
     # Calculate chi squared
     if len(pars)>1: