Changeset 1aa8084 in sasview

Timestamp:

Jan 9, 2012 12:49:49 PM (12 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:

• sansmodels/src/sans/models/smearing_2d.py (modified) (4 diffs)

sansmodels/src/sans/models/smearing_2d.py

@@ -26 +26 @@
      
     def __init__(self, data=None, model=None, index=None, 
-                 limit=LIMIT, accuracy='Low', coords='polar', engine='python'):
+                 limit=LIMIT, accuracy='Low', coords='polar', engine='c'):
         """
         Assumption: equally spaced bins in dq_r, dq_phi space.
@@ -147 +147 @@
         if self._engine == 'c' and self.coords == 'polar':
             try:
-                import sans_extension.smearer2d_helper as smearer2dc
+                import sans.models.sans_extension.smearer2d_helper as smearer2dc
                 smearc = smearer2dc.new_Smearer_helper(self.qx_data, self.qy_data,
                                               self.dqx_data, self.dqy_data,
@@ -154 +154 @@
                 qx_res = numpy.zeros(nr * nphi * int(len_data))
                 qy_res = numpy.zeros(nr * nphi * int(len_data))
-                smearer2dc.smearer2d_helper(smearc,weight_res, qx_res, qy_res)
+                smearer2dc.smearer2d_helper(smearc, weight_res, qx_res, qy_res)
             except:
                 raise 
@@ -231 +231 @@
     dz = numpy.sqrt(z)
     
-    from DataLoader import Data2D
+    from sans.dataloader import Data2D
     #for i in range(10): print i, 0.001 + i*0.008/9.0 
     #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) ))