Changeset 292fe08 in sasmodels

Timestamp:

Mar 18, 2016 11:38:55 AM (9 years ago)

Author:

richardh

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

Parents:

934f906 (diff), 08376e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• sasview_model.py (modified) (2 diffs)
• models/hardsphere.py (modified) (2 diffs)

sasmodels/sasview_model.py

@@ -38 +38 @@
     model_info = core.load_model_info(model_name)
     def __init__(self, multfactor=1):
-        SasviewModel.__init__(self, model_info)
-    attrs = dict(__init__=__init__)
+        SasviewModel.__init__(self)
+    attrs = dict(__init__=__init__, _model_info=model_info)
     ConstructedModel = type(model_info[namestyle], (SasviewModel,), attrs)
     return ConstructedModel
@@ -47 +47 @@
     Sasview wrapper for opencl/ctypes model.
     """
-    def __init__(self, model_info):
-        self._model_info = model_info
+    def __init__(self):
         self._kernel = None
+        model_info = self._model_info
 
         self.name = model_info['name']

sasmodels/models/hardsphere.py

@@ -75 +75 @@
 Iq = """
       double D,A,B,G,X,X2,X4,S,C,FF,HARDSPH;
+      // these are c compiler instructions, can also put normal code inside the "if else" structure 
+      #if FLOAT_SIZE > 4
+      // double precision    orig had 0.2, don't call the variable cutoff as PAK already has one called that! Must use UPPERCASE name please.
+      //  0.05 better, 0.1 OK
+      #define CUTOFFHS 0.05
+      #else
+      // 0.1 bad, 0.2 OK, 0.3 good, 0.4 better, 0.8 no good
+      #define CUTOFFHS 0.4  
+      #endif
 
       if(fabs(radius_effective) < 1.E-12) {
@@ -97 +106 @@
       G=0.5*volfraction*A;
 
-      if(X < 0.2) {
-      // RKH Feb 2016, use Taylor series expansion for small X, IT IS VERY PICKY ABOUT THE X CUT OFF VALUE, ought to be lower in double. 
+      if(X < CUTOFFHS) {
+      // RKH Feb 2016, use Taylor series expansion for small X
       // else no obvious way to rearrange the equations to avoid needing a very high number of significant figures. 
       // Series expansion found using Mathematica software. Numerical test in .xls showed terms to X^2 are sufficient