Merge branch 'refs/heads/dev' into normalize-ptm-data

# Conflicts: # protzilla/data_analysis/differential_expression_helper.py # protzilla/data_analysis/differential_expression_kruskal_wallis.py # protzilla/data_analysis/differential_expression_mann_whitney.py # protzilla/methods/data_analysis.py # tests/protzilla/data_analysis/test_differential_expression.py # ui/runs/forms/data_analysis.py
cschlaffner · Nov 11, 2024 · 1951d0f · 1951d0f
2 parents 8b7ed1e + 8537578
commit 1951d0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/protzilla/methods/data_analysis.py b/protzilla/methods/data_analysis.py
@@ -188,8 +188,8 @@ def method(self, inputs: dict) -> dict:
         return mann_whitney_test_on_intensity_data(**inputs)
 
     def insert_dataframes(self, steps: StepManager, inputs) -> dict:
-        if steps.get_step_output(Step, "protein_df", inputs["intensity_df"]) is not None:
-            inputs["protein_df"] = steps.get_step_output(Step, "protein_df", inputs["intensity_df"])
+        if steps.get_step_output(Step, "protein_df", inputs["protein_df"]) is not None:
+            inputs["protein_df"] = steps.get_step_output(Step, "protein_df", inputs["protein_df"])
         inputs["metadata_df"] = steps.metadata_df
         inputs["log_base"] = steps.get_step_input(TransformationLog, "log_base")
         return inputs

diff --git a/ui/runs/forms/data_analysis.py b/ui/runs/forms/data_analysis.py
@@ -1179,9 +1179,7 @@ def fill_form(self, run: Run) -> None:
         )
         self.fields["peptide_df"].choices = fill_helper.to_choices(single_protein_peptides)
 
-        self.fields["peptide_df"].choices = fill_helper.get_choices(
-            run, "peptide_df"
-        )[::-1]
+        self.fields["peptide_df"].choices = fill_helper.get_choices(run, "peptide_df")[::-1]
 
         single_protein_peptides = run.steps.get_instance_identifiers(
             SelectPeptidesForProtein, "peptide_df"
@@ -1197,9 +1195,7 @@ class PTMsPerProteinAndSampleForm(MethodForm):
     )
 
     def fill_form(self, run: Run) -> None:
-        self.fields["peptide_df"].choices = fill_helper.get_choices(
-            run, "peptide_df"
-        )
+        self.fields["peptide_df"].choices = fill_helper.get_choices(run, "peptide_df")
 
         single_protein_peptides = run.steps.get_instance_identifiers(
             SelectPeptidesForProtein, "peptide_df"