Changeset 2662828 in sasmodels
- Timestamp:
- Apr 11, 2017 7:43:45 AM (8 years ago)
- 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. - Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
example/oriented_usans.py
rea75043 r1cd24b4 19 19 scale=0.08, background=0, 20 20 sld=.291, sld_solvent=7.105, 21 r _polar=1800, r_polar_pd=0.222296, r_polar_pd_n=0,22 r _equatorial=2600, r_equatorial_pd=0.28, r_equatorial_pd_n=0,21 radius_polar=1800, radius_polar_pd=0.222296, radius_polar_pd_n=0, 22 radius_equatorial=2600, radius_equatorial_pd=0.28, radius_equatorial_pd_n=0, 23 23 theta=60, theta_pd=0, theta_pd_n=0, 24 24 phi=60, phi_pd=0, phi_pd_n=0, … … 26 26 27 27 # SET THE FITTING PARAMETERS 28 model.r _polar.range(1000, 10000)29 model.r _equatorial.range(1000, 10000)28 model.radius_polar.range(1000, 10000) 29 model.radius_equatorial.range(1000, 10000) 30 30 model.theta.range(0, 360) 31 31 model.phi.range(0, 360) -
sasmodels/models/onion.py
rc3ccaec rbccb40f 1 1 r""" 2 2 This model provides the form factor, $P(q)$, for a multi-shell sphere where 3 the scattering length density (SLD) of theeach shell is described by an3 the scattering length density (SLD) of each shell is described by an 4 4 exponential, linear, or constant function. The form factor is normalized by 5 5 the volume of the sphere where the SLD is not identical to the SLD of the … … 142 142 143 143 For $A = 0$, the exponential function has no dependence on the radius (so that 144 $\rho_\text{out}$ is ignored this case) and becomes flat. We set the constant144 $\rho_\text{out}$ is ignored in this case) and becomes flat. We set the constant 145 145 to $\rho_\text{in}$ for convenience, and thus the form factor contributed by 146 146 the shells is … … 346 346 # flat shell 347 347 z.append(z_current + thickness[k]) 348 rho.append(sld_ out[k])348 rho.append(sld_in[k]) 349 349 else: 350 350 # exponential shell … … 357 357 z.append(z_current+z_shell) 358 358 rho.append(slope*exp(A[k]*z_shell/thickness[k]) + const) 359 359 360 360 # add in the solvent 361 361 z.append(z[-1]) -
sasmodels/sasview_model.py
r749a7d4 rbf8c271 148 148 _previous_name = model.name 149 149 model.name = model.id 150 150 151 151 # If the new model name is still in the model list (for instance, 152 152 # if we put a cylinder.py in our plug-in directory), then append … … 598 598 return p_model, s_model 599 599 600 601 def calc_composition_models(self, qx): 602 with calculation_lock: 603 self._calculate_Iq(qx) 604 return self._intermediate_results 605 600 606 def calculate_Iq(self, qx, qy=None): 601 607 # type: (Sequence[float], Optional[Sequence[float]]) -> np.ndarray … … 637 643 result = calculator(call_details, values, cutoff=self.cutoff, 638 644 magnetic=is_magnetic) 645 self._intermediate_results = getattr(calculator, 'results', None) 639 646 calculator.release() 640 647 self._model.release()
Note: See TracChangeset
for help on using the changeset viewer.