Changeset b2c6d23 in sasview


Ignore:
Timestamp:
Jan 21, 2009 12:02:37 PM (16 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:
2fa4655
Parents:
fbd0bece
Message:

Fake instrumental header information (Model 2D) is replaced in order for 2D model data to be equivalent to the real data.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sansview/perspectives/fitting/fitting.py

    r3dc83be rb2c6d23  
    710710        pass 
    711711     
    712     def complete(self, output, elapsed, model, qmin, qmax): 
     712    def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS): 
    713713        
    714714        wx.PostEvent(self.parent, StatusEvent(status="Calc \ 
    … …  
    725725        theory.detector.append(detector) 
    726726             
    727         theory.detector[0].pixel_size.x= 5.0 
    728         theory.detector[0].pixel_size.y= 5.0 
     727        theory.detector[0].pixel_size.x= qmax/(qstep/2-1)#5.0 
     728        theory.detector[0].pixel_size.y= qmax/(qstep/2-1)#5.0 
     729        theory.detector[0].beam_center.x= qmax 
     730        theory.detector[0].beam_center.y= qmax 
     731        theory.detector[0].distance= 1e+12#13705.0 
    729732        theory.source= Source() 
    730         theory.source.wavelength= 8.4 
    731         theory.detector[0].beam_center.x= 0 
    732         theory.detector[0].beam_center.y= 0 
    733         theory.detector[0].distance= 13705.0 
     733        theory.source.wavelength= 2*math.pi/1e+12#8.4 
    734734         
    735735        theory.name= model.name 
    … …  
    740740        theory.ymin= -qmax 
    741741        theory.ymax= qmax 
     742         
    742743        print "model draw comptele xmax",theory.xmax 
    743744        wx.PostEvent(self.parent, NewPlotEvent(plot=theory, 
    … …  
    768769                                       qmin=qmin, 
    769770                                       qmax=qmax, 
     771                                       qstep=qstep, 
    770772                            completefn=self.complete, 
    771773                            updatefn=None) 
Note: See TracChangeset for help on using the changeset viewer.