Changeset a320904 in sasview for park_integration

Timestamp:

Feb 4, 2009 5:43:40 PM (16 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:

3e8e627

Parents:

4e5f660

Message:

qmin and qmax were removed from fit()

File:

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

park_integration/ScipyFitting.py

@@ -62 +62 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self ,handler=None, qmin=None, qmax=None):
+    def fit(self ,handler=None):
         # Protect against simultanous fitting attempts
         #if len(self.fitArrangeDict)>1: 
@@ -83 +83 @@
         listdata=[]
         model = fitproblem[0].get_model()
+        #print "data",fitproblem[0].dList
         listdata = fitproblem[0].get_data()
         # Concatenate dList set (contains one or more data)before fitting
         #data=self._concatenateData( listdata)
         data=listdata
-        #Assign a fit range is not boundaries were given
-        if not hasattr(data, 'image'):
-            if qmin==None:
-                qmin= min(data.x)
-            if qmax==None:
-                qmax= max(data.x) 
-        else:
-            if qmin==None:
-                qmin= numpy.min(data.image)
-            if qmax==None:
-                qmax= numpy.max(data.image) 
+       
+       
         functor= sansAssembly(self.paramList,model,data)