Changes in / [1cdfd47:d712a0f] in sasmodels

File:

• sasmodels/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -593 +593 @@
             # Check whether we have a list of ndarrays [qx,qy]
             qx, qy = qdist
-            return self.calculate_Iq(qx, qy)
+            if not self._model_info.parameters.has_2d:
+                return self.calculate_Iq(np.sqrt(qx ** 2 + qy ** 2))
+            else:
+                return self.calculate_Iq(qx, qy)
 
         elif isinstance(qdist, np.ndarray):
@@ -674 +677 @@
         call_details, values, is_magnetic = make_kernel_args(calculator, pairs)
         #call_details.show()
-        #print("================ parameters ==================")
-        #for p, v in zip(parameters.call_parameters, pairs): print(p.name, v[0])
+        #print("pairs", pairs)
         #for k, p in enumerate(self._model_info.parameters.call_parameters):
         #    print(k, p.name, *pairs[k])
@@ -869 +871 @@
     CylinderModel().evalDistribution([0.1, 0.1])
 
-def magnetic_demo():
-    Model = _make_standard_model('sphere')
-    model = Model()
-    model.setParam('M0:sld', 8)
-    q = np.linspace(-0.35, 0.35, 500)
-    qx, qy = np.meshgrid(q, q)
-    result = model.calculate_Iq(qx.flatten(), qy.flatten())
-    result = result.reshape(qx.shape)
-
-    import pylab
-    pylab.imshow(np.log(result + 0.001))
-    pylab.show()
-
 if __name__ == "__main__":
     print("cylinder(0.1,0.1)=%g"%test_cylinder())
-    #magnetic_demo()
     #test_product()
     #test_structure_factor()