Changeset 40a87fa in sasmodels for sasmodels/resolution2d.py

Timestamp:

Aug 8, 2016 11:24:11 AM (8 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:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

• sasmodels/resolution2d.py (modified) (2 diffs)

sasmodels/resolution2d.py

@@ -24 +24 @@
 ## Defaults
 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((2*v+1,k) for k,v in N_SLIT_PERP.items()))
+N_SLIT_PERP_DOC = ", ".join("%s=%d"%(name, value)
+                            for value, name in
+                            sorted((2*v+1, k) for k, v in N_SLIT_PERP.items()))
 
 class Pinhole2D(Resolution):
@@ -225 +226 @@
             self.weights = resolution.pinhole_resolution(qx_calc, q,
                     np.maximum(qx_width, resolution.MINIMUM_RESOLUTION))
-        elif len(qx_calc)==len(q) and np.all(qx_calc == q):
+        elif len(qx_calc) == len(q) and np.all(qx_calc == q):
             self.weights = None
         else: