Changes in sasmodels/sasview_model.py [64614ad:749a7d4] in sasmodels

File:

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

sasmodels/sasview_model.py

@@ -16 +16 @@
 import logging
 from os.path import basename, splitext
+import thread
 
 import numpy as np  # type: ignore
@@ -39 +40 @@
     pass
 
+calculation_lock = thread.allocate_lock()
+
 SUPPORT_OLD_STYLE_PLUGINS = True
 
@@ -57 +60 @@
     import sas.models
     from sasmodels.conversion_table import CONVERSION_TABLE
-    for new_name, conversion in CONVERSION_TABLE.items():
+    for new_name, conversion in CONVERSION_TABLE.get((3,1,2), {}).items():
         # CoreShellEllipsoidModel => core_shell_ellipsoid:1
         new_name = new_name.split(':')[0]
-        old_name = conversion[0]
+        old_name = conversion[0] if len(conversion) < 3 else conversion[2]
         module_attrs = {old_name: find_model(new_name)}
         ConstructedModule = type(old_name, (), module_attrs)
@@ -605 +608 @@
         to the card for each evaluation.
         """
+        ## uncomment the following when trying to debug the uncoordinated calls
+        ## to calculate_Iq
+        #if calculation_lock.locked():
+        #    logging.info("calculation waiting for another thread to complete")
+        #    logging.info("\n".join(traceback.format_stack()))
+
+        with calculation_lock:
+            return self._calculate_Iq(qx, qy)
+
+    def _calculate_Iq(self, qx, qy=None):
         #core.HAVE_OPENCL = False
         if self._model is None:
@@ -721 +734 @@
             return [self.params[par.name]], [1.0]
 
-def test_model():
+def test_cylinder():
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that the cylinder model runs, returning the value at [0.1,0.1].
     """
     Cylinder = _make_standard_model('cylinder')
@@ -733 +746 @@
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that 2-D hardsphere model runs and doesn't produce NaN.
     """
     Model = _make_standard_model('hardsphere')
@@ -744 +757 @@
     # type: () -> float
     """
-    Test that a sasview model (cylinder) can be run.
+    Test that the 2-D RPA model runs
     """
     RPA = _make_standard_model('rpa')
@@ -750 +763 @@
     return rpa.evalDistribution([0.1, 0.1])
 
+def test_empty_distribution():
+    # type: () -> None
+    """
+    Make sure that sasmodels returns NaN when there are no polydispersity points
+    """
+    Cylinder = _make_standard_model('cylinder')
+    cylinder = Cylinder()
+    cylinder.setParam('radius', -1.0)
+    cylinder.setParam('background', 0.)
+    Iq = cylinder.evalDistribution(np.asarray([0.1]))
+    assert np.isnan(Iq[0]), "empty distribution fails"
 
 def test_model_list():
     # type: () -> None
     """
-    Make sure that all models build as sasview models.
+    Make sure that all models build as sasview models
     """
     from .exception import annotate_exception
@@ -781 +805 @@
 
 if __name__ == "__main__":
-    print("cylinder(0.1,0.1)=%g"%test_model())
+    print("cylinder(0.1,0.1)=%g"%test_cylinder())
+    #test_empty_distribution()