Changeset 5399809 in sasmodels for sasmodels/kernel.py

Timestamp:

Aug 21, 2018 1:32:40 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2a12351b

Parents:

c57ee9e

Message:

fix R_eff support infrastructure so more tests pass

File:

• sasmodels/kernel.py (modified) (3 diffs)

sasmodels/kernel.py

@@ -44 +44 @@
         # type: (CallDetails, np.ndarray, np.ndarray, float, bool) -> np.ndarray
         Pq, Reff = self.Pq_Reff(call_details, values, cutoff, magnetic, effective_radius_type=0)
-        scale = values[0]
-        background = values[1]
-        return scale*Pq + background
+        return Pq
     __call__ = Iq
 
@@ -53 +51 @@
         self._call_kernel(call_details, values, cutoff, magnetic, effective_radius_type)
         #print("returned",self.q_input.q, self.result)
-        nout = 2 if self.info.have_Fq else 1
+        nout = 2 if self.info.have_Fq and self.dim == '1d' else 1
         total_weight = self.result[nout*self.q_input.nq + 0]
         if total_weight == 0.:
@@ -63 +61 @@
         #           = scale*(sum(w*F^2)/sum w)/(sum (w*V)/sum w) + background
         #           = scale/sum (w*V) * sum(w*F^2) + background
+        F2 = self.result[0:nout*self.q_input.nq:nout]
         scale = values[0]/(weighted_volume if weighted_volume != 0.0 else 1.0)
         background = values[1]
+        Pq = scale*F2 + background
         #print("scale",scale,background)
-        return self.result[0:nout*self.q_input.nq:nout], effective_radius
+        return Pq, effective_radius
 
     def beta(self, call_details, values, cutoff, magnetic, effective_radius_type):