Changeset cd8dde1 in sasmodels

Timestamp:

Sep 1, 2015 1:25:48 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eff3d66, 3d5c6f8

Parents:

3e6aaad

Message:

fix resolution for simulated 2D data

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• resolution2d.py (modified) (2 diffs)

sasmodels/bumps_model.py

@@ -153 +153 @@
     # 5% dQ/Q resolution
     if resolution != 0:
-        data.dqx_data = resolution * Qx
-        data.dqy_data = resolution * Qy
+        # https://www.ncnr.nist.gov/staff/hammouda/distance_learning/chapter_15.pdf
+        # Should have an additional constant which depends on distances and
+        # radii of the aperture, pixel dimensions and wavelength spread
+        # Instead, assume radial dQ/Q is constant, and perpendicular matches
+        # radial (which instead it should be inverse).
+        Q = np.sqrt(Qx**2 + Qy**2)
+        data.dqx_data = resolution * Q
+        data.dqy_data = resolution * Q
 
     detector = Detector()

sasmodels/resolution2d.py

@@ -18 +18 @@
 NSIGMA = 3.0
 ## Defaults
-NR = {'Xhigh':10, 'High':5, 'Med':5, 'Low':3}
-NPHI ={'Xhigh':20, 'High':12, 'Med':6, 'Low':4}
+NR = {'xhigh':10, 'high':5, 'med':5, 'low':3}
+NPHI ={'xhigh':20, 'high':12, 'med':6, 'low':4}
 
 class Pinhole2D(Resolution):
@@ -41 +41 @@
         ## of r and phi.
         ## number of bins in r axis for over-sampling
-        self.nr = NR[accuracy]
+        self.nr = NR[accuracy.lower()]
         ## number of bins in phi axis for over-sampling 
-        self.nphi = NPHI[accuracy]
+        self.nphi = NPHI[accuracy.lower()]
         ## maximum nsigmas
         self.nsigma= nsigma