Changeset 27972c1d in sasview for sansmodels
- Timestamp:
- Nov 3, 2009 2:55:10 PM (15 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 155c088
- Parents:
- 8a6d4af
- Location:
- sansmodels/src/sans/models
- Files:
-
- 50 edited
-
BEPolyelectrolyte.py (modified) (1 diff)
-
BinaryHSModel.py (modified) (2 diffs)
-
BinaryHSPSF11Model.py (modified) (2 diffs)
-
CoreShellCylinderModel.py (modified) (2 diffs)
-
CoreShellEllipsoidModel.py (modified) (2 diffs)
-
CoreShellModel.py (modified) (3 diffs)
-
CylinderModel.py (modified) (2 diffs)
-
EllipsoidModel.py (modified) (2 diffs)
-
EllipticalCylinderModel.py (modified) (2 diffs)
-
FlexibleCylinderModel.py (modified) (2 diffs)
-
FractalModel.py (modified) (1 diff)
-
HollowCylinderModel.py (modified) (2 diffs)
-
LamellarFFHGModel.py (modified) (2 diffs)
-
LamellarModel.py (modified) (2 diffs)
-
LamellarPSHGModel.py (modified) (2 diffs)
-
LamellarPSModel.py (modified) (2 diffs)
-
LogNormal.py (modified) (1 diff)
-
Lorentzian.py (modified) (1 diff)
-
MultiShellModel.py (modified) (2 diffs)
-
OblateModel.py (modified) (2 diffs)
-
ParallelepipedModel.py (modified) (2 diffs)
-
ProlateModel.py (modified) (2 diffs)
-
Schulz.py (modified) (1 diff)
-
SphereModel.py (modified) (2 diffs)
-
StackedDisksModel.py (modified) (2 diffs)
-
TriaxialEllipsoidModel.py (modified) (2 diffs)
-
VesicleModel.py (modified) (2 diffs)
-
c_extensions/binaryHS.h (modified) (1 diff)
-
c_extensions/binaryHS_PSF11.h (modified) (3 diffs)
-
c_extensions/core_shell.h (modified) (1 diff)
-
c_extensions/core_shell_cylinder.h (modified) (1 diff)
-
c_extensions/cylinder.h (modified) (1 diff)
-
c_extensions/ellipsoid.h (modified) (1 diff)
-
c_extensions/elliptical_cylinder.h (modified) (1 diff)
-
c_extensions/flexible_cylinder.h (modified) (1 diff)
-
c_extensions/hollow_cylinder.h (modified) (1 diff)
-
c_extensions/lamellar.h (modified) (1 diff)
-
c_extensions/lamellarFF_HG.h (modified) (1 diff)
-
c_extensions/lamellarPS.h (modified) (1 diff)
-
c_extensions/lamellarPS_HG.h (modified) (1 diff)
-
c_extensions/multishell.h (modified) (1 diff)
-
c_extensions/oblate.h (modified) (1 diff)
-
c_extensions/parallelepiped.h (modified) (1 diff)
-
c_extensions/prolate.h (modified) (1 diff)
-
c_extensions/sphere.h (modified) (1 diff)
-
c_extensions/spheroid.h (modified) (1 diff)
-
c_extensions/stacked_disks.h (modified) (1 diff)
-
c_extensions/triaxial_ellipsoid.h (modified) (1 diff)
-
c_extensions/vesicle.h (modified) (1 diff)
-
c_models/CBinaryHSModel.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/BEPolyelectrolyte.py
re45a565 r27972c1d 67 67 self.details['k'] = ['[barns]', None, None] 68 68 self.details['lb'] = ['[A]', None, None] 69 self.details['h'] = ['[1/A ³]', None, None]69 self.details['h'] = ['[1/A^(2)]', None, None] 70 70 self.details['b'] = ['[A]', None, None] 71 71 self.details['cs'] = ['[mol/L]', None, None] -
sansmodels/src/sans/models/BinaryHSModel.py
rf9bf661 r27972c1d 36 36 vol_frac_ls = 0.1 37 37 vol_frac_ss = 0.2 38 ls_sld = 3.5e-006 [1/A²]39 ss_sld = 5e-007 [1/A²]40 solvent_sld = 6.36e-006 [1/A²]41 background = 0.001 [1/cm]42 38 43 39 """ … … 68 64 self.details['vol_frac_ls'] = ['', None, None] 69 65 self.details['vol_frac_ss'] = ['', None, None] 70 self.details['ls_sld'] = ['[1/A²]', None, None]71 self.details['ss_sld'] = ['[1/A²]', None, None]72 self.details['solvent_sld'] = ['[1/A²]', None, None]73 self.details['background'] = ['[1/cm]', None, None]74 66 75 67 ## fittable parameters -
sansmodels/src/sans/models/BinaryHSPSF11Model.py
rf9bf661 r27972c1d 36 36 vol_frac_ls = 0.2 37 37 vol_frac_ss = 0.2 38 ls_sld = 3.5e-006 [1/A ²]39 ss_sld = 5e-007 [1/A ²]40 solvent_sld = 6.36e-006 [1/A ²]38 ls_sld = 3.5e-006 [1/A^(2)] 39 ss_sld = 5e-007 [1/A^(2)] 40 solvent_sld = 6.36e-006 [1/A^(2)] 41 41 background = 0.001 [1/cm] 42 42 … … 71 71 self.details['vol_frac_ls'] = ['', None, None] 72 72 self.details['vol_frac_ss'] = ['', None, None] 73 self.details['ls_sld'] = ['[1/A ²]', None, None]74 self.details['ss_sld'] = ['[1/A ²]', None, None]75 self.details['solvent_sld'] = ['[1/A ²]', None, None]73 self.details['ls_sld'] = ['[1/A^(2)]', None, None] 74 self.details['ss_sld'] = ['[1/A^(2)]', None, None] 75 self.details['solvent_sld'] = ['[1/A^(2)]', None, None] 76 76 self.details['background'] = ['[1/cm]', None, None] 77 77 -
sansmodels/src/sans/models/CoreShellCylinderModel.py
rf9bf661 r27972c1d 36 36 thickness = 10.0 [A] 37 37 length = 400.0 [A] 38 core_sld = 1e-006 [1/A ²]39 shell_sld = 4e-006 [1/A ²]40 solvent_sld = 1e-006 [1/A ²]38 core_sld = 1e-006 [1/A^(2)] 39 shell_sld = 4e-006 [1/A^(2)] 40 solvent_sld = 1e-006 [1/A^(2)] 41 41 background = 0.0 [1/cm] 42 42 axis_theta = 1.57 [rad] … … 86 86 self.details['thickness'] = ['[A]', None, None] 87 87 self.details['length'] = ['[A]', None, None] 88 self.details['core_sld'] = ['[1/A ²]', None, None]89 self.details['shell_sld'] = ['[1/A ²]', None, None]90 self.details['solvent_sld'] = ['[1/A ²]', None, None]88 self.details['core_sld'] = ['[1/A^(2)]', None, None] 89 self.details['shell_sld'] = ['[1/A^(2)]', None, None] 90 self.details['solvent_sld'] = ['[1/A^(2)]', None, None] 91 91 self.details['background'] = ['[1/cm]', None, None] 92 92 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/CoreShellEllipsoidModel.py
rf9bf661 r27972c1d 37 37 equat_shell = 250.0 [A] 38 38 polar_shell = 30.0 [A] 39 contrast = 1e-006 [1/A ²]40 sld_solvent = 6.3e-006 [1/A ²]39 contrast = 1e-006 [1/A^(2)] 40 sld_solvent = 6.3e-006 [1/A^(2)] 41 41 background = 0.001 [1/cm] 42 42 axis_theta = 0.0 [rad] … … 82 82 self.details['equat_shell'] = ['[A]', None, None] 83 83 self.details['polar_shell'] = ['[A]', None, None] 84 self.details['contrast'] = ['[1/A ²]', None, None]85 self.details['sld_solvent'] = ['[1/A ²]', None, None]84 self.details['contrast'] = ['[1/A^(2)]', None, None] 85 self.details['sld_solvent'] = ['[1/A^(2)]', None, None] 86 86 self.details['background'] = ['[1/cm]', None, None] 87 87 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/CoreShellModel.py
r5eb9154 r27972c1d 35 35 radius = 60.0 [A] 36 36 thickness = 10.0 [A] 37 core_sld = 1e-006 [1/A ²]38 shell_sld = 2e-006 [1/A ²]39 solvent_sld = 3e-006 [1/A ²]37 core_sld = 1e-006 [1/A^(2)] 38 shell_sld = 2e-006 [1/A^(2)] 39 solvent_sld = 3e-006 [1/A^(2)] 40 40 background = 0.0 [1/cm] 41 41 … … 68 68 self.details['radius'] = ['[A]', None, None] 69 69 self.details['thickness'] = ['[A]', None, None] 70 self.details['core_sld'] = ['[1/A ²]', None, None]71 self.details['shell_sld'] = ['[1/A ²]', None, None]72 self.details['solvent_sld'] = ['[1/A ²]', None, None]70 self.details['core_sld'] = ['[1/A^(2)]', None, None] 71 self.details['shell_sld'] = ['[1/A^(2)]', None, None] 72 self.details['solvent_sld'] = ['[1/A^(2)]', None, None] 73 73 self.details['background'] = ['[1/cm]', None, None] 74 74 … … 108 108 def calculate_ER(self): 109 109 """ Calculate the effective radius for P(q)*S(q) 110 @param x: input q, or [q,phi]111 110 @return: the value of the effective radius 112 111 """ -
sansmodels/src/sans/models/CylinderModel.py
rf9bf661 r27972c1d 35 35 radius = 20.0 [A] 36 36 length = 400.0 [A] 37 contrast = 3e-006 [1/A ²]37 contrast = 3e-006 [1/A^(2)] 38 38 background = 0.0 [1/cm] 39 39 cyl_theta = 1.0 [rad] … … 71 71 self.details['radius'] = ['[A]', None, None] 72 72 self.details['length'] = ['[A]', None, None] 73 self.details['contrast'] = ['[1/A ²]', None, None]73 self.details['contrast'] = ['[1/A^(2)]', None, None] 74 74 self.details['background'] = ['[1/cm]', None, None] 75 75 self.details['cyl_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/EllipsoidModel.py
rf9bf661 r27972c1d 35 35 radius_a = 20.0 [A] 36 36 radius_b = 400.0 [A] 37 contrast = 3e-006 [1/A ²]37 contrast = 3e-006 [1/A^(2)] 38 38 background = 0.0 [1/cm] 39 39 axis_theta = 1.57 [rad] … … 75 75 self.details['radius_a'] = ['[A]', None, None] 76 76 self.details['radius_b'] = ['[A]', None, None] 77 self.details['contrast'] = ['[1/A ²]', None, None]77 self.details['contrast'] = ['[1/A^(2)]', None, None] 78 78 self.details['background'] = ['[1/cm]', None, None] 79 79 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/EllipticalCylinderModel.py
r7ad9887 r27972c1d 36 36 r_ratio = 1.5 37 37 length = 400.0 [A] 38 contrast = 3e-006 [1/A ²]38 contrast = 3e-006 [1/A^(2)] 39 39 background = 0.0 [1/cm] 40 40 cyl_theta = 1.57 [rad] … … 66 66 self.details['r_ratio'] = ['', None, None] 67 67 self.details['length'] = ['[A]', None, None] 68 self.details['contrast'] = ['[1/A ²]', None, None]68 self.details['contrast'] = ['[1/A^(2)]', None, None] 69 69 self.details['background'] = ['[1/cm]', None, None] 70 70 self.details['cyl_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/FlexibleCylinderModel.py
rf9bf661 r27972c1d 36 36 kuhn_length = 100.0 [A] 37 37 radius = 20.0 [A] 38 contrast = 5.3e-006 [1/A ²]38 contrast = 5.3e-006 [1/A^(2)] 39 39 background = 0.0001 [1/cm] 40 40 … … 62 62 self.details['kuhn_length'] = ['[A]', None, None] 63 63 self.details['radius'] = ['[A]', None, None] 64 self.details['contrast'] = ['[1/A ²]', None, None]64 self.details['contrast'] = ['[1/A^(2)]', None, None] 65 65 self.details['background'] = ['[1/cm]', None, None] 66 66 -
sansmodels/src/sans/models/FractalModel.py
r9ce41c6 r27972c1d 67 67 self.details['fractal_dim'] = ['', 0, None] 68 68 self.details['corr_length'] = ['[A]', None, None] 69 self.details['block_sld'] = ['[1/A ²]', None, None]70 self.details['solvent_sld'] = ['[1/A ²]', None, None]69 self.details['block_sld'] = ['[1/A^(2)]', None, None] 70 self.details['solvent_sld'] = ['[1/A^(2)]', None, None] 71 71 self.details['background'] = ['[1/cm]', None, None] 72 72 -
sansmodels/src/sans/models/HollowCylinderModel.py
r7ad9887 r27972c1d 36 36 radius = 30.0 [A] 37 37 length = 400.0 [A] 38 contrast = 5.3e-006 [1/A ²]38 contrast = 5.3e-006 [1/A^(2)] 39 39 background = 0.01 [1/cm] 40 40 axis_theta = 1.57 [rad] … … 66 66 self.details['radius'] = ['[A]', None, None] 67 67 self.details['length'] = ['[A]', None, None] 68 self.details['contrast'] = ['[1/A ²]', None, None]68 self.details['contrast'] = ['[1/A^(2)]', None, None] 69 69 self.details['background'] = ['[1/cm]', None, None] 70 70 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/LamellarFFHGModel.py
rf9bf661 r27972c1d 35 35 t_length = 15.0 [A] 36 36 h_thickness = 10.0 [A] 37 sld_tail = 4e-007 [1/A ²]38 sld_head = 3e-006 [1/A ²]39 sld_solvent = 6e-006 [1/A ²]37 sld_tail = 4e-007 [1/A^(2)] 38 sld_head = 3e-006 [1/A^(2)] 39 sld_solvent = 6e-006 [1/A^(2)] 40 40 background = 0.0 [1/cm] 41 41 … … 66 66 self.details['t_length'] = ['[A]', None, None] 67 67 self.details['h_thickness'] = ['[A]', None, None] 68 self.details['sld_tail'] = ['[1/A ²]', None, None]69 self.details['sld_head'] = ['[1/A ²]', None, None]70 self.details['sld_solvent'] = ['[1/A ²]', None, None]68 self.details['sld_tail'] = ['[1/A^(2)]', None, None] 69 self.details['sld_head'] = ['[1/A^(2)]', None, None] 70 self.details['sld_solvent'] = ['[1/A^(2)]', None, None] 71 71 self.details['background'] = ['[1/cm]', None, None] 72 72 -
sansmodels/src/sans/models/LamellarModel.py
rf9bf661 r27972c1d 34 34 scale = 1.0 35 35 bi_thick = 50.0 [A] 36 sld_bi = 1e-006 [1/A ²]37 sld_sol = 6.3e-006 [1/A ²]36 sld_bi = 1e-006 [1/A^(2)] 37 sld_sol = 6.3e-006 [1/A^(2)] 38 38 background = 0.0 [1/cm] 39 39 … … 64 64 self.details['scale'] = ['', None, None] 65 65 self.details['bi_thick'] = ['[A]', None, None] 66 self.details['sld_bi'] = ['[1/A ²]', None, None]67 self.details['sld_sol'] = ['[1/A ²]', None, None]66 self.details['sld_bi'] = ['[1/A^(2)]', None, None] 67 self.details['sld_sol'] = ['[1/A^(2)]', None, None] 68 68 self.details['background'] = ['[1/cm]', None, None] 69 69 -
sansmodels/src/sans/models/LamellarPSHGModel.py
rf9bf661 r27972c1d 36 36 deltaT = 10.0 [A] 37 37 deltaH = 2.0 [A] 38 sld_tail = 4e-007 [1/A ²]39 sld_head = 2e-006 [1/A ²]40 sld_solvent = 6e-006 [1/A ²]38 sld_tail = 4e-007 [1/A^(2)] 39 sld_head = 2e-006 [1/A^(2)] 40 sld_solvent = 6e-006 [1/A^(2)] 41 41 n_plates = 30.0 42 42 caille = 0.001 … … 81 81 self.details['deltaT'] = ['[A]', None, None] 82 82 self.details['deltaH'] = ['[A]', None, None] 83 self.details['sld_tail'] = ['[1/A ²]', None, None]84 self.details['sld_head'] = ['[1/A ²]', None, None]85 self.details['sld_solvent'] = ['[1/A ²]', None, None]83 self.details['sld_tail'] = ['[1/A^(2)]', None, None] 84 self.details['sld_head'] = ['[1/A^(2)]', None, None] 85 self.details['sld_solvent'] = ['[1/A^(2)]', None, None] 86 86 self.details['n_plates'] = ['', None, None] 87 87 self.details['caille'] = ['', None, None] -
sansmodels/src/sans/models/LamellarPSModel.py
rf9bf661 r27972c1d 35 35 spacing = 400.0 [A] 36 36 delta = 30.0 [A] 37 contrast = 5.3e-006 [1/A ²]37 contrast = 5.3e-006 [1/A^(2)] 38 38 n_plates = 20.0 39 39 caille = 0.1 … … 76 76 self.details['spacing'] = ['[A]', None, None] 77 77 self.details['delta'] = ['[A]', None, None] 78 self.details['contrast'] = ['[1/A ²]', None, None]78 self.details['contrast'] = ['[1/A^(2)]', None, None] 79 79 self.details['n_plates'] = ['', None, None] 80 80 self.details['caille'] = ['', None, None] -
sansmodels/src/sans/models/LogNormal.py
r9ce41c6 r27972c1d 91 91 def calculate_ER(self): 92 92 """ Calculate the effective radius for P(q)*S(q) 93 @param x: input q, or [q,phi]94 93 @return: the value of the effective radius 95 94 """ -
sansmodels/src/sans/models/Lorentzian.py
r5eb9154 r27972c1d 91 91 def calculate_ER(self): 92 92 """ Calculate the effective radius for P(q)*S(q) 93 @param x: input q, or [q,phi]94 93 @return: the value of the effective radius 95 94 """ -
sansmodels/src/sans/models/MultiShellModel.py
rf9bf661 r27972c1d 36 36 s_thickness = 10.0 [A] 37 37 w_thickness = 10.0 [A] 38 core_sld = 6.4e-006 [1/A ²]39 shell_sld = 4e-007 [1/A ²]38 core_sld = 6.4e-006 [1/A^(2)] 39 shell_sld = 4e-007 [1/A^(2)] 40 40 n_pairs = 2.0 41 41 background = 0.0 [1/cm] … … 69 69 self.details['s_thickness'] = ['[A]', None, None] 70 70 self.details['w_thickness'] = ['[A]', None, None] 71 self.details['core_sld'] = ['[1/A ²]', None, None]72 self.details['shell_sld'] = ['[1/A ²]', None, None]71 self.details['core_sld'] = ['[1/A^(2)]', None, None] 72 self.details['shell_sld'] = ['[1/A^(2)]', None, None] 73 73 self.details['n_pairs'] = ['', None, None] 74 74 self.details['background'] = ['[1/cm]', None, None] -
sansmodels/src/sans/models/OblateModel.py
rf9bf661 r27972c1d 37 37 major_shell = 250.0 [A] 38 38 minor_shell = 30.0 [A] 39 contrast = 1e-006 [1/A ²]40 sld_solvent = 6.3e-006 [1/A ²]39 contrast = 1e-006 [1/A^(2)] 40 sld_solvent = 6.3e-006 [1/A^(2)] 41 41 background = 0.001 [1/cm] 42 42 axis_theta = 1.0 [rad] … … 80 80 self.details['major_shell'] = ['[A]', None, None] 81 81 self.details['minor_shell'] = ['[A]', None, None] 82 self.details['contrast'] = ['[1/A ²]', None, None]83 self.details['sld_solvent'] = ['[1/A ²]', None, None]82 self.details['contrast'] = ['[1/A^(2)]', None, None] 83 self.details['sld_solvent'] = ['[1/A^(2)]', None, None] 84 84 self.details['background'] = ['[1/cm]', None, None] 85 85 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/ParallelepipedModel.py
rf9bf661 r27972c1d 36 36 short_b = 75.0 [A] 37 37 long_c = 400.0 [A] 38 contrast = 5.3e-006 [1/A ²]38 contrast = 5.3e-006 [1/A^(2)] 39 39 background = 0.0 [1/cm] 40 40 parallel_theta = 0.0 [rad] … … 69 69 self.details['short_b'] = ['[A]', None, None] 70 70 self.details['long_c'] = ['[A]', None, None] 71 self.details['contrast'] = ['[1/A ²]', None, None]71 self.details['contrast'] = ['[1/A^(2)]', None, None] 72 72 self.details['background'] = ['[1/cm]', None, None] 73 73 self.details['parallel_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/ProlateModel.py
rf9bf661 r27972c1d 37 37 major_shell = 110.0 [A] 38 38 minor_shell = 60.0 [A] 39 contrast = 1e-006 [1/A ²]40 sld_solvent = 6.3e-006 [1/A ²]39 contrast = 1e-006 [1/A^(2)] 40 sld_solvent = 6.3e-006 [1/A^(2)] 41 41 background = 0.001 [1/cm] 42 42 … … 78 78 self.details['major_shell'] = ['[A]', None, None] 79 79 self.details['minor_shell'] = ['[A]', None, None] 80 self.details['contrast'] = ['[1/A ²]', None, None]81 self.details['sld_solvent'] = ['[1/A ²]', None, None]80 self.details['contrast'] = ['[1/A^(2)]', None, None] 81 self.details['sld_solvent'] = ['[1/A^(2)]', None, None] 82 82 self.details['background'] = ['[1/cm]', None, None] 83 83 -
sansmodels/src/sans/models/Schulz.py
r5eb9154 r27972c1d 93 93 def calculate_ER(self): 94 94 """ Calculate the effective radius for P(q)*S(q) 95 @param x: input q, or [q,phi]96 95 @return: the value of the effective radius 97 96 """ -
sansmodels/src/sans/models/SphereModel.py
rf9bf661 r27972c1d 34 34 scale = 1.0 35 35 radius = 60.0 [A] 36 contrast = 1e-006 [1/A ²]36 contrast = 1e-006 [1/A^(2)] 37 37 background = 0.0 [1/cm] 38 38 … … 64 64 self.details['scale'] = ['', None, None] 65 65 self.details['radius'] = ['[A]', None, None] 66 self.details['contrast'] = ['[1/A ²]', None, None]66 self.details['contrast'] = ['[1/A^(2)]', None, None] 67 67 self.details['background'] = ['[1/cm]', None, None] 68 68 -
sansmodels/src/sans/models/StackedDisksModel.py
r7ad9887 r27972c1d 36 36 core_thick = 10.0 [A] 37 37 layer_thick = 15.0 [A] 38 core_sld = 4e-006 [1/A ²]39 layer_sld = -4e-007 [1/A ²]40 solvent_sld = 5e-006 [1/A ²]38 core_sld = 4e-006 [1/A^(2)] 39 layer_sld = -4e-007 [1/A^(2)] 40 solvent_sld = 5e-006 [1/A^(2)] 41 41 n_stacking = 1.0 42 42 sigma_d = 0.0 … … 73 73 self.details['core_thick'] = ['[A]', None, None] 74 74 self.details['layer_thick'] = ['[A]', None, None] 75 self.details['core_sld'] = ['[1/A ²]', None, None]76 self.details['layer_sld'] = ['[1/A ²]', None, None]77 self.details['solvent_sld'] = ['[1/A ²]', None, None]75 self.details['core_sld'] = ['[1/A^(2)]', None, None] 76 self.details['layer_sld'] = ['[1/A^(2)]', None, None] 77 self.details['solvent_sld'] = ['[1/A^(2)]', None, None] 78 78 self.details['n_stacking'] = ['', None, None] 79 79 self.details['sigma_d'] = ['', None, None] -
sansmodels/src/sans/models/TriaxialEllipsoidModel.py
r7ad9887 r27972c1d 36 36 semi_axisB = 100.0 [A] 37 37 semi_axisC = 400.0 [A] 38 contrast = 5.3e-006 [1/A ²]38 contrast = 5.3e-006 [1/A^(2)] 39 39 background = 0.0 [1/cm] 40 40 axis_theta = 1.0 [rad] … … 64 64 self.details['semi_axisB'] = ['[A]', None, None] 65 65 self.details['semi_axisC'] = ['[A]', None, None] 66 self.details['contrast'] = ['[1/A ²]', None, None]66 self.details['contrast'] = ['[1/A^(2)]', None, None] 67 67 self.details['background'] = ['[1/cm]', None, None] 68 68 self.details['axis_theta'] = ['[rad]', None, None] -
sansmodels/src/sans/models/VesicleModel.py
r7ad9887 r27972c1d 35 35 radius = 100.0 [A] 36 36 thickness = 30.0 [A] 37 core_sld = 6.36e-006 [1/A ²]38 shell_sld = 5e-007 [1/A ²]37 core_sld = 6.36e-006 [1/A^(2)] 38 shell_sld = 5e-007 [1/A^(2)] 39 39 background = 0.0 [1/cm] 40 40 … … 63 63 self.details['radius'] = ['[A]', None, None] 64 64 self.details['thickness'] = ['[A]', None, None] 65 self.details['core_sld'] = ['[1/A ²]', None, None]66 self.details['shell_sld'] = ['[1/A ²]', None, None]65 self.details['core_sld'] = ['[1/A^(2)]', None, None] 66 self.details['shell_sld'] = ['[1/A^(2)]', None, None] 67 67 self.details['background'] = ['[1/cm]', None, None] 68 68 -
sansmodels/src/sans/models/c_extensions/binaryHS.h
r515cc389 r27972c1d 37 37 double vol_frac_ss; 38 38 39 /// large sphere scattering length density [1/ Ų]40 // [DEFAULT]=ls_sld= 3.5e-6 [1/A ²]39 /// large sphere scattering length density [1/A^(2)] 40 // [DEFAULT]=ls_sld= 3.5e-6 [1/A^{2}] 41 41 double ls_sld; 42 42 43 /// lsmall sphere scattering length density [1/ Ų]44 // [DEFAULT]=ss_sld= 5e-7 [1/A ²]43 /// lsmall sphere scattering length density [1/A^(2)] 44 // [DEFAULT]=ss_sld= 5e-7 [1/A^(2)] 45 45 double ss_sld; 46 46 47 /// solvent scattering length density [1/ Ų]48 // [DEFAULT]=solvent_sld= 6.36e-6 [1/A ²]47 /// solvent scattering length density [1/A^(2)] 48 // [DEFAULT]=solvent_sld= 6.36e-6 [1/A^(2)] 49 49 double solvent_sld; 50 50 -
sansmodels/src/sans/models/c_extensions/binaryHS_PSF11.h
r2c4b289 r27972c1d 9 9 [DESCRIPTION] =<text> 10 10 Model parameters: 11 11 12 12 l_radius : large radius of the binary hard sphere 13 13 s_radius : small radius of the binary hard sphere 14 vol_frac_ls : volume fraction of large spheres 14 vol_frac_ls : volume fraction of large spheres 15 15 vol_frac_ss : volume fraction of small spheres 16 16 ls_sld: large sphere scattering length density … … 23 23 */ 24 24 typedef struct { 25 25 26 26 /// large radius of the binary hard sphere [A] 27 27 // [DEFAULT]=l_radius= 160.0 [A] … … 32 32 double s_radius; 33 33 34 /// volume fraction of large spheres 35 // [DEFAULT]=vol_frac_ls= 0.2 34 /// volume fraction of large spheres 35 // [DEFAULT]=vol_frac_ls= 0.2 36 36 double vol_frac_ls; 37 37 38 /// volume fraction of small spheres 39 // [DEFAULT]=vol_frac_ss= 0.2 38 /// volume fraction of small spheres 39 // [DEFAULT]=vol_frac_ss= 0.2 40 40 double vol_frac_ss; 41 41 42 /// large sphere scattering length density [1/ Ų]43 // [DEFAULT]=ls_sld= 3.5e-6 [1/A ²]42 /// large sphere scattering length density [1/A^(2)] 43 // [DEFAULT]=ls_sld= 3.5e-6 [1/A^(2)] 44 44 double ls_sld; 45 45 46 /// lsmall sphere scattering length density [1/ Ų]47 // [DEFAULT]=ss_sld= 5e-7 [1/A ²]46 /// lsmall sphere scattering length density [1/A^(2)] 47 // [DEFAULT]=ss_sld= 5e-7 [1/A^(2)] 48 48 double ss_sld; 49 49 50 /// solvent scattering length density [1/ Ų]51 // [DEFAULT]=solvent_sld= 6.36e-6 [1/A ²]50 /// solvent scattering length density [1/A^(2)] 51 // [DEFAULT]=solvent_sld= 6.36e-6 [1/A^(2)] 52 52 double solvent_sld; 53 53 -
sansmodels/src/sans/models/c_extensions/core_shell.h
r1ed3834 r27972c1d 31 31 // [DEFAULT]=thickness=10 [A] 32 32 double thickness; 33 /// Core SLD [1/A ²] 1.0e-634 // [DEFAULT]=core_sld=1.0e-6 [1/A ²]33 /// Core SLD [1/A^(2)] 1.0e-6 34 // [DEFAULT]=core_sld=1.0e-6 [1/A^(2)] 35 35 double core_sld; 36 /// Shell SLD [1/A ²] 2.0e-637 // [DEFAULT]=shell_sld=2.0e-6 [1/A ²]36 /// Shell SLD [1/A^(2)] 2.0e-6 37 // [DEFAULT]=shell_sld=2.0e-6 [1/A^(2)] 38 38 double shell_sld; 39 /// Solvent SLD [1/A ²] 3.0e-640 // [DEFAULT]=solvent_sld=3.0e-6 [1/A ²]39 /// Solvent SLD [1/A^(2)] 3.0e-6 40 // [DEFAULT]=solvent_sld=3.0e-6 [1/A^(2)] 41 41 double solvent_sld; 42 42 /// Incoherent Background [1/cm] 0.000 -
sansmodels/src/sans/models/c_extensions/core_shell_cylinder.h
r27fea3f r27972c1d 53 53 double length; 54 54 55 /// Core SLD [1/A ²]56 // [DEFAULT]=core_sld=1.0e-6 [1/A ²]55 /// Core SLD [1/A^(2)] 56 // [DEFAULT]=core_sld=1.0e-6 [1/A^(2)] 57 57 double core_sld; 58 58 59 /// Shell SLD [1/A ²]60 // [DEFAULT]=shell_sld=4.0e-6 [1/A ²]59 /// Shell SLD [1/A^(2)] 60 // [DEFAULT]=shell_sld=4.0e-6 [1/A^(2)] 61 61 double shell_sld; 62 62 63 /// Solvent SLD [1/A ²]64 // [DEFAULT]=solvent_sld=1.0e-6 [1/A ²]63 /// Solvent SLD [1/A^(2)] 64 // [DEFAULT]=solvent_sld=1.0e-6 [1/A^(2)] 65 65 double solvent_sld; 66 66 -
sansmodels/src/sans/models/c_extensions/cylinder.h
r1ed3834 r27972c1d 33 33 // [DEFAULT]=length=400.0 [A] 34 34 double length; 35 /// Contrast [1/A ²]36 // [DEFAULT]=contrast=3.0e-6 [1/A ²]35 /// Contrast [1/A^(2)] 36 // [DEFAULT]=contrast=3.0e-6 [1/A^(2)] 37 37 double contrast; 38 38 /// Incoherent Background [1/cm] 0.00 -
sansmodels/src/sans/models/c_extensions/ellipsoid.h
rc1c29b6 r27972c1d 46 46 double radius_b; 47 47 48 /// Contrast [1/A ²]49 // [DEFAULT]=contrast=3.0e-6 [1/A ²]48 /// Contrast [1/A^(2)] 49 // [DEFAULT]=contrast=3.0e-6 [1/A^(2)] 50 50 double contrast; 51 51 -
sansmodels/src/sans/models/c_extensions/elliptical_cylinder.h
r7ad9887 r27972c1d 31 31 // [DEFAULT]=length=400.0 [A] 32 32 double length; 33 /// Contrast [1/A ²]34 // [DEFAULT]=contrast=3.0e-6 [1/A ²]33 /// Contrast [1/A^(2)] 34 // [DEFAULT]=contrast=3.0e-6 [1/A^(2)] 35 35 double contrast; 36 36 /// Incoherent Background [1/cm] 0.000 -
sansmodels/src/sans/models/c_extensions/flexible_cylinder.h
re6fa43e r27972c1d 31 31 // [DEFAULT]=radius=20.0 [A] 32 32 double radius; 33 /// Contrast [1/A ²]34 // [DEFAULT]=contrast=5.3e-6 [1/A ²]33 /// Contrast [1/A^(2)] 34 // [DEFAULT]=contrast=5.3e-6 [1/A^(2)] 35 35 double contrast; 36 36 /// Incoherent Background [1/cm] -
sansmodels/src/sans/models/c_extensions/hollow_cylinder.h
r7ad9887 r27972c1d 35 35 double length; 36 36 37 /// Contrast [1/A ²]38 // [DEFAULT]=contrast=5.3e-6 [1/A ²]37 /// Contrast [1/A^(2)] 38 // [DEFAULT]=contrast=5.3e-6 [1/A^(2)] 39 39 double contrast; 40 40 -
sansmodels/src/sans/models/c_extensions/lamellar.h
rc1c29b6 r27972c1d 23 23 // [DEFAULT]=bi_thick=50.0 [A] 24 24 double bi_thick; 25 /// SLD of bilayer [1/A ²]26 // [DEFAULT]=sld_bi=1.0e-6 [1/A ²]25 /// SLD of bilayer [1/A^(2)] 26 // [DEFAULT]=sld_bi=1.0e-6 [1/A^(2)] 27 27 double sld_bi; 28 /// SLD of solvent [1/A ²]29 // [DEFAULT]=sld_sol=6.3e-6 [1/A ²]28 /// SLD of solvent [1/A^(2)] 29 // [DEFAULT]=sld_sol=6.3e-6 [1/A^(2)] 30 30 double sld_sol; 31 31 /// Incoherent Background [1/cm] 0.00 -
sansmodels/src/sans/models/c_extensions/lamellarFF_HG.h
rb4679de r27972c1d 26 26 // [DEFAULT]=h_thickness=10.0 [A] 27 27 double h_thickness; 28 /// tail scrattering length density[1/A ²]29 // [DEFAULT]=sld_tail=4e-7 [1/A ²]28 /// tail scrattering length density[1/A^(2)] 29 // [DEFAULT]=sld_tail=4e-7 [1/A^(2)] 30 30 double sld_tail; 31 /// head group scrattering length density[1/A ²]32 // [DEFAULT]=sld_head=3e-6 [1/A ²]31 /// head group scrattering length density[1/A^(2)] 32 // [DEFAULT]=sld_head=3e-6 [1/A^(2)] 33 33 double sld_head; 34 /// solvent scrattering length density[1/A ²]35 // [DEFAULT]=sld_solvent=6e-6 [1/A ²]34 /// solvent scrattering length density[1/A^(2)] 35 // [DEFAULT]=sld_solvent=6e-6 [1/A^(2)] 36 36 double sld_solvent; 37 37 /// Incoherent Background [1/cm] 0.00 -
sansmodels/src/sans/models/c_extensions/lamellarPS.h
rc1c29b6 r27972c1d 41 41 // [DEFAULT]=delta=30 [A] 42 42 double delta; 43 /// Contrast [1/A ²]44 // [DEFAULT]=contrast=5.3e-6 [1/A ²]43 /// Contrast [1/A^(2)] 44 // [DEFAULT]=contrast=5.3e-6 [1/A^(2)] 45 45 double contrast; 46 46 /// Number of lamellar plates -
sansmodels/src/sans/models/c_extensions/lamellarPS_HG.h
r96b59384 r27972c1d 45 45 // [DEFAULT]=deltaH=2.0 [A] 46 46 double deltaH; 47 /// scattering density length of tails [1/A ²]48 // [DEFAULT]=sld_tail=0.4e-6 [1/A ²]47 /// scattering density length of tails [1/A^(2)] 48 // [DEFAULT]=sld_tail=0.4e-6 [1/A^(2)] 49 49 double sld_tail; 50 /// scattering density length of head [1/A ²]51 // [DEFAULT]=sld_head=2e-6 [1/A ²]50 /// scattering density length of head [1/A^(2)] 51 // [DEFAULT]=sld_head=2e-6 [1/A^(2)] 52 52 double sld_head; 53 /// scattering density length of solvent [1/A ²]54 // [DEFAULT]=sld_solvent=6e-6 [1/A ²]53 /// scattering density length of solvent [1/A^(2)] 54 // [DEFAULT]=sld_solvent=6e-6 [1/A^(2)] 55 55 double sld_solvent; 56 56 /// Number of lamellar plates -
sansmodels/src/sans/models/c_extensions/multishell.h
r5eb9154 r27972c1d 29 29 double core_radius; 30 30 31 /// shell thickness [ Å]31 /// shell thickness [A] 32 32 // [DEFAULT]=s_thickness= 10.0 [A] 33 33 double s_thickness; 34 34 35 /// water thickness [ Å]35 /// water thickness [A] 36 36 // [DEFAULT]=w_thickness= 10.0 [A] 37 37 double w_thickness; 38 38 39 /// core scattering length density [1/ Ų]40 // [DEFAULT]=core_sld= 6.4e-6 [1/A ²]39 /// core scattering length density [1/A^(2)] 40 // [DEFAULT]=core_sld= 6.4e-6 [1/A^(2)] 41 41 double core_sld; 42 42 43 /// shell scattering length density [1/ Ų]44 // [DEFAULT]=shell_sld= 4.0e-7 [1/A ²]43 /// shell scattering length density [1/A^(2)] 44 // [DEFAULT]=shell_sld= 4.0e-7 [1/A^(2)] 45 45 double shell_sld; 46 46 -
sansmodels/src/sans/models/c_extensions/oblate.h
r975ec8e r27972c1d 43 43 // [DEFAULT]=minor_shell=30.0 [A] 44 44 double minor_shell; 45 /// Scattering contrast [1/A ²]46 // [DEFAULT]=contrast=1.0e-6 [1/A ²]45 /// Scattering contrast [1/A^(2)] 46 // [DEFAULT]=contrast=1.0e-6 [1/A^(2)] 47 47 double contrast; 48 /// Solvent scattering length density [1/A ²]49 // [DEFAULT]=sld_solvent=6.3e-6 [1/A ²]48 /// Solvent scattering length density [1/A^(2)] 49 // [DEFAULT]=sld_solvent=6.3e-6 [1/A^(2)] 50 50 double sld_solvent; 51 51 /// Incoherent Background [1/cm] 0.001 -
sansmodels/src/sans/models/c_extensions/parallelepiped.h
rbe8c217 r27972c1d 35 35 // [DEFAULT]=long_c=400 [A] 36 36 double long_c; 37 /// Contrast [1/A ²]38 // [DEFAULT]=contrast=53e-7 [1/A ²]37 /// Contrast [1/A^(2)] 38 // [DEFAULT]=contrast=53e-7 [1/A^(2)] 39 39 double contrast; 40 40 /// Incoherent Background [1/cm] -
sansmodels/src/sans/models/c_extensions/prolate.h
r8dc0b746 r27972c1d 42 42 // [DEFAULT]=minor_shell=60.0 [A] 43 43 double minor_shell; 44 /// Scattering contrast [1/A ²]45 // [DEFAULT]=contrast=1.0e-6 [1/A ²]44 /// Scattering contrast [1/A^(2)] 45 // [DEFAULT]=contrast=1.0e-6 [1/A^(2)] 46 46 double contrast; 47 /// Solvent scattering length density [1/A ²]48 // [DEFAULT]=sld_solvent=6.3e-6 [1/A ²]47 /// Solvent scattering length density [1/A^(2)] 48 // [DEFAULT]=sld_solvent=6.3e-6 [1/A^(2)] 49 49 double sld_solvent; 50 50 /// Incoherent Background [1/cm] 0.001 -
sansmodels/src/sans/models/c_extensions/sphere.h
r1ed3834 r27972c1d 30 30 double radius; 31 31 32 /// Contrast [1/ Ų]33 // [DEFAULT]=contrast= 1.0e-6 [1/A ²]32 /// Contrast [1/A^(2)] 33 // [DEFAULT]=contrast= 1.0e-6 [1/A^(2)] 34 34 double contrast; 35 35 -
sansmodels/src/sans/models/c_extensions/spheroid.h
r5eb9154 r27972c1d 45 45 // [DEFAULT]=polar_shell=30.0 [A] 46 46 double polar_shell; 47 /// Scattering contrast [1/A ²]48 // [DEFAULT]=contrast=1.0e-6 [1/A ²]47 /// Scattering contrast [1/A^(2)] 48 // [DEFAULT]=contrast=1.0e-6 [1/A^(2)] 49 49 double contrast; 50 /// Solvent scattering length density [1/A ²]51 // [DEFAULT]=sld_solvent=6.3e-6 [1/A ²]50 /// Solvent scattering length density [1/A^(2)] 51 // [DEFAULT]=sld_solvent=6.3e-6 [1/A^(2)] 52 52 double sld_solvent; 53 53 /// Incoherent Background [1/cm] 0.001 -
sansmodels/src/sans/models/c_extensions/stacked_disks.h
r7ad9887 r27972c1d 36 36 // [DEFAULT]=layer_thick=15.0 [A] 37 37 double layer_thick; 38 /// Core scattering length density[1/A ²]39 // [DEFAULT]=core_sld=4e-6 [1/A ²]38 /// Core scattering length density[1/A^(2)] 39 // [DEFAULT]=core_sld=4e-6 [1/A^(2)] 40 40 double core_sld; 41 /// layer scattering length density[1/A ²]42 // [DEFAULT]=layer_sld=-4e-7 [1/A ²]41 /// layer scattering length density[1/A^(2)] 42 // [DEFAULT]=layer_sld=-4e-7 [1/A^(2)] 43 43 double layer_sld; 44 /// solvent scattering length density[1/A ²]45 // [DEFAULT]=solvent_sld=5.0e-6 [1/A ²]44 /// solvent scattering length density[1/A^(2)] 45 // [DEFAULT]=solvent_sld=5.0e-6 [1/A^(2)] 46 46 double solvent_sld; 47 47 /// number of stacking -
sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.h
r7ad9887 r27972c1d 24 24 // [DEFAULT]=semi_axisC=400.0 [A] 25 25 double semi_axisC; 26 /// Contrast [1/A ²]27 // [DEFAULT]=contrast=5.3e-6 [1/A ²]26 /// Contrast [1/A^(2)] 27 // [DEFAULT]=contrast=5.3e-6 [1/A^(2)] 28 28 double contrast; 29 29 /// Incoherent Background [1/cm] 0.00 -
sansmodels/src/sans/models/c_extensions/vesicle.h
r7ad9887 r27972c1d 25 25 double radius; 26 26 27 /// shell thickness [ Å]27 /// shell thickness [A] 28 28 // [DEFAULT]=thickness= 30.0 [A] 29 29 double thickness; 30 30 31 /// core scattering length density [1/ Ų]32 // [DEFAULT]=core_sld= 6.36e-6 [1/A ²]31 /// core scattering length density [1/A^(2)] 32 // [DEFAULT]=core_sld= 6.36e-6 [1/A^(2)] 33 33 double core_sld; 34 34 35 /// shell scattering length density [1/ Ų]36 // [DEFAULT]=shell_sld= 5.0e-7 [1/A ²]35 /// shell scattering length density [1/A^(2)] 36 // [DEFAULT]=shell_sld= 5.0e-7 [1/A^(2)] 37 37 double shell_sld; 38 38 -
sansmodels/src/sans/models/c_models/CBinaryHSModel.cpp
rf9bf661 r27972c1d 86 86 87 87 // Initialize parameter dictionary 88 PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000)); 89 PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000)); 90 PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.000000)); 88 91 PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.100000)); 89 PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000));90 PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000));91 PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000006));92 PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.000003));93 PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.000000));94 PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000));95 PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.000000));96 92 // Initialize dispersion / averaging parameter dict 97 93 DispersionVisitor* visitor = new DispersionVisitor(); … … 234 230 235 231 // Reader parameter dictionary 232 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 233 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 234 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 236 235 self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 237 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );238 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") );239 self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") );240 self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") );241 self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") );242 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") );243 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") );244 236 // Read in dispersion parameters 245 237 PyObject* disp_dict; … … 311 303 312 304 // Reader parameter dictionary 305 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 306 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 307 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 313 308 self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 314 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );315 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") );316 self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") );317 self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") );318 self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") );319 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") );320 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") );321 309 // Read in dispersion parameters 322 310 PyObject* disp_dict; … … 375 363 376 364 // Reader parameter dictionary 365 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 366 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 367 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 377 368 self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 378 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );379 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") );380 self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") );381 self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") );382 self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") );383 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") );384 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") );385 369 // Read in dispersion parameters 386 370 PyObject* disp_dict; … … 408 392 409 393 // Reader parameter dictionary 394 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 395 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 396 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 410 397 self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 411 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );412 self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") );413 self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") );414 self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") );415 self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") );416 self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") );417 self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") );418 398 // Read in dispersion parameters 419 399 PyObject* disp_dict;
Note: See TracChangeset
for help on using the changeset viewer.
