Changeset 5b0c2cb in sasview


Ignore:
Timestamp:
Mar 31, 2009 8:13:10 AM (16 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:
cd3d15b
Parents:
78c5378
Message:

plotting range for data2D

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/model_thread.py

    rd16e396 r5b0c2cb  
    127127            for i_y in range(int(len(self.y))): 
    128128                radius = math.sqrt(self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y]) 
    129                  
    130                 if  self.qmin <= radius and radius<= self.qmax: 
    131                     value = self.model.runXY( [self.x[i_x], self.y[i_y]] ) 
    132                     output[i_y][i_x] =value    
    133                 else: 
    134                     output[i_y][i_x] =0    
     129                ## for data ignore the qmax  
     130                if self.data == None: 
     131                    if  self.qmin <= radius : 
     132                        value = self.model.runXY( [self.x[i_x], self.y[i_y]] ) 
     133                        output[i_y][i_x] =value    
     134                    else: 
     135                        output[i_y][i_x] =0    
     136                else:   
     137                    if  self.qmin <= radius and radius<= self.qmax: 
     138                        value = self.model.runXY( [self.x[i_x], self.y[i_y]] ) 
     139                        output[i_y][i_x] =value    
     140                    else: 
     141                        output[i_y][i_x] =0    
    135142             
    136143        elapsed = time.time()-self.starttime 
Note: See TracChangeset for help on using the changeset viewer.