Changeset 93de635d in sasview

Timestamp:

Apr 5, 2011 4:20:00 PM (14 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:

8aaf534

Parents:

ce7fce5

Message:

edit ftol parameter default value

Location:

park_integration

Files:

• Fitting.py (modified) (1 diff)
• ParkFitting.py (modified) (2 diffs)
• ScipyFitting.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

park_integration/Fitting.py

@@ -50 +50 @@
             raise ValueError, "enter the keyword scipy or park"
 
-    def fit(self, q=None, handler=None, curr_thread=None):
+    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
         """Perform the fit """
-        return self._engine.fit(q, handler, curr_thread=curr_thread)
+        return self._engine.fit(q, handler, curr_thread=curr_thread,
+                                ftol=ftol)
      
     def set_model(self, model, id, pars=[], constraints=[]):

park_integration/ParkFitting.py

@@ -144 +144 @@
         
   
-    def fit(self, q=None, handler=None, curr_thread=None, ftol=None):
+    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
         """
         Performs fit with park.fit module.It can  perform fit with one model
@@ -167 +167 @@
         self.create_assembly(curr_thread=curr_thread)
         localfit = FitSimplex()
-        localfit.ftol = 1e-8
+        localfit.ftol = ftol
         
         # See `park.fitresult.FitHandler` for details.

park_integration/ScipyFitting.py

@@ -105 +105 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self, q=None, handler=None, curr_thread=None):
+    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
         """
         """
@@ -127 +127 @@
        
         self.curr_thread = curr_thread
-        ftol = curr_thread.ftol
+        ftol = ftol
         
         # Check the initial value if it is within range

park_integration/setup.py

@@ -2 +2 @@
      Installation script for SANS fitting
 """
-
+import sys
+if len(sys.argv) == 1:
+    sys.argv.append('install')
 # Then build and install the modules
 from distutils.core import setup, Extension