Changeset b293683 in sasview

Timestamp:

Aug 8, 2009 9:05:13 AM (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:

b1d45c1

Parents:

7f81665

Message:

sansview: remove try-except block that lets the new evalDistribution fail silently

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -54 +54 @@
         index_model = (self.qmin <= radius)&(radius<= self.qmax)
        
-        try:
-            ## receive only list of 2 numpy array 
-            ## One must reshape to vertical and the other to horizontal
-            value = self.model.evalDistribution([self.y_array,self.x_array] )
-            ## for data ignore the qmax 
-            if self.data == None:
-                # Only qmin value will be consider for the detector
-                output = value *index_data  
-            else:
-                # The user can define qmin and qmax for the detector
-                output = value*index_model
-        except:
-            ## looping trough all x and y points
-            output= self.compute_point()  
-       
+        ## receive only list of 2 numpy array 
+        ## One must reshape to vertical and the other to horizontal
+        value = self.model.evalDistribution([self.y_array,self.x_array] )
+        ## for data ignore the qmax 
+        if self.data == None:
+            # Only qmin value will be consider for the detector
+            output = value *index_data  
+        else:
+            # The user can define qmin and qmax for the detector
+            output = value*index_model
+        
         elapsed = time.time()-self.starttime
         self.complete( image = output,
@@ -142 +138 @@
         self.starttime = time.time()
         
-        try:
-            index= (self.qmin <= self.x)& (self.x <= self.qmax)
-            output = self.model.evalDistribution(self.x[index])
-        except:
-            output= self.compute_point()
-
+        index= (self.qmin <= self.x)& (self.x <= self.qmax)
+        output = self.model.evalDistribution(self.x[index])
+ 
         ##smearer the ouput of the plot    
         if self.smearer!=None: