Changeset eef2e0ed in sasview

Timestamp:

Mar 27, 2009 1:02:10 PM (16 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:

ca7a626

Parents:

1ae3fe1

Message:

remove comments

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (5 diffs)
• ScipyFitting.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -212 +212 @@
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
-        self.qmin = qmin
-        self.qmax = qmax
+        if qmin!=None:
+            self.qmin = qmin
+        if qmax !=None:
+            self.qmax = qmax
         
         
@@ -235 +237 @@
         x,y,dy = [numpy.asarray(v) for v in (self.x,self.y,self.dy)]
            
-        # Find entries to consider
-        if self.qmin==None:
-            self.qmin= min(self.data.x)
-        if  self.qmax==None:
-            self.qmin= max(self.data.x)
-        
         idx = (x>=self.qmin) & (x <= self.qmax)
   
@@ -292 +288 @@
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
-        self.qmin= qmin
-        self.qmax= qmax
+        if qmin!=None:
+            self.qmin= qmin
+        if qmax!=None:
+            self.qmax= qmax
       
         
@@ -308 +306 @@
         """
         res=[]
-        #Here we define that  qmin >=0 and qmax>=qmain
-        x = max(self.data.xmin, self.data.xmax)
-        y = max(self.data.ymin, self.data.ymax)
-        
-        ## fitting range
-        if self.qmin == None:
-            self.qmin = 0
-        if self.qmax == None:
-            self.qmax = math.sqrt(x*x +y*y)
-        
         
         for i in range(len(self.y_bins)):
@@ -516 +504 @@
         if self.fitArrangeDict.has_key(Uid):
              self.fitArrangeDict[Uid].set_to_fit( value)
+             
+             
     def get_problem_to_fit(self,Uid):
         """

park_integration/ScipyFitting.py

@@ -63 +63 @@
 
     def fit(self ,handler=None):
-        # Protect against simultanous fitting attempts
-        #if len(self.fitArrangeDict)>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)
-        #list of fitproblem
        
         fitproblem=[]
         for id ,fproblem in self.fitArrangeDict.iteritems():
-            #print "ScipyFitting:fproblem.get_to_fit() ",fproblem.get_to_fit()
             if fproblem.get_to_fit()==1:
                 fitproblem.append(fproblem)
@@ -83 +77 @@
         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
-       
-       
         functor= sansAssembly(self.paramList,model,data)
-        
         
         out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)