Changeset 1aa8084 in sasview for sansmodels/src


Ignore:
Timestamp:
Jan 9, 2012 10:49:49 AM (13 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:
cfe1feb
Parents:
0c74c85
Message:

we now use cpp smear2d

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/smearing_2d.py

    r87615a48 r1aa8084  
    2626      
    2727    def __init__(self, data=None, model=None, index=None,  
    28                  limit=LIMIT, accuracy='Low', coords='polar', engine='python'): 
     28                 limit=LIMIT, accuracy='Low', coords='polar', engine='c'): 
    2929        """ 
    3030        Assumption: equally spaced bins in dq_r, dq_phi space. 
     
    147147        if self._engine == 'c' and self.coords == 'polar': 
    148148            try: 
    149                 import sans_extension.smearer2d_helper as smearer2dc 
     149                import sans.models.sans_extension.smearer2d_helper as smearer2dc 
    150150                smearc = smearer2dc.new_Smearer_helper(self.qx_data, self.qy_data, 
    151151                                              self.dqx_data, self.dqy_data, 
     
    154154                qx_res = numpy.zeros(nr * nphi * int(len_data)) 
    155155                qy_res = numpy.zeros(nr * nphi * int(len_data)) 
    156                 smearer2dc.smearer2d_helper(smearc,weight_res, qx_res, qy_res) 
     156                smearer2dc.smearer2d_helper(smearc, weight_res, qx_res, qy_res) 
    157157            except: 
    158158                raise  
     
    231231    dz = numpy.sqrt(z) 
    232232     
    233     from DataLoader import Data2D 
     233    from sans.dataloader import Data2D 
    234234    #for i in range(10): print i, 0.001 + i*0.008/9.0  
    235235    #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) ))  
Note: See TracChangeset for help on using the changeset viewer.