Changeset f54fb70 in sasmodels

Timestamp:

Aug 30, 2016 10:10:18 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:

51241113

Parents:

14a15a3 (diff), b2377b0 (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 github.com:sasview/sasmodels

Location:

sasmodels

Files:

• __init__.py (modified) (1 diff)
• kernelcl.py (modified) (1 diff)
• kerneldll.py (modified) (1 diff)
• kernelpy.py (modified) (2 diffs)

sasmodels/__init__.py

@@ -14 +14 @@
 defining new models.
 """
-__version__ = "0.9"
+__version__ = "0.93"
 
 def data_files():

sasmodels/kernelcl.py

@@ -568 +568 @@
             if v is not None: v.release()
 
-        scale = values[0]/self.result[self.q_input.nq]
+        pd_norm = self.result[self.q_input.nq]
+        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
         background = values[1]
-        #print("scale",scale,values[0],self.result[self.q_input.nq])
+        #print("scale",scale,values[0],self.result[self.q_input.nq],background)
         return scale*self.result[:self.q_input.nq] + background
         # return self.result[:self.q_input.nq]

sasmodels/kerneldll.py

@@ -389 +389 @@
 
         #print("returned",self.q_input.q, self.result)
-        scale = values[0]/self.result[self.q_input.nq]
+        pd_norm = self.result[self.q_input.nq]
+        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
         background = values[1]
         #print("scale",scale,background)

sasmodels/kernelpy.py

@@ -187 +187 @@
     n_pars = len(parameters)
     parameters[:] = values[2:n_pars+2]
-    scale, background = values[0], values[1]
     if call_details.num_active == 0:
-        norm = float(form_volume())
-        if norm > 0.0:
-            return (scale/norm)*form() + background
-        else:
-            return np.ones(nq, 'd')*background
+        pd_norm = float(form_volume())
+        scale = values[0]/(pd_norm if pd_norm != 0.0 else 1.0)
+        background = values[1]
+        return scale*form() + background
 
     pd_value = values[2+n_pars:2+n_pars + call_details.num_weights]
@@ -245 +243 @@
             pd_norm += weight * form_volume()
 
-    if pd_norm > 0.0:
-        return (scale/pd_norm)*total + background
-    else:
-        return np.ones(nq, 'd')*background
+    scale = values[0]/(pd_norm if pd_norm != 0.0 else 1.0)
+    background = values[1]
+    return scale*total + background