Changes in / [e1aa129:1a580fb] in sasmodels

Location:

sasmodels

Files:

• models/hayter_msa.c (modified) (1 diff)
• sasview_model.py (modified) (5 diffs)

sasmodels/models/hayter_msa.c

@@ -70 +70 @@
                 SofQ=sqhcal(Qdiam, gMSAWave);
         }else{
-        SofQ=NAN;
+        //SofQ=NaN;
+                SofQ=-1.0;
                 //      print "Error Level = ",ierr
                 //      print "Please report HPMSA problem with above error code"

sasmodels/sasview_model.py

@@ -734 +734 @@
             return [self.params[par.name]], [1.0]
 
-def test_cylinder():
+def test_model():
     # type: () -> float
     """
-    Test that the cylinder model runs, returning the value at [0.1,0.1].
+    Test that a sasview model (cylinder) can be run.
     """
     Cylinder = _make_standard_model('cylinder')
@@ -746 +746 @@
     # type: () -> float
     """
-    Test that 2-D hardsphere model runs and doesn't produce NaN.
+    Test that a sasview model (cylinder) can be run.
     """
     Model = _make_standard_model('hardsphere')
@@ -757 +757 @@
     # type: () -> float
     """
-    Test that the 2-D RPA model runs
+    Test that a sasview model (cylinder) can be run.
     """
     RPA = _make_standard_model('rpa')
@@ -763 +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
@@ -805 +794 @@
 
 if __name__ == "__main__":
-    print("cylinder(0.1,0.1)=%g"%test_cylinder())
-    #test_empty_distribution()
+    print("cylinder(0.1,0.1)=%g"%test_model())