Changeset bfe4644 in sasview for sansview/perspectives/fitting/model_thread.py

Timestamp:

Sep 17, 2009 8:21:56 AM (15 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:

104f3da

Parents:

c5cd3b9

Message:

add check for plugin model

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -115 +115 @@
         index= (self.qmin <= self.x)& (self.x <= self.qmax)
         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) #Todo: Why always output[0]=0???
-        
+            #output= self.smearer(output)
+            output = self.smearer(output, _first_bin,_last_bin) #Todo: Why always output[0]=0???
+         
         ######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
+        #new_index = (self.qmin > self.x) |(self.x > self.qmax)
+        #output[new_index] = None
                 
+        #print "output------",output
         elapsed = time.time()-self.starttime