Changeset 2662828 in sasmodels

Timestamp:

Apr 11, 2017 7:43:45 AM (7 years ago)

Author:

butler

Branches:

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

Children:

9dcb21d

Parents:

bf8c271 (diff), 1cd24b4 (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 remote-tracking branch 'origin/master' into ticket-741

Files:

• example/oriented_usans.py (modified) (2 diffs)
• sasmodels/models/onion.py (modified) (4 diffs)
• sasmodels/sasview_model.py (modified) (3 diffs)

example/oriented_usans.py

@@ -19 +19 @@
     scale=0.08, background=0,
     sld=.291, sld_solvent=7.105,
-    r_polar=1800, r_polar_pd=0.222296, r_polar_pd_n=0,
-    r_equatorial=2600, r_equatorial_pd=0.28, r_equatorial_pd_n=0,
+    radius_polar=1800, radius_polar_pd=0.222296, radius_polar_pd_n=0,
+    radius_equatorial=2600, radius_equatorial_pd=0.28, radius_equatorial_pd_n=0,
     theta=60, theta_pd=0, theta_pd_n=0,
     phi=60, phi_pd=0, phi_pd_n=0,
@@ -26 +26 @@
 
 # SET THE FITTING PARAMETERS
-model.r_polar.range(1000, 10000)
-model.r_equatorial.range(1000, 10000)
+model.radius_polar.range(1000, 10000)
+model.radius_equatorial.range(1000, 10000)
 model.theta.range(0, 360)
 model.phi.range(0, 360)

sasmodels/models/onion.py

@@ -1 +1 @@
 r"""
 This model provides the form factor, $P(q)$, for a multi-shell sphere where
-the scattering length density (SLD) of the each shell is described by an
+the scattering length density (SLD) of each shell is described by an
 exponential, linear, or constant function. The form factor is normalized by
 the volume of the sphere where the SLD is not identical to the SLD of the
@@ -142 +142 @@
 
 For $A = 0$, the exponential function has no dependence on the radius (so that
-$\rho_\text{out}$ is ignored this case) and becomes flat. We set the constant
+$\rho_\text{out}$ is ignored in this case) and becomes flat. We set the constant
 to $\rho_\text{in}$ for convenience, and thus the form factor contributed by
 the shells is
@@ -346 +346 @@
             # flat shell
             z.append(z_current + thickness[k])
-            rho.append(sld_out[k])
+            rho.append(sld_in[k])
         else:
             # exponential shell
@@ -357 +357 @@
                 z.append(z_current+z_shell)
                 rho.append(slope*exp(A[k]*z_shell/thickness[k]) + const)
-
+    
     # add in the solvent
     z.append(z[-1])

sasmodels/sasview_model.py

@@ -148 +148 @@
         _previous_name = model.name
         model.name = model.id
-        
+
         # If the new model name is still in the model list (for instance,
         # if we put a cylinder.py in our plug-in directory), then append
@@ -598 +598 @@
         return p_model, s_model
 
+
+    def calc_composition_models(self, qx):
+        with calculation_lock:
+            self._calculate_Iq(qx)
+            return self._intermediate_results
+
     def calculate_Iq(self, qx, qy=None):
         # type: (Sequence[float], Optional[Sequence[float]]) -> np.ndarray
@@ -637 +643 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
+        self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
         self._model.release()