Changeset 6e8b436 in sasview for sansmodels/src/sans/models

Timestamp:

Mar 22, 2011 5:16:25 PM (14 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:

384647dc

Parents:

ec611aad

Message:

minor correction on 2d smearer and added smearer documentation

File:

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

sansmodels/src/sans/models/smearing_2d.py

@@ -200 +200 @@
                                     numpy.exp(-0.5 * ((r + bin_size / 2.0 ) *\
                                     (r + bin_size / 2.0)))
-        weight_res /= numpy.sum(weight_res)
+        # No needs of normalization here.
+        #weight_res /= numpy.sum(weight_res)
         weight_res = weight_res.repeat(nphi).reshape(nr, nphi)
 
@@ -218 +219 @@
         # The polar needs rotation by -q_phi
         if self.coords == 'polar':
-            qx_res = qx + (dqx*numpy.cos(dphi) * numpy.cos(-q_phi) +\
+            q_r = numpy.sqrt(qx * qx + qy * qy)
+            qx_res = ((dqx*numpy.cos(dphi) + q_r) * numpy.cos(-q_phi) +\
                            dqy*numpy.sin(dphi) * numpy.sin(-q_phi))
-            qy_res = qy + (-dqx*numpy.cos(dphi) * numpy.sin(-q_phi) +\
+            qy_res = (-(dqx*numpy.cos(dphi) + q_r) * numpy.sin(-q_phi) +\
                            dqy*numpy.sin(dphi) * numpy.cos(-q_phi))
         else:
             qx_res = qx +  dqx*numpy.cos(dphi)
-            qy_res = qx +  dqy*numpy.sin(dphi)
+            qy_res = qy +  dqy*numpy.sin(dphi)
 
         ## Evaluate all points