From b0ed738eb8eead517857df5d52b0a529c0c8fb84 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Tue, 20 Dec 2022 15:17:28 +0100
Subject: [PATCH] Add to summary applied fixes
---
compress_pipeline.cwl | 5 +++++
download_and_compress_pipeline.cwl | 3 +++
steps/format_metrics.cwl | 11 +++++++++++
3 files changed, 19 insertions(+)
diff --git a/compress_pipeline.cwl b/compress_pipeline.cwl
index 6a11ab0..0718278 100644
--- a/compress_pipeline.cwl
+++ b/compress_pipeline.cwl
@@ -24,6 +24,11 @@ outputs:
outputSource:
- format_ingest/ingest
type: Any
+ - id: applied_fixes
+ type: string[]
+ outputSource:
+ - identify_issues/issue_list
+
steps:
- id: identify_issues
run: steps/identify_issues.cwl
diff --git a/download_and_compress_pipeline.cwl b/download_and_compress_pipeline.cwl
index 4a73366..ba48c9e 100644
--- a/download_and_compress_pipeline.cwl
+++ b/download_and_compress_pipeline.cwl
@@ -55,6 +55,7 @@ steps:
- id: inspect
- id: logfile
- id: ingest
+ - id: applied_fixes
run: ./compress_pipeline.cwl
- id: combine
in:
@@ -77,6 +78,8 @@ steps:
source: extract_metrics/plots
- id: quality
source: extract_metrics/quality
+ - id: applied_fixes
+ source: compress/applied_fixes
run: steps/format_metrics.cwl
out:
- formatted_quality
diff --git a/steps/format_metrics.cwl b/steps/format_metrics.cwl
index c2eed30..59f69c3 100644
--- a/steps/format_metrics.cwl
+++ b/steps/format_metrics.cwl
@@ -22,12 +22,17 @@ expression: |
observingConditions += 1 - inputs.quality.elevation_score;
sensitivityScore += observingConditions;
+
+
var result = {
'uv-coverage': uvCoverageScore,
'sensitivity': sensitivityScore,
'observing-conditions': observingConditions,
'plots': inputs.plots,
'details': inputs.quality
+ 'summary': {
+ applied_fixes: inputs.applied_fixes[0]
+ }
};
return {'formatted_quality': result}
@@ -39,6 +44,12 @@ inputs:
type: File[]
- id: quality
type: Any
+- id: applied_fixes
+ type:
+ type: array
+ items:
+ type: array
+ items: string
outputs:
- id: formatted_quality
type: Any
--
GitLab