Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/perpl/run_distance_modelling.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,24 @@ def main(argv=None):
continue
x_expt, y_expt, fitted_model = model_out

if model_config["dist_ratios"] == "custom_ratios":
custom_ratios = model_config["custom_ratios_list"]
dist_ratios_for_table = ""
for i, item in enumerate(custom_ratios):
dist_ratios_for_table += f"{item}"
if (i + 1) < len(custom_ratios):
dist_ratios_for_table += ", "
else:
dist_ratios_for_table = model_config["dist_ratios"]

model_results.append(
{
"Name": model_file.rstrip(".yaml"),
"Fit length": fitlength,
x_kernel_col: bin_or_kernel,
"N Peaks": model_config["n_peaks"],
"Peak ratios": model_config["peak_amps"],
"Model distance ratios": model_config["dist_ratios"],
"Model distance ratios": dist_ratios_for_table,
"Repeated localisations": model_config["repeats"],
"Background model": model_config["background"],
"AICc": fitted_model.aic_corrected,
Expand Down
Loading