Adds names and checks to "test_run.py"

Author: DrPaulSharp

tests/test_inputs.py

@@ -132,14 +132,14 @@ def test_names():
 def test_checks():
     """The expected checks object from "standard_layers_project", "domains_project" and "custom_xy_project"."""
     checks = Checks()
-    checks.params = [1, 0, 0, 0]
-    checks.backgroundParams = [0]
-    checks.scalefactors = [0]
-    checks.qzshifts = []
-    checks.bulkIns = [0]
-    checks.bulkOuts = [0]
-    checks.resolutionParams = [0]
-    checks.domainRatios = []
+    checks.params = np.array([1, 0, 0, 0])
+    checks.backgroundParams = np.array([0])
+    checks.scalefactors = np.array([0])
+    checks.qzshifts = np.array([])
+    checks.bulkIns = np.array([0])
+    checks.bulkOuts = np.array([0])
+    checks.resolutionParams = np.array([0])
+    checks.domainRatios = np.array([])
 
     return checks
 

tests/test_run.py

@@ -168,6 +168,47 @@ def reflectivity_calculation_problem():
             [1.00e-02, 5.00e-02],
         ],
     )
+    problem.names.params = [
+        "Substrate Roughness",
+        "Oxide Thickness",
+        "Oxide SLD",
+        "SAM Tails Thickness",
+        "SAM Tails SLD",
+        "SAM Tails Hydration",
+        "SAM Roughness",
+        "CW Thickness",
+        "CW SLD",
+        "SAM Heads Thickness",
+        "SAM Heads SLD",
+        "SAM Heads Hydration",
+        "Bilayer Heads Thickness",
+        "Bilayer Heads SLD",
+        "Bilayer Roughness",
+        "Bilayer Tails Thickness",
+        "Bilayer Tails SLD",
+        "Bilayer Tails Hydration",
+        "Bilayer Heads Hydration",
+        "CW Hydration",
+        "Oxide Hydration",
+    ]
+    problem.names.backgroundParams = ["Background parameter D2O", "Background parameter SMW"]
+    problem.names.scalefactors = ["Scalefactor 1", "Scalefactor 2"]
+    problem.names.qzshifts = []
+    problem.names.bulkIns = ["Silicon"]
+    problem.names.bulkOuts = ["D2O", "SMW"]
+    problem.names.resolutionParams = ["Resolution Param 1"]
+    problem.names.domainRatios = []
+    problem.names.contrasts = ["D2O", "SMW"]
+    problem.checks.params = np.array(
+        [1.0, 1.0, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]
+    )
+    problem.checks.backgroundParams = np.array([1.0, 1.0])
+    problem.checks.scalefactors = np.array([0.0, 0.0])
+    problem.checks.qzshifts = np.array([])
+    problem.checks.bulkIns = np.array([0.0])
+    problem.checks.bulkOuts = np.array([1.0, 1.0])
+    problem.checks.resolutionParams = np.array([0.0])
+    problem.checks.domainRatios = np.array([])
 
     return problem
 
@@ -325,6 +366,47 @@ def dream_problem():
             [0.00e00, 0.00e00],
         ],
     )
+    problem.names.params = [
+        "Substrate Roughness",
+        "Oxide Thickness",
+        "Oxide SLD",
+        "SAM Tails Thickness",
+        "SAM Tails SLD",
+        "SAM Tails Hydration",
+        "SAM Roughness",
+        "CW Thickness",
+        "CW SLD",
+        "SAM Heads Thickness",
+        "SAM Heads SLD",
+        "SAM Heads Hydration",
+        "Bilayer Heads Thickness",
+        "Bilayer Heads SLD",
+        "Bilayer Roughness",
+        "Bilayer Tails Thickness",
+        "Bilayer Tails SLD",
+        "Bilayer Tails Hydration",
+        "Bilayer Heads Hydration",
+        "CW Hydration",
+        "Oxide Hydration",
+    ]
+    problem.names.backgroundParams = ["Background parameter D2O", "Background parameter SMW"]
+    problem.names.scalefactors = ["Scalefactor 1", "Scalefactor 2"]
+    problem.names.qzshifts = []
+    problem.names.bulkIns = ["Silicon"]
+    problem.names.bulkOuts = ["D2O", "SMW"]
+    problem.names.resolutionParams = ["Resolution Param 1"]
+    problem.names.domainRatios = []
+    problem.names.contrasts = ["D2O", "SMW"]
+    problem.checks.params = np.array(
+        [1.0, 1.0, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]
+    )
+    problem.checks.backgroundParams = np.array([1.0, 1.0])
+    problem.checks.scalefactors = np.array([0.0, 0.0])
+    problem.checks.qzshifts = np.array([])
+    problem.checks.bulkIns = np.array([0.0])
+    problem.checks.bulkOuts = np.array([1.0, 1.0])
+    problem.checks.resolutionParams = np.array([0.0])
+    problem.checks.domainRatios = np.array([])
 
     return problem