Update cpp and remove notify display option

Author: StephenNneji

cpp/RAT

@@ -595,7 +595,7 @@ resampleMinAngle : float
 resampleNPoints : int
     The number of initial points to use for resampling.
 display : str
-    How much RAT should print to the terminal. Can be 'off', 'iter', 'notify', or 'final'.
+    How much RAT should print to the terminal. Can be 'off', 'iter', or 'final'.
 IPCFilePath : str
     The path of the inter process communication file.
 updateFreq : int

cpp/includes/defines.h

@@ -66,7 +66,7 @@ class Controls(BaseModel, validate_assignment=True, extra="forbid", use_attribut
     """The number of initial points to use for resampling."""
 
     display: Display = Display.Iter
-    """How much RAT should print to the terminal. Can be 'off', 'iter', 'notify', or 'final'."""
+    """How much RAT should print to the terminal. Can be 'off', 'iter', or 'final'."""
 
     # Simplex
     xTolerance: float = Field(1.0e-6, gt=0.0)

ratapi/controls.py

@@ -36,7 +36,7 @@ def domains_XY_model(params, bulk_in, bulk_out, contrast, domain):
     vfWater = 1 - totalVF
 
     # Now convert the Volume Fractions to SLDs
-    siSLD = vfSilicon * bulk_in
+    siSLD = vfSilicon * bulk_in[contrast - 1]
     oxSLD = vfOxide * 3.41e-6
 
     # Layer SLD depends on whether we are calculating the domain or not

ratapi/examples/domains/domains_XY_model.py

@@ -60,7 +60,6 @@ class Display(RATEnum):
 
     Off = "off"
     Iter = "iter"
-    Notify = "notify"
     Final = "final"
 
 

ratapi/utils/enums.py

@@ -116,7 +116,7 @@ def test_calculate_property_values(self, control_property: str, value: Any) -> N
             ("numSimulationPoints", 10),
             ("resampleMinAngle", 0.2),
             ("resampleNPoints", 1),
-            ("display", Display.Notify),
+            ("display", Display.Final),
         ],
     )
     def test_calculate_property_setters(self, control_property: str, value: Any) -> None:
@@ -211,7 +211,7 @@ def test_calculate_parallel_validation(self, value: Any) -> None:
     @pytest.mark.parametrize("value", ["test", "iterate", True, 1, 3.0])
     def test_calculate_display_validation(self, value: Any) -> None:
         """Tests the display setter validation in Calculate class."""
-        with pytest.raises(pydantic.ValidationError, match="Input should be 'off', 'iter', 'notify' or 'final'"):
+        with pytest.raises(pydantic.ValidationError, match="Input should be 'off', 'iter' or 'final'"):
             self.calculate.display = value
 
     def test_str(self, table_str) -> None:
@@ -277,7 +277,7 @@ def test_simplex_property_values(self, control_property: str, value: Any) -> Non
             ("numSimulationPoints", 10),
             ("resampleMinAngle", 0.2),
             ("resampleNPoints", 1),
-            ("display", Display.Notify),
+            ("display", Display.Final),
             ("xTolerance", 4e-6),
             ("funcTolerance", 3e-4),
             ("maxFuncEvals", 100),
@@ -436,7 +436,7 @@ def test_de_property_values(self, control_property: str, value: Any) -> None:
             ("numSimulationPoints", 10),
             ("resampleMinAngle", 0.2),
             ("resampleNPoints", 1),
-            ("display", Display.Notify),
+            ("display", Display.Final),
             ("populationSize", 20),
             ("fWeight", 0.3),
             ("crossoverProbability", 0.4),
@@ -603,7 +603,7 @@ def test_ns_property_values(self, control_property: str, value: Any) -> None:
             ("numSimulationPoints", 10),
             ("resampleMinAngle", 0.2),
             ("resampleNPoints", 1),
-            ("display", Display.Notify),
+            ("display", Display.Final),
             ("nLive", 1500),
             ("nMCMC", 1),
             ("propScale", 0.5),
@@ -773,7 +773,7 @@ def test_dream_property_values(self, control_property: str, value: Any) -> None:
             ("numSimulationPoints", 10),
             ("resampleMinAngle", 0.2),
             ("resampleNPoints", 1),
-            ("display", Display.Notify),
+            ("display", Display.Final),
             ("nSamples", 500),
             ("nChains", 1000),
             ("jumpProbability", 0.7),

tests/test_controls.py

@@ -35,7 +35,6 @@
         (Parallel, "contrasts", Parallel.Contrasts),
         (Display, "off", Display.Off),
         (Display, "iter", Display.Iter),
-        (Display, "notify", Display.Notify),
         (Display, "final", Display.Final),
         (BoundHandling, "off", BoundHandling.Off),
         (BoundHandling, "reflect", BoundHandling.Reflect),