Change limits to θ in [-180, 180] for all models

Paul Kienzle · Paul Kienzle · commit 8d66923401a2 · 2025-09-12T19:25:03.000-04:00
diff --git a/sasmodels/models/barbell.py b/sasmodels/models/barbell.py
@@ -112,7 +112,7 @@
     ["radius_bell", "Ang",         40, [0, inf],    "volume",      "Spherical bell radius"],
     ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylindrical bar radius"],
     ["length",      "Ang",        400, [0, inf],    "volume",      "Cylinder bar length"],
-    ["theta",       "degrees",     60, [-360, 360], "orientation", "Barbell axis to beam angle"],
+    ["theta",       "degrees",     60, [-180, 180], "orientation", "Barbell axis to beam angle"],
     ["phi",         "degrees",     60, [-360, 360], "orientation", "Rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/bcc_paracrystal.py b/sasmodels/models/bcc_paracrystal.py
@@ -188,7 +188,7 @@
               ["radius",      "Ang",        40,    [0, inf],    "volume",      "Particle radius"],
               ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "sld",         "Particle scattering length density"],
               ["sld_solvent", "1e-6/Ang^2",  1,    [-inf, inf], "sld",         "Solvent scattering length density"],
-              ["theta",       "degrees",    60,    [-360, 360], "orientation", "c axis to beam angle"],
+              ["theta",       "degrees",    60,    [-180, 180], "orientation", "c axis to beam angle"],
               ["phi",         "degrees",    60,    [-360, 360], "orientation", "rotation about beam"],
               ["psi",         "degrees",    60,    [-360, 360], "orientation", "rotation about c axis"]
              ]
diff --git a/sasmodels/models/capped_cylinder.py b/sasmodels/models/capped_cylinder.py
@@ -132,7 +132,7 @@
               # both models, one would be a pill.
               ["radius_cap", "Ang",     20, [0, inf],    "volume", "Cap radius"],
               ["length",     "Ang",    400, [0, inf],    "volume", "Cylinder length"],
-              ["theta",      "degrees", 60, [-360, 360], "orientation", "cylinder axis to beam angle"],
+              ["theta",      "degrees", 60, [-180, 180], "orientation", "cylinder axis to beam angle"],
               ["phi",        "degrees", 60, [-360, 360], "orientation", "rotation about beam"],
              ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/core_shell_bicelle.py b/sasmodels/models/core_shell_bicelle.py
@@ -146,7 +146,7 @@
     ["sld_face",       "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder face scattering length density"],
     ["sld_rim",        "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",          "degrees",   90, [-360, 360], "orientation", "cylinder axis to beam angle"],
+    ["theta",          "degrees",   90, [-180, 180], "orientation", "cylinder axis to beam angle"],
     ["phi",            "degrees",    0, [-360, 360], "orientation", "rotation about beam"]
     ]
 
diff --git a/sasmodels/models/core_shell_bicelle_elliptical.py b/sasmodels/models/core_shell_bicelle_elliptical.py
@@ -137,7 +137,7 @@
     ["sld_face",       "1e-6/Ang^2", 7, [-inf, inf], "sld",         "Cylinder face scattering length density"],
     ["sld_rim",        "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 6, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],
+    ["theta",       "degrees",    90.0, [-180, 180], "orientation", "Cylinder axis to beam angle"],
     ["phi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about beam"],
     ["psi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about cylinder axis"]
     ]
diff --git a/sasmodels/models/core_shell_bicelle_elliptical_belt_rough.py b/sasmodels/models/core_shell_bicelle_elliptical_belt_rough.py
@@ -150,7 +150,7 @@
     ["sld_rim",        "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 6, [-inf, inf], "sld",         "Solvent scattering length density"],
     ["sigma",       "Ang",        0,    [0, inf],    "",            "Interfacial roughness"],
-    ["theta",       "degrees",    90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],
+    ["theta",       "degrees",    90.0, [-180, 180], "orientation", "Cylinder axis to beam angle"],
     ["phi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about beam"],
     ["psi",         "degrees",    0,    [-360, 360], "orientation", "Rotation about cylinder axis"],
     ]
diff --git a/sasmodels/models/core_shell_cylinder.py b/sasmodels/models/core_shell_cylinder.py
@@ -127,7 +127,7 @@
                "Cylinder shell thickness"],
               ["length", "Ang", 400, [0, inf], "volume",
                "Cylinder length"],
-              ["theta", "degrees", 60, [-360, 360], "orientation",
+              ["theta", "degrees", 60, [-180, 180], "orientation",
                "cylinder axis to beam angle"],
               ["phi", "degrees", 60, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/core_shell_ellipsoid.py b/sasmodels/models/core_shell_ellipsoid.py
@@ -144,7 +144,7 @@
     ["sld_core",      "1e-6/Ang^2", 2,   [-inf, inf], "sld",         "Core scattering length density"],
     ["sld_shell",     "1e-6/Ang^2", 1,   [-inf, inf], "sld",         "Shell scattering length density"],
     ["sld_solvent",   "1e-6/Ang^2", 6.3, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",         "degrees",    0,   [-360, 360], "orientation", "elipsoid axis to beam angle"],
+    ["theta",         "degrees",    0,   [-180, 180], "orientation", "elipsoid axis to beam angle"],
     ["phi",           "degrees",    0,   [-360, 360], "orientation", "rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/core_shell_parallelepiped.py b/sasmodels/models/core_shell_parallelepiped.py
@@ -216,7 +216,7 @@
                "Thickness of B rim"],
               ["thick_rim_c", "Ang", 10, [0, inf], "volume",
                "Thickness of C rim"],
-              ["theta", "degrees", 0, [-360, 360], "orientation",
+              ["theta", "degrees", 0, [-180, 180], "orientation",
                "c axis to beam angle"],
               ["phi", "degrees", 0, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/cylinder.py b/sasmodels/models/cylinder.py
@@ -137,7 +137,7 @@
     ["sld_solvent", "1e-6/Ang^2",   1, [-inf, inf], "sld",         "Solvent scattering length density"],
     ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylinder radius"],
     ["length",      "Ang",        400, [0, inf],    "volume",      "Cylinder length"],
-    ["theta",       "degrees",     60, [-360, 360], "orientation", "cylinder axis to beam angle"],
+    ["theta",       "degrees",     60, [-180, 180], "orientation", "cylinder axis to beam angle"],
     ["phi",         "degrees",     60, [-360, 360], "orientation", "rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/ellipsoid.py b/sasmodels/models/ellipsoid.py
@@ -147,7 +147,7 @@
     ["sld_solvent", "1e-6/Ang^2",   1, [-inf, inf], "sld",         "Solvent scattering length density"],
     ["radius_polar",       "Ang",  20, [0, inf],    "volume",      "Polar radius"],
     ["radius_equatorial",  "Ang", 400, [0, inf],    "volume",      "Equatorial radius"],
-    ["theta",          "degrees",  60, [-360, 360], "orientation", "ellipsoid axis to beam angle"],
+    ["theta",          "degrees",  60, [-180, 180], "orientation", "ellipsoid axis to beam angle"],
     ["phi",            "degrees",  60, [-360, 360], "orientation", "rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/elliptical_cylinder.py b/sasmodels/models/elliptical_cylinder.py
@@ -117,7 +117,7 @@
               ["length",      "Ang",        400.0, [1, inf],    "volume",      "Length of the cylinder"],
               ["sld",         "1e-6/Ang^2", 4.0,   [-inf, inf], "sld",         "Cylinder scattering length density"],
               ["sld_solvent", "1e-6/Ang^2", 1.0,   [-inf, inf], "sld",         "Solvent scattering length density"],
-              ["theta",       "degrees",    90.0,  [-360, 360], "orientation", "cylinder axis to beam angle"],
+              ["theta",       "degrees",    90.0,  [-180, 180], "orientation", "cylinder axis to beam angle"],
               ["phi",         "degrees",    0,     [-360, 360], "orientation", "rotation about beam"],
               ["psi",         "degrees",    0,     [-360, 360], "orientation", "rotation about cylinder axis"]]
 
diff --git a/sasmodels/models/fcc_paracrystal.py b/sasmodels/models/fcc_paracrystal.py
@@ -186,7 +186,7 @@
               ["radius", "Ang", 40, [0, inf], "volume", "Particle radius"],
               ["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", "Particle scattering length density"],
               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Solvent scattering length density"],
-              ["theta",       "degrees",    60,    [-360, 360], "orientation", "c axis to beam angle"],
+              ["theta",       "degrees",    60,    [-180, 180], "orientation", "c axis to beam angle"],
               ["phi",         "degrees",    60,    [-360, 360], "orientation", "rotation about beam"],
               ["psi",         "degrees",    60,    [-360, 360], "orientation", "rotation about c axis"]
              ]
diff --git a/sasmodels/models/hollow_cylinder.py b/sasmodels/models/hollow_cylinder.py
@@ -93,7 +93,7 @@
     ["length",      "Ang",    400.0, [0, inf],    "volume",      "Cylinder total length"],
     ["sld",         "1e-6/Ang^2",  6.3, [-inf, inf], "sld",      "Cylinder sld"],
     ["sld_solvent", "1e-6/Ang^2",  1,   [-inf, inf], "sld",      "Solvent sld"],
-    ["theta",       "degrees", 90,   [-360, 360], "orientation", "Cylinder axis to beam angle"],
+    ["theta",       "degrees", 90,   [-180, 180], "orientation", "Cylinder axis to beam angle"],
     ["phi",         "degrees",  0,   [-360, 360], "orientation", "Rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/hollow_rectangular_prism.py b/sasmodels/models/hollow_rectangular_prism.py
@@ -138,7 +138,7 @@
                "Ratio sides c/a"],
               ["thickness", "Ang", 1, [0, inf], "volume",
                "Thickness of parallelepiped"],
-              ["theta", "degrees", 0, [-360, 360], "orientation",
+              ["theta", "degrees", 0, [-180, 180], "orientation",
                "c axis to beam angle"],
               ["phi", "degrees", 0, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/parallelepiped.py b/sasmodels/models/parallelepiped.py
@@ -223,7 +223,7 @@
                "Second side of the parallelepiped"],
               ["length_c", "Ang", 400, [0, inf], "volume",
                "Larger side of the parallelepiped"],
-              ["theta", "degrees", 60, [-360, 360], "orientation",
+              ["theta", "degrees", 60, [-180, 180], "orientation",
                "c axis to beam angle"],
               ["phi", "degrees", 60, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/rectangular_prism.py b/sasmodels/models/rectangular_prism.py
@@ -136,7 +136,7 @@
                "Ratio sides b/a"],
               ["c2a_ratio", "", 1, [0, inf], "volume",
                "Ratio sides c/a"],
-              ["theta", "degrees", 0, [-360, 360], "orientation",
+              ["theta", "degrees", 0, [-180, 180], "orientation",
                "c axis to beam angle"],
               ["phi", "degrees", 0, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/sc_paracrystal.py b/sasmodels/models/sc_paracrystal.py
@@ -183,7 +183,7 @@
               ["radius",      "Ang",        40.0, [0.0, inf],  "volume",      "Radius of sphere"],
               ["sld",  "1e-6/Ang^2",         3.0, [0.0, inf],  "sld",         "Sphere scattering length density"],
               ["sld_solvent", "1e-6/Ang^2",  6.3, [0.0, inf],  "sld",         "Solvent scattering length density"],
-              ["theta",       "degrees",    0,    [-360, 360], "orientation", "c axis to beam angle"],
+              ["theta",       "degrees",    0,    [-180, 180], "orientation", "c axis to beam angle"],
               ["phi",         "degrees",    0,    [-360, 360], "orientation", "rotation about beam"],
               ["psi",         "degrees",    0,    [-360, 360], "orientation", "rotation about c axis"]
              ]
diff --git a/sasmodels/models/stacked_disks.py b/sasmodels/models/stacked_disks.py
@@ -141,7 +141,7 @@
     ["sld_core",    "1e-6/Ang^2",  4,   [-inf, inf], "sld",         "Core scattering length density"],
     ["sld_layer",   "1e-6/Ang^2",  0.0, [-inf, inf], "sld",         "Layer scattering length density"],
     ["sld_solvent", "1e-6/Ang^2",  5.0, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",       "degrees",     0,   [-360, 360], "orientation", "Orientation of the stacked disk axis w/respect incoming beam"],
+    ["theta",       "degrees",     0,   [-180, 180], "orientation", "Orientation of the stacked disk axis w/respect incoming beam"],
     ["phi",         "degrees",     0,   [-360, 360], "orientation", "Rotation about beam"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
diff --git a/sasmodels/models/superball.py b/sasmodels/models/superball.py
@@ -142,7 +142,7 @@
                "Cube edge length of the superball"],
               ["exponent_p", "", 2.5, [0, inf], "volume",
                "Exponent describing the roundness of the superball"],
-              ["theta", "degrees", 0, [-360, 360], "orientation",
+              ["theta", "degrees", 0, [-180, 180], "orientation",
                "c axis to beam angle"],
               ["phi", "degrees", 0, [-360, 360], "orientation",
                "rotation about beam"],
diff --git a/sasmodels/models/triaxial_ellipsoid.py b/sasmodels/models/triaxial_ellipsoid.py
@@ -150,7 +150,7 @@
                "Major equatorial radius, Rb"],
               ["radius_polar", "Ang", 10, [0, inf], "volume",
                "Polar radius, Rc"],
-              ["theta", "degrees", 60, [-360, 360], "orientation",
+              ["theta", "degrees", 60, [-180, 180], "orientation",
                "polar axis to beam angle"],
               ["phi", "degrees", 60, [-360, 360], "orientation",
                "rotation about beam"],

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@`
`112`	`112`	`["radius_bell", "Ang", 40, [0, inf], "volume", "Spherical bell radius"],`
`113`	`113`	`["radius", "Ang", 20, [0, inf], "volume", "Cylindrical bar radius"],`
`114`	`114`	`["length", "Ang", 400, [0, inf], "volume", "Cylinder bar length"],`
`115`		`- ["theta", "degrees", 60, [-360, 360], "orientation", "Barbell axis to beam angle"],`
	`115`	`+ ["theta", "degrees", 60, [-180, 180], "orientation", "Barbell axis to beam angle"],`
`116`	`116`	`["phi", "degrees", 60, [-360, 360], "orientation", "Rotation about beam"],`
`117`	`117`	`]`
`118`	`118`	`# pylint: enable=bad-whitespace, line-too-long`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@`
`188`	`188`	`["radius", "Ang", 40, [0, inf], "volume", "Particle radius"],`
`189`	`189`	`["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", "Particle scattering length density"],`
`190`	`190`	`["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Solvent scattering length density"],`
`191`		`- ["theta", "degrees", 60, [-360, 360], "orientation", "c axis to beam angle"],`
	`191`	`+ ["theta", "degrees", 60, [-180, 180], "orientation", "c axis to beam angle"],`
`192`	`192`	`["phi", "degrees", 60, [-360, 360], "orientation", "rotation about beam"],`
`193`	`193`	`["psi", "degrees", 60, [-360, 360], "orientation", "rotation about c axis"]`
`194`	`194`	`]`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`# both models, one would be a pill.`
`133`	`133`	`["radius_cap", "Ang", 20, [0, inf], "volume", "Cap radius"],`
`134`	`134`	`["length", "Ang", 400, [0, inf], "volume", "Cylinder length"],`
`135`		`- ["theta", "degrees", 60, [-360, 360], "orientation", "cylinder axis to beam angle"],`
	`135`	`+ ["theta", "degrees", 60, [-180, 180], "orientation", "cylinder axis to beam angle"],`
`136`	`136`	`["phi", "degrees", 60, [-360, 360], "orientation", "rotation about beam"],`
`137`	`137`	`]`
`138`	`138`	`# pylint: enable=bad-whitespace, line-too-long`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@`
`146`	`146`	`["sld_face", "1e-6/Ang^2", 4, [-inf, inf], "sld", "Cylinder face scattering length density"],`
`147`	`147`	`["sld_rim", "1e-6/Ang^2", 4, [-inf, inf], "sld", "Cylinder rim scattering length density"],`
`148`	`148`	`["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Solvent scattering length density"],`
`149`		`- ["theta", "degrees", 90, [-360, 360], "orientation", "cylinder axis to beam angle"],`
	`149`	`+ ["theta", "degrees", 90, [-180, 180], "orientation", "cylinder axis to beam angle"],`
`150`	`150`	`["phi", "degrees", 0, [-360, 360], "orientation", "rotation about beam"]`
`151`	`151`	`]`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@`
`137`	`137`	`["sld_face", "1e-6/Ang^2", 7, [-inf, inf], "sld", "Cylinder face scattering length density"],`
`138`	`138`	`["sld_rim", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Cylinder rim scattering length density"],`
`139`	`139`	`["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld", "Solvent scattering length density"],`
`140`		`- ["theta", "degrees", 90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],`
	`140`	`+ ["theta", "degrees", 90.0, [-180, 180], "orientation", "Cylinder axis to beam angle"],`
`141`	`141`	`["phi", "degrees", 0, [-360, 360], "orientation", "Rotation about beam"],`
`142`	`142`	`["psi", "degrees", 0, [-360, 360], "orientation", "Rotation about cylinder axis"]`
`143`	`143`	`]`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@`
`150`	`150`	`["sld_rim", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Cylinder rim scattering length density"],`
`151`	`151`	`["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld", "Solvent scattering length density"],`
`152`	`152`	`["sigma", "Ang", 0, [0, inf], "", "Interfacial roughness"],`
`153`		`- ["theta", "degrees", 90.0, [-360, 360], "orientation", "Cylinder axis to beam angle"],`
	`153`	`+ ["theta", "degrees", 90.0, [-180, 180], "orientation", "Cylinder axis to beam angle"],`
`154`	`154`	`["phi", "degrees", 0, [-360, 360], "orientation", "Rotation about beam"],`
`155`	`155`	`["psi", "degrees", 0, [-360, 360], "orientation", "Rotation about cylinder axis"],`
`156`	`156`	`]`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@`
`144`	`144`	`["sld_core", "1e-6/Ang^2", 2, [-inf, inf], "sld", "Core scattering length density"],`
`145`	`145`	`["sld_shell", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Shell scattering length density"],`
`146`	`146`	`["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf], "sld", "Solvent scattering length density"],`
`147`		`- ["theta", "degrees", 0, [-360, 360], "orientation", "elipsoid axis to beam angle"],`
	`147`	`+ ["theta", "degrees", 0, [-180, 180], "orientation", "elipsoid axis to beam angle"],`
`148`	`148`	`["phi", "degrees", 0, [-360, 360], "orientation", "rotation about beam"],`
`149`	`149`	`]`
`150`	`150`	`# pylint: enable=bad-whitespace, line-too-long`