Skip to content

Commit fc72c0a

Browse files
committed
Removes unused properties from the API
1 parent 147cbee commit fc72c0a

File tree

5 files changed

+78
-259
lines changed

5 files changed

+78
-259
lines changed

RATapi/inputs.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ def make_input(project: RATapi.Project, controls: RATapi.Controls) -> tuple[Prob
142142
[[element.min, element.max] for element in getattr(project, class_list)],
143143
)
144144

145-
# Use dummy value for qzshifts
146-
limits.qzshifts = []
147-
148145
if project.model == LayerModels.CustomXY:
149146
controls.calcSldDuringFit = True
150147

@@ -298,15 +295,13 @@ def make_problem(project: RATapi.Project) -> ProblemDefinition:
298295
problem.dataPresent = make_data_present(project)
299296
problem.dataLimits = data_limits
300297
problem.simulationLimits = simulation_limits
301-
problem.oilChiDataPresent = [0] * len(project.contrasts)
302298
problem.numberOfContrasts = len(project.contrasts)
303299
problem.geometry = project.geometry
304300
problem.useImaginary = project.absorption
305301
problem.repeatLayers = [[0, 1]] * len(project.contrasts) # This is marked as "to do" in RAT
306302
problem.contrastBackgroundParams = contrast_background_params
307303
problem.contrastBackgroundTypes = contrast_background_types
308304
problem.contrastBackgroundActions = [contrast.background_action for contrast in project.contrasts]
309-
problem.contrastQzshifts = [1] * len(project.contrasts) # This is marked as "to do" in RAT
310305
problem.contrastScalefactors = [
311306
project.scalefactors.index(contrast.scalefactor, True) for contrast in project.contrasts
312307
]
@@ -317,7 +312,6 @@ def make_problem(project: RATapi.Project) -> ProblemDefinition:
317312
problem.contrastResolutionTypes = contrast_resolution_types
318313

319314
problem.backgroundParams = [param.value for param in project.background_parameters]
320-
problem.qzshifts = [0.0]
321315
problem.scalefactors = [param.value for param in project.scalefactors]
322316
problem.bulkIns = [param.value for param in project.bulk_in]
323317
problem.bulkOuts = [param.value for param in project.bulk_out]
@@ -358,18 +352,6 @@ def make_problem(project: RATapi.Project) -> ProblemDefinition:
358352
for param in getattr(project, class_list)
359353
if param.fit
360354
]
361-
problem.otherParams = [
362-
param.value
363-
for class_list in RATapi.project.parameter_class_lists
364-
for param in getattr(project, class_list)
365-
if not param.fit
366-
]
367-
problem.otherLimits = [
368-
[param.min, param.max]
369-
for class_list in RATapi.project.parameter_class_lists
370-
for param in getattr(project, class_list)
371-
if not param.fit
372-
]
373355
problem.priorNames = [
374356
param.name for class_list in RATapi.project.parameter_class_lists for param in getattr(project, class_list)
375357
]
@@ -392,10 +374,6 @@ def make_problem(project: RATapi.Project) -> ProblemDefinition:
392374
problem.checks, parameter_field[class_list], [int(element.fit) for element in getattr(project, class_list)]
393375
)
394376

395-
# Use dummy values for qz shifts
396-
problem.names.qzshifts = []
397-
problem.checks.qzshifts = []
398-
399377
check_indices(problem)
400378

401379
return problem

0 commit comments

Comments
 (0)