Changeset 3d8283b in sasmodels

Timestamp:

Mar 21, 2016 5:57:51 AM (9 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, 02a0920

Parents:

76e5041

Message:

renamed infinitely_thin to _thin, renamed sld

Location:

sasmodels/models

Files:

• hollow_rectangular_prism.py (modified) (4 diffs)
• hollow_rectangular_prism_thin_walls.c (moved) (moved from sasmodels/models/hollow_rectangular_prism_infinitely_thin_walls.c)
• hollow_rectangular_prism_thin_walls.py (moved) (moved from sasmodels/models/hollow_rectangular_prism_infinitely_thin_walls.py) (5 diffs)

sasmodels/models/hollow_rectangular_prism.py

@@ -88 +88 @@
 title = "Hollow rectangular parallelepiped with uniform scattering length density."
 description = """
-    I(q)= scale*V*(sld - solvent_sld)^2*P(q,theta,phi)+background
+    I(q)= scale*V*(sld - sld_solvent)^2*P(q,theta,phi)+background
         P(q,theta,phi) = (2/pi/V^2) * double integral from 0 to pi/2 of ...
            (AP1-AP2)^2(q)*sin(theta)*dtheta*dphi
@@ -103 +103 @@
 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "",
                "Parallelepiped scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Solvent scattering length density"],
               ["a_side", "Ang", 35, [0, inf], "volume",
@@ -148 +148 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6.3e-6, solvent_sld=1.0e-6,
+            sld=6.3e-6, sld_solvent=1.0e-6,
             a_side=35, b2a_ratio=1, c2a_ratio=1, thickness=1,
             a_side_pd=0.1, a_side_pd_n=10,
@@ -158 +158 @@
 oldname = 'RectangularHollowPrismModel'
 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio',
-               thickness='thickness', sld='sldPipe', solvent_sld='sldSolv')
+               thickness='thickness', sld='sldPipe', sld_solvent='sldSolv')
 
 tests = [[{}, 0.2, 0.76687283098],

sasmodels/models/hollow_rectangular_prism_thin_walls.py

@@ -77 +77 @@
 from numpy import pi, inf, sqrt
 
-name = "hollow_rectangular_prism_infinitely_thin_walls"
-title = "Hollow rectangular parallelepiped with infinitely thin walls."
+name = "hollow_rectangular_prism_thin_walls"
+title = "Hollow rectangular parallelepiped with thin walls."
 description = """
-    I(q)= scale*V*(sld - solvent_sld)^2*P(q)+background
+    I(q)= scale*V*(sld - sld_solvent)^2*P(q)+background
         with P(q) being the form factor corresponding to a hollow rectangular
         parallelepiped with infinitely thin walls.
@@ -89 +89 @@
 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "",
                "Parallelepiped scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Solvent scattering length density"],
               ["a_side", "Ang", 35, [0, inf], "volume",
@@ -99 +99 @@
              ]
 
-source = ["lib/gauss76.c", "hollow_rectangular_prism_infinitely_thin_walls.c"]
+source = ["lib/gauss76.c", "hollow_rectangular_prism_thin_walls.c"]
 
 def ER(a_side, b2a_ratio, c2a_ratio):
@@ -127 +127 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6.3e-6, solvent_sld=1.0e-6,
+            sld=6.3e-6, sld_solvent=1.0e-6,
             a_side=35, b2a_ratio=1, c2a_ratio=1,
             a_side_pd=0.1, a_side_pd_n=10,
@@ -137 +137 @@
 oldname = 'RectangularHollowPrismInfThinWallsModel'
 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio',
-               sld='sldPipe', solvent_sld='sldSolv')
+               sld='sldPipe', sld_solvent='sldSolv')
 
 tests = [[{}, 0.2, 0.837719188592],