Changeset d2caa18 in sasview for sansview/perspectives

Timestamp:

Sep 9, 2009 6:56:54 PM (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:

9ce41c6

Parents:

f1c79d2

Message:

change x and y direction to allow proper limitation of qmin and qmax for the plotted model

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -26 +26 @@
         self.qstep= qstep
         # Reshape dimensions of x and y to call evalDistribution
-        self.x_array = numpy.reshape(x,[len(x),1])
-        self.y_array = numpy.reshape(y,[1,len(y)])
+        #self.x_array = numpy.reshape(x,[len(x),1])
+        #self.y_array = numpy.reshape(y,[1,len(y)])
+        self.x_array = numpy.reshape(x,[1,len(x)])
+        self.y_array = numpy.reshape(y,[len(y),1])
         # Numpy array of dimensions 1 used for model.run method
         self.x= numpy.array(x)
@@ -50 +52 @@
                 self.qmax=math.sqrt( newx + newy )
         # Define matrix where data will be plotted        
-        radius= numpy.sqrt(self.x_array**2 + self.y_array**2)
+        radius= numpy.sqrt( self.x_array**2 + self.y_array**2 )
         index_data= (self.qmin<= radius)
         index_model = (self.qmin <= radius)&(radius<= self.qmax)
        
         output = numpy.zeros((len(self.x),len(self.y)))
-        try:
-            ## receive only list of 2 numpy array 
-            ## One must reshape to vertical and the other to horizontal
-            value = self.model.evalDistribution([self.x_array,self.y_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:
-            raise
-           
-       
+     
+        ## receive only list of 2 numpy array 
+        ## One must reshape to vertical and the other to horizontal
+        value = self.model.evalDistribution([self.x_array,self.y_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 = index_model*value
+      
         elapsed = time.time()-self.starttime
         self.complete( image = output,