Updates cpp with resolution and background functions (#120)

Author: StephenNneji

RATapi/examples/non_polarised/backgroundFunction.py

@@ -0,0 +1,15 @@
+import numpy as np
+
+
+def backgroundFunction(xdata, params):
+    # Split up the params array
+    Ao = params[0]
+    k = params[1]
+    back_const = params[2]
+
+    # Make an exponential decay background
+    background = np.zeros(len(xdata))
+    for i in range(0, len(xdata)):
+        background[i] = Ao * np.exp(-k * xdata[i]) + back_const
+
+    return background

RATapi/inputs.py

@@ -223,6 +223,7 @@ def make_problem(project: RATapi.Project, checks: Checks) -> ProblemDefinition:
     data_limits = []
     simulation_limits = []
     contrast_resolution_params = []
+    contrast_resolution_types = []
 
     # set data, background and resolution for each contrast
     for contrast in project.contrasts:
@@ -278,11 +279,12 @@ def make_problem(project: RATapi.Project, checks: Checks) -> ProblemDefinition:
         all_data.append(np.column_stack((data, np.zeros((data.shape[0], 6 - data.shape[1])))))
 
         # Set resolution parameters, with -1 used to indicate a data resolution
+        contrast_resolution_param = []
         resolution = project.resolutions[contrast.resolution]
-        if resolution.type == TypeOptions.Data:
-            contrast_resolution_params.append(-1)
-        else:
-            contrast_resolution_params.append(project.resolution_parameters.index(resolution.source, True))
+        contrast_resolution_types.append(resolution.type)
+        if resolution.source:
+            contrast_resolution_param.append(project.resolution_parameters.index(resolution.source, True))
+        contrast_resolution_params.append(contrast_resolution_param)
 
     problem = ProblemDefinition()
 
@@ -306,7 +308,10 @@ def make_problem(project: RATapi.Project, checks: Checks) -> ProblemDefinition:
     ]
     problem.contrastBulkIns = [project.bulk_in.index(contrast.bulk_in, True) for contrast in project.contrasts]
     problem.contrastBulkOuts = [project.bulk_out.index(contrast.bulk_out, True) for contrast in project.contrasts]
+
     problem.contrastResolutionParams = contrast_resolution_params
+    problem.contrastResolutionTypes = contrast_resolution_types
+
     problem.backgroundParams = [param.value for param in project.background_parameters]
     problem.qzshifts = [0.0]
     problem.scalefactors = [param.value for param in project.scalefactors]
@@ -429,7 +434,6 @@ def check_indices(problem: ProblemDefinition) -> None:
         "scalefactors": "contrastScalefactors",
         "bulkIns": "contrastBulkIns",
         "bulkOuts": "contrastBulkOuts",
-        "resolutionParams": "contrastResolutionParams",
         "domainRatios": "contrastDomainRatios",
     }
 

RATapi/outputs.py

@@ -71,7 +71,6 @@ class ContrastParams(RATResult):
     scalefactors: np.ndarray
     bulkIn: np.ndarray
     bulkOut: np.ndarray
-    resolutionParams: np.ndarray
     subRoughs: np.ndarray
     resample: np.ndarray
 
@@ -178,7 +177,6 @@ def make_results(
         scalefactors=output_results.contrastParams.scalefactors,
         bulkIn=output_results.contrastParams.bulkIn,
         bulkOut=output_results.contrastParams.bulkOut,
-        resolutionParams=output_results.contrastParams.resolutionParams,
         subRoughs=output_results.contrastParams.subRoughs,
         resample=output_results.contrastParams.resample,
     )

RATapi/wrappers.py

@@ -57,25 +57,24 @@ def getHandle(self) -> Callable[[ArrayLike, ArrayLike, ArrayLike, int, int], tup
 
         """
 
-        def handle(params, bulk_in, bulk_out, contrast, domain=-1):
-            if domain == -1:
-                output, sub_rough = getattr(self.engine, self.function_name)(
-                    np.array(params, "float"),
-                    np.array(bulk_in, "float"),
-                    np.array(bulk_out, "float"),
-                    float(contrast + 1),
-                    nargout=2,
+        def handle(*args):
+            if len(args) == 2:
+                output = getattr(self.engine, self.function_name)(
+                    np.array(args[0], "float"),  # xdata
+                    np.array(args[1], "float"),  # params
+                    nargout=1,
                 )
+                return np.array(output, "float").tolist()
             else:
                 output, sub_rough = getattr(self.engine, self.function_name)(
-                    np.array(params, "float"),
-                    np.array(bulk_in, "float"),
-                    np.array(bulk_out, "float"),
-                    float(contrast + 1),
-                    float(domain + 1),
+                    np.array(args[0], "float"),  # params
+                    np.array(args[1], "float"),  # bulk in
+                    np.array(args[2], "float"),  # bulk out
+                    float(args[3] + 1),  # contrast
+                    float(-1 if len(args) < 5 else args[4] + 1),  # domain
                     nargout=2,
                 )
-            return output, sub_rough
+                return np.array(output, "float").tolist(), float(sub_rough)
 
         return handle
 
@@ -105,11 +104,7 @@ def getHandle(self) -> Callable[[ArrayLike, ArrayLike, ArrayLike, int, int], tup
 
         """
 
-        def handle(params, bulk_in, bulk_out, contrast, domain=-1):
-            if domain == -1:
-                output, sub_rough = self.engine.invoke(params, bulk_in, bulk_out, contrast)
-            else:
-                output, sub_rough = self.engine.invoke(params, bulk_in, bulk_out, contrast, domain)
-            return output, sub_rough
+        def handle(*args):
+            return self.engine.invoke(*args)
 
         return handle