Skip to content

Fix issues with R1 conversion #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexhroom merged 2 commits into from
Nov 27, 2024
Merged

Fix issues with R1 conversion #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
281b161
fixed custom xy label and layer index names
alexhroom Nov 20, 2024
0c48550
added additional test cases
alexhroom Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions RATapi/utils/convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def r1_to_project_class(filename: str) -> Project:

# R1 uses a different name for custom xy layer model
layer_model = mat_module["type"]
if layer_model == "custom XY profile":
if layer_model.lower() == "custom xy profile":
layer_model = LayerModels.CustomXY
layer_model = LayerModels(layer_model)

Expand Down Expand Up @@ -105,7 +105,9 @@ def read_param(names, constrs, values, fits):
f"Background parameter {i}" for i in range(1, mat_project["numberOfBacks"] + 1)
]

if mat_project["numberOfResolutions"] == 1:
# sometimes numberOfResolutions isn't defined: in all these cases there's only one resolution
# maybe from before multiple resolutions were possible?
if getattr(mat_project, "numberOfResolutions", 1) == 1:
mat_project["res_param_names"] = "Resolution parameter 1"
else:
mat_project["res_param_names"] = [
Expand Down Expand Up @@ -208,10 +210,11 @@ def read_param(names, constrs, values, fits):
[
Layer(
name=name,
thickness=params[thickness - 1].name,
SLD=params[sld - 1].name,
roughness=params[roughness - 1].name,
hydration=params[hydration - 1].name,
thickness=params[int(thickness) - 1].name,
SLD=params[int(sld) - 1].name,
roughness=params[int(roughness) - 1].name,
# if hydration is not set, it is an empty numpy array, else it is a string representing a number
hydration=params[int(hydration) - 1].name if getattr(hydration, "size", 1) > 0 else "",
hydrate_with=hydrate_with,
)
# R1 layers are 6-item arrays, unpack into a Layer object
Expand All @@ -224,7 +227,8 @@ def read_param(names, constrs, values, fits):
if (
isinstance(mat_project["contrastsNumberOfLayers"], int)
and mat_project["contrastsNumberOfLayers"] == 0
or mat_project["contrastsNumberOfLayers"][i] == 0
or isinstance(mat_project["contrastsNumberOfLayers"], list)
and mat_project["contrastsNumberOfLayers"][i] == 0
):
continue
# contrastLayers is not an array, but rather a string with commas between entries
Expand Down Expand Up @@ -412,7 +416,7 @@ def convert_parameters(
project.parameters.index(layer.thickness, True),
project.parameters.index(layer.SLD, True),
project.parameters.index(layer.roughness, True),
project.parameters.index(layer.hydration, True),
project.parameters.index(layer.hydration, True) if layer.hydration else empty(shape=(0, 0)),
layer.name,
str(layer.hydrate_with),
]
Expand Down
Loading