Changeset d6f5da6 in sasmodels

Timestamp:

Mar 29, 2016 8:48:51 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:

3a45c2c, 3c6d5bc

Parents:

ea75043

Message:

use log spacing in qy for oriented usans

Location:

sasmodels

Files:

• data.py (modified) (2 diffs)
• resolution2d.py (modified) (3 diffs)

sasmodels/data.py

@@ -41 +41 @@
     Load data using a sasview loader.
     """
-    from sas.dataloader.loader import Loader
+    from sas.sascalc.dataloader.loader import Loader
     loader = Loader()
     data = loader.load(filename)
@@ -424 +424 @@
         plt.subplot(1, num_plots, 2)
         qx, qy, Iqxy = Iq_calc
-        plt.pcolormesh(qx, qy, np.log10(Iqxy))
+        plt.pcolormesh(qx, qy[qy>0], np.log10(Iqxy[qy>0,:]))
         plt.xlabel("$q_x$/A$^{-1}$")
         plt.xlabel("$q_y$/A$^{-1}$")
+        plt.xscale('log')
+        plt.yscale('log')
         #plt.axis('equal')
 

sasmodels/resolution2d.py

@@ -23 +23 @@
 
 ## Defaults
-N_SLIT_PERP = {'xhigh':2000, 'high':1000, 'med':500, 'low':250}
+N_SLIT_PERP = {'xhigh':1000, 'high':500, 'med':200, 'low':50}
 N_SLIT_PERP_DOC = ", ".join("%s=%d"%(name,value) for value,name in
-                            sorted((v,k) for k,v in N_SLIT_PERP.items()))
+                            sorted((2*v+1,k) for k,v in N_SLIT_PERP.items()))
 
 class Pinhole2D(Resolution):
@@ -213 +213 @@
         else:
             qx_calc = resolution.pinhole_extend_q(q, qx_width, nsigma=3)
-        qy_calc = np.linspace(-qy_width, qy_width, N_SLIT_PERP[accuracy]*10)
+        qy_min, qy_max = np.log10(np.min(q)), np.log10(qy_width)
+        qy_calc = np.logspace(qy_min, qy_max, N_SLIT_PERP[accuracy])
+        qy_calc = np.hstack((-qy_calc[::-1], 0, qy_calc))
         self.q_calc = [v.flatten() for v in np.meshgrid(qx_calc, qy_calc)]
         self.qx_calc, self.qy_calc = qx_calc, qy_calc
@@ -229 +231 @@
 
     def apply(self, theory):
-        Iq = np.sum(theory.reshape(self.ny, self.nx), axis=0)*self.dy
+        Iq = np.trapz(theory.reshape(self.ny, self.nx), axis=0, x=self.qy_calc)
         if self.weights is not None:
             Iq = resolution.apply_resolution_matrix(self.weights, Iq)