Changes in / [f54fb70:b2377b0] in sasmodels

Location:

sasmodels

Files:

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

sasmodels/kernelcl.py

@@ -568 +568 @@
             if v is not None: v.release()
 
-        pd_norm = self.result[self.q_input.nq]
-        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
+        scale = values[0]/self.result[self.q_input.nq]
         background = values[1]
-        #print("scale",scale,values[0],self.result[self.q_input.nq],background)
+        #print("scale",scale,values[0],self.result[self.q_input.nq])
         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)
-        pd_norm = self.result[self.q_input.nq]
-        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
+        scale = values[0]/self.result[self.q_input.nq]
         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:
-        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
+        norm = float(form_volume())
+        if norm > 0.0:
+            return (scale/norm)*form() + background
+        else:
+            return np.ones(nq, 'd')*background
 
     pd_value = values[2+n_pars:2+n_pars + call_details.num_weights]
@@ -243 +245 @@
             pd_norm += weight * form_volume()
 
-    scale = values[0]/(pd_norm if pd_norm != 0.0 else 1.0)
-    background = values[1]
-    return scale*total + background
+    if pd_norm > 0.0:
+        return (scale/pd_norm)*total + background
+    else:
+        return np.ones(nq, 'd')*background