Changeset a0bc608 in sasview for sansview/perspectives/fitting

Timestamp:

Sep 21, 2009 6:34:24 PM (15 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:

51b638f

Parents:

65883cf

Message:

sansview: fixed plotting for smeared data with restricted range.

File:

• sansview/perspectives/fitting/model_thread.py (modified) (1 diff)

sansview/perspectives/fitting/model_thread.py

@@ -116 +116 @@
         output[index] = self.model.evalDistribution(self.x[index])
      
-        _first_bin = None
-        _last_bin  = None
-       
-        for i_x in xrange(len(self.x)):
-            if index[i_x]:
-                # Identify first and last bin
-                #TODO: refactor this to pass q-values to the smearer
-                # and let it figure out which bin range to use
-                if _first_bin is None:
-                    _first_bin = i_x
-                else:
-                    _last_bin  = i_x
-      
         ##smearer the ouput of the plot    
         if self.smearer!=None:
-            #output= self.smearer(output)
-            output = self.smearer(output, _first_bin,_last_bin) #Todo: Why always output[0]=0???
+            first_bin, last_bin = self.smearer.get_bin_range(self.qmin, self.qmax)
+            output = self.smearer(output, first_bin, last_bin) 
          
-        ######Temp. FIX for Qrange w/ smear. #ToDo: Should not pass all the data to 'run' or 'smear'...
-        #new_index = (self.qmin > self.x) |(self.x > self.qmax)
-        #output[new_index] = None
-                
-        #print "output------",output
         elapsed = time.time()-self.starttime
        
-        self.complete(x= self.x, y= output, 
+        self.complete(x= self.x[index], y= output[index], 
                       elapsed=elapsed, model= self.model, data=self.data)