diff --git a/lofar-cwl/steps/applytarget.cwl b/lofar-cwl/steps/applytarget.cwl
index 883ab2ec974c6c31646ce09126c38d3e594a8fa0..5cca1b7b6c3606bb16a00d985f4fddbdff8ba7c3 100644
--- a/lofar-cwl/steps/applytarget.cwl
+++ b/lofar-cwl/steps/applytarget.cwl
@@ -17,7 +17,7 @@ inputs:
type: string
inputBinding:
position: 0
- prefix: msout=msout_name
+ prefix: msout=
separate: false
doc: Name of output MS
- default: DATA
@@ -67,6 +67,7 @@ inputs:
default: ""
inputBinding:
prefix: msout.storagemanager=
+ separate: false
- id: databitrate
type: int?
inputBinding:
@@ -85,7 +86,7 @@ outputs:
outputBinding:
glob: $(inputs.msin.basename)
- id: logfile
- type: File
+ type: File[]
outputBinding:
glob: 'applycal_$(inputs.correction).log'
stdout: applycal_$(inputs.correction).log
diff --git a/steps/check_unflagged_fraction.cwl b/steps/check_unflagged_fraction.cwl
index e4031b5a626e3455b2aca3bb3844188fc3a01ec1..0d7d2a014b6923fca42c88acf9b74152434e0e3b 100644
--- a/steps/check_unflagged_fraction.cwl
+++ b/steps/check_unflagged_fraction.cwl
@@ -27,7 +27,6 @@ arguments:
from check_unflagged_fraction import main as check_unflagged_fraction
- print(sys.argv)
ms = sys.argv[1]
min_fraction = float($(inputs.min_fraction))
@@ -35,11 +34,7 @@ arguments:
filename = os.path.basename(output['flagged'])
unflagged_fraction = output['unflagged_fraction']
-
- print(os.getcwd())
- print(filename)
- print(filename.lstrip('out_'))
-
+
if filename != 'None':
shutil.move(filename, filename.lstrip('out_'))
@@ -61,9 +56,9 @@ outputs:
glob: 'out.json'
outputEval: $(JSON.parse(self[0].contents).unflagged_fraction)
- id: logfile
- type: File?
+ type: File[]?
outputBinding:
- glob: check_unflagged_fraction.log
+ glob: 'check_unflagged_fraction*.log'
requirements:
- class: InlineJavascriptRequirement
@@ -75,4 +70,5 @@ requirements:
hints:
- class: DockerRequirement
dockerPull: lofareosc/prefactor:HBAcalibrator
-stdout: check_unflagged_fraction.log
\ No newline at end of file
+stdout: check_unflagged_fraction.log
+stderr: check_unflagged_fraction_err.log
\ No newline at end of file
diff --git a/steps/compare_station_list.cwl b/steps/compare_station_list.cwl
index 9657480614b0d409701ef67890ced691baf35fdc..21e18c5f8aeec2430e1ebbd850a297d69575c5c0 100644
--- a/steps/compare_station_list.cwl
+++ b/steps/compare_station_list.cwl
@@ -51,9 +51,9 @@ outputs:
glob: 'out.json'
outputEval: $(JSON.parse(self[0].contents).filter_out)
- id: logfile
- type: File?
+ type: File[]?
outputBinding:
- glob: compareStationList.log
+ glob: 'compareStationList*.log'
requirements:
- class: InlineJavascriptRequirement
@@ -61,4 +61,5 @@ requirements:
hints:
DockerRequirement:
dockerPull: lofareosc/prefactor:HBAcalibrator
-stdout: compareStationList.log
\ No newline at end of file
+stdout: compareStationList.log
+stderr: compareStationList_err.log
\ No newline at end of file
diff --git a/steps/merge_array_files.cwl b/steps/merge_array_files.cwl
new file mode 100644
index 0000000000000000000000000000000000000000..c4c5c6122e03f690e2bcf14307ec052f4d846f86
--- /dev/null
+++ b/steps/merge_array_files.cwl
@@ -0,0 +1,31 @@
+id: merge_array_files
+label: merge_array_files
+class: ExpressionTool
+
+cwlVersion: v1.0
+inputs:
+ - id: input
+ type:
+ - type: array
+ items:
+ - type: array
+ items: File
+outputs:
+ - id: output
+ type: File[]
+
+expression: |
+ ${
+ var out_file = []
+ for(var i=0; i<inputs.input.length; i++){
+ var item = inputs.input[i]
+ if(item != null){
+ out_file = out_file.concat(item)
+ }
+ }
+ return {'output': out_file}
+ }
+
+
+requirements:
+ - class: InlineJavascriptRequirement
\ No newline at end of file
diff --git a/steps/plot_unflagged.cwl b/steps/plot_unflagged.cwl
index 00640a1b5e6a472111f3c38a7151b5e26b9bdf98..290636c556f95452422d22151eee4620996094dc 100644
--- a/steps/plot_unflagged.cwl
+++ b/steps/plot_unflagged.cwl
@@ -24,19 +24,11 @@ arguments:
from plot_unflagged_fraction import main as plot_unflagged_fraction
- print(sys.argv)
- print(len(sys.argv))
-
center = int((len(sys.argv) - 1) / 2 + 1)
- print(center)
mss = sys.argv[1:center]
unflagged_fraction = sys.argv[center:]
- print(mss)
- print(unflagged_fraction)
- print(os.getcwd() + '/unflagged_fraction.png')
-
output = plot_unflagged_fraction(ms_list = mss, frac_list = unflagged_fraction, outfile = os.getcwd() + '/unflagged_fraction.png')
outputs:
@@ -45,6 +37,11 @@ outputs:
type: File
outputBinding:
glob: 'unflagged_fraction.png'
+ - id: logfile
+ type: File[]?
+ outputBinding:
+ glob: 'plot_unflagged_fraction*.log'
+
hints:
- class: DockerRequirement
diff --git a/subworkflow/concat.cwl b/subworkflow/concat.cwl
index c57327832e39b06145d0c6f576b1dd6efde2f113..c7337131d8d95a0985d1e6b3ae62c1214edaa79c 100644
--- a/subworkflow/concat.cwl
+++ b/subworkflow/concat.cwl
@@ -6,7 +6,7 @@ $namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
- type: Directory[]
+ type: 'Directory[]'
'sbg:x': -1000
'sbg:y': -300
- id: group_id
@@ -49,7 +49,7 @@ outputs:
- id: msout
outputSource:
- check_unflagged_fraction/msout
- type: Directory[]
+ type: 'Directory[]'
'sbg:x': 1000
'sbg:y': 0
- id: dpppconcat.log
@@ -60,11 +60,10 @@ outputs:
'sbg:y': 100
- id: check_unflagged_fraction.log
outputSource:
- - check_unflagged_fraction/logfile
+ - concat_logfiles_unflagged/output
type: File
'sbg:x': 1000
'sbg:y': 200
-
steps:
- id: filter_ms_group
in:
@@ -73,7 +72,8 @@ steps:
- id: groups_specification
source: groups_specification
- id: measurement_sets
- source: msin
+ source:
+ - msin
out:
- id: output
run: ../steps/filter_ms_group.cwl
@@ -83,27 +83,28 @@ steps:
- id: dpppconcat
in:
- id: msin
- source: filter_ms_group/output
+ source:
+ - filter_ms_group/output
- id: msout_name
source: group_id
- id: msin_datacolumn
default: DATA
- id: msout_datacolumn
default: DATA
- - id: baseline
- source: filter_baselines
- id: filter_baselines
source: filter_baselines
- id: filter_remove
default: true
- id: overwrite
default: false
- - id: missingdata
- default: True
- id: storagemanager
- default: "Dysco"
+ default: Dysco
- id: databitrate
default: 0
+ - id: missingdata
+ default: true
+ - id: baseline
+ source: filter_baselines
- id: avg_timeresolution
source: avg_timeresolution_concat
- id: avg_freqresolution
@@ -142,4 +143,17 @@ steps:
label: concat_logfiles_dpppconcat
'sbg:x': 600
'sbg:y': 200
-requirements: []
\ No newline at end of file
+ - id: concat_logfiles_unflagged
+ in:
+ - id: file_list
+ source:
+ - check_unflagged_fraction/logfile
+ - id: file_prefix
+ default: check_unflagged_fraction
+ out:
+ - id: output
+ run: ../steps/concatenate_files.cwl
+ label: concat_logfiles_unflagged
+ 'sbg:x': 600
+ 'sbg:y': 400
+requirements: []
diff --git a/workflows/prefactor_target/finalize.cwl b/workflows/prefactor_target/finalize.cwl
index 4960e02779c77b6c4746277377c40e1ed5fe9770..77837ecff37c5fb3db95f24ed779fa375ba972e3 100644
--- a/workflows/prefactor_target/finalize.cwl
+++ b/workflows/prefactor_target/finalize.cwl
@@ -112,7 +112,7 @@ steps:
- id: msout_datacolumn
default: DATA
- id: storagemanager
- default: Dysco
+ default: "Dysco"
- id: databitrate
source: compression_bitrate
- id: correction
@@ -124,7 +124,7 @@ steps:
default: 'target'
- id: msout_name
source: msin
- valueFrom: $(self.basename+'_prep.ms')
+ valueFrom: $(self.items.basename+'_pre-cal.ms')
out:
- id: msout
- id: logfile
@@ -134,6 +134,18 @@ steps:
- msin
'sbg:x': 400
'sbg:y': 0
+ - id: merge_array_files
+ in:
+ - id: input
+ source:
+ - apply_gsmcal/logfile
+ out:
+ - id: output
+ run: ../../steps/merge_array_files.cwl
+ label: merge_array_files
+ 'sbg:x': 600
+ 'sbg:y': 0
+
- id: write_solutions
in:
- id: h5parmFile
@@ -202,7 +214,7 @@ steps:
in:
- id: file_list
source:
- - apply_gsmcal/logfile
+ - merge_array_files/output
- id: file_prefix
default: apply_gsmcal
out:
diff --git a/workflows/prefactor_target/gsmcal.cwl b/workflows/prefactor_target/gsmcal.cwl
index 58f5b1af14c883d0c746fc28e760b56b625417f0..23c1541b3494dc2f64e0f2da8a0b640676dbb9e4 100644
--- a/workflows/prefactor_target/gsmcal.cwl
+++ b/workflows/prefactor_target/gsmcal.cwl
@@ -103,7 +103,7 @@ outputs:
- concat_logfiles_calib/output
- concat_logfiles_dpppconcat/output
- concat_logfiles_blsmooth/output
- - concat/check_unflagged_fraction.log
+ - concat_logfiles_unflagged/output
type: 'File[]'
linkMerge: merge_flattened
'sbg:x': 1500
@@ -238,6 +238,21 @@ steps:
label: concat_logfiles_losoto
'sbg:x': 1200
'sbg:y': 700
+ - id: concat_logfiles_unflagged
+ in:
+ - id: file_list
+ linkMerge: merge_flattened
+ source:
+ - concat/check_unflagged_fraction.log
+ - plot_unflagged/logfile
+ - id: file_prefix
+ default: check_unflagged_fraction
+ out:
+ - id: output
+ run: ../../steps/concatenate_files.cwl
+ label: concat_logfiles_unflagged
+ 'sbg:x': 1200
+ 'sbg:y': 900
- id: concat
in:
- id: msin
@@ -326,6 +341,7 @@ steps:
source: concat/unflagged_fraction
out:
- id: output_imag
+ - id: logfile
run: ../../steps/plot_unflagged.cwl
label: plot_unflagged
'sbg:x': 500
diff --git a/workflows/prefactor_target/prep.cwl b/workflows/prefactor_target/prep.cwl
index 968bc3bd1f32d2bcf64dbfc556e7318566402824..1e1ebb52fb6326cd33b18425db8a6112b8a510e1 100644
--- a/workflows/prefactor_target/prep.cwl
+++ b/workflows/prefactor_target/prep.cwl
@@ -205,7 +205,7 @@ outputs:
outputSource:
- make_sourcedb_ateam/log
- check_ateam_separation/logfile
- - compare_station_list/logfile
+ - concat_logfiles_stationlist/output
- concat_logfiles_RMextract/output
- concat_logfiles_prep_targ/output
- concat_logfiles_predict_targ/output
@@ -473,5 +473,19 @@ steps:
label: concat_logfiles_RMextract
'sbg:x': 400
'sbg:y': 600
+ - id: concat_logfiles_stationlist
+ in:
+ - id: file_list
+ linkMerge: merge_flattened
+ source:
+ - compare_station_list/logfile
+ - id: file_prefix
+ default: compareStationList
+ out:
+ - id: output
+ run: ../../steps/concatenate_files.cwl
+ label: concat_logfiles_stationlist
+ 'sbg:x': 400
+ 'sbg:y': 700
requirements:
- class: ScatterFeatureRequirement
\ No newline at end of file