Skip to content
Snippets Groups Projects
Commit 4f96614c authored by Robbie Luijben's avatar Robbie Luijben
Browse files

Extracted percentage to quality logic to a separate function

parent 9bb8c919
No related branches found
No related tags found
1 merge request!326bugfix, didn't consider rfi_percent = 0 a valid RFI
...@@ -22,7 +22,6 @@ def calculate_qualities(task, tasks_for_this_sasid, quality_thresholds): ...@@ -22,7 +22,6 @@ def calculate_qualities(task, tasks_for_this_sasid, quality_thresholds):
try: try:
summary = task.quality_json["summary"] summary = task.quality_json["summary"]
quality = None
summary_flavour = get_summary_flavour(task) summary_flavour = get_summary_flavour(task)
...@@ -35,20 +34,23 @@ def calculate_qualities(task, tasks_for_this_sasid, quality_thresholds): ...@@ -35,20 +34,23 @@ def calculate_qualities(task, tasks_for_this_sasid, quality_thresholds):
record = summary[key] record = summary[key]
rfi_percent = float(record['rfi_percent']) rfi_percent = float(record['rfi_percent'])
return rfi_percentage_to_quality(rfi_percent, quality_thresholds['moderate'], quality_thresholds['poor'])
if rfi_percent >= 0:
quality = "good"
if rfi_percent >= quality_thresholds['moderate']:
quality = "moderate"
if rfi_percent > quality_thresholds['poor']:
quality = "poor"
return quality
except Exception as error: except Exception as error:
# when rfi_percentage is missing, then the quality cannot be calculated. # when rfi_percentage is missing, then the quality cannot be calculated.
# Just continue without it # Just continue without it
pass pass
def rfi_percentage_to_quality(rfi_percent, quality_treshold_moderate, quality_treshold_poor):
quality = None
if rfi_percent >= 0:
quality = "good"
if rfi_percent >= quality_treshold_moderate:
quality = "moderate"
if rfi_percent > quality_treshold_poor:
quality = "poor"
return quality
def calculate_quality_sasid(unsaved_task, tasks_for_this_sasid): def calculate_quality_sasid(unsaved_task, tasks_for_this_sasid):
""" """
calculate the overall quality per sas_id, based on other tasks with the same sas_id calculate the overall quality per sas_id, based on other tasks with the same sas_id
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment