Changeset f50330b7 in sasview for sansview

Timestamp:

Jul 21, 2009 2:29:15 PM (15 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:

f9e803e

Parents:

3087295

Message:

Reverted the previous code, but still cut off the output from smearer outside of the Qrange.

File:

• sansview/perspectives/fitting/model_thread.py (modified) (2 diffs)

sansview/perspectives/fitting/model_thread.py

@@ -261 +261 @@
         self.starttime = time.time()
         
-        i_x_min=1e+16 #<--Any BIG # works.
-        i_x_max=0
         for i_x in range(len(self.x)):
             self.update(x= self.x, output=output )
@@ -268 +266 @@
             self.isquit()
             if self.qmin <= self.x[i_x] and self.x[i_x] <= self.qmax:
-                #Determine the i_min and i_max (ie., min and max index of x)
-                if i_x_min == 1e+16:
-                    i_x_min=i_x
-                i_x_max=i_x
                 value = self.model.run(self.x[i_x])
                 output[i_x] = value
-                
+
         ##smearer the ouput of the plot    
         if self.smearer!=None:
             output = self.smearer(output) #Todo: Why always output[0]=0???
         
-        ######Temp. FIX for Qrange w/ smear. Should not pass all the data to 'run' or 'smear'...
-        for i_x in range(len(self.x)):
-            if (i_x < i_x_min or i_x > i_x_max):
-                output[i_x] = 0
+        ######Temp. FIX for Qrange w/ smear. #ToDo: Should not pass all the data to 'run' or 'smear'...
+        for i_x in range(len(self.x)):
+            if self.qmin > self.x[i_x] or self.x[i_x] > self.qmax:
+                output[i_x] = None
                 
         elapsed = time.time()-self.starttime