Skip to content
Snippets Groups Projects
Commit f0f64d7a authored by Mattia Mancini's avatar Mattia Mancini
Browse files

Update local branch conflicts

parents 55679ed2 7106ebf3
No related branches found
No related tags found
2 merge requests!69Change the name of the pre-calibrated output MS,!20Merge request HBA_calibrator to master
Pipeline #649 failed
Stage: validate_cwl_scripts
Stage: test_steps
Stage: integration_test
Show whitespace changes
Inline Side-by-side
workflows/HBA_calibrator.cwl
+ 24
− 24
View file @ f0f64d7a
...@@ -154,7 +154,7 @@ inputs: ...@@ -154,7 +154,7 @@ inputs:
'sbg:x': -1000 'sbg:x': -1000
'sbg:y': 1100 'sbg:y': 1100
- id: min_separation - id: min_separation
type: int? type: float?
default: 30 default: 30
'sbg:x': -1000 'sbg:x': -1000
'sbg:y': 1200 'sbg:y': 1200
...@@ -194,42 +194,42 @@ inputs: ...@@ -194,42 +194,42 @@ inputs:
'sbg:x': -1000 'sbg:x': -1000
'sbg:y': 1900 'sbg:y': 1900
outputs: outputs:
- id: msout - id: check_Ateam_separation.png
outputSource: outputSource:
- prefactor/msout - prefactor/check_Ateam_separation.png
type: 'Directory[]' type: 'File[]?'
'sbg:x': 289.5600891113281 'sbg:x': 1000
'sbg:y': -144.01869201660156 'sbg:y': -300
- id: check_Ateam_separation.log
outputSource:
- prefactor/check_Ateam_separation.log
type: 'File[]?'
'sbg:x': 1000
'sbg:y': -200
- id: make_sourcedb_ateam.log - id: make_sourcedb_ateam.log
outputSource: outputSource:
- prefactor/make_sourcedb_ateam.log - prefactor/make_sourcedb_ateam.log
type: File? type: File?
'sbg:x': 317.4496154785156 'sbg:x': 1000
'sbg:y': 9.373631477355957 'sbg:y': -100
- id: msout
outputSource:
- prefactor/msout
type: 'Directory[]'
'sbg:x': 1000
'sbg:y': 0
- id: logfile_prep_cal - id: logfile_prep_cal
outputSource: outputSource:
- prefactor/logfile_prep_cal - prefactor/logfile_prep_cal
type: 'File[]?' type: 'File[]?'
'sbg:x': 315.0741882324219 'sbg:x': 1000
'sbg:y': 180.26284790039062 'sbg:y': 100
- id: check_Ateam_separation.png
outputSource:
- prefactor/check_Ateam_separation.png
type: 'File[]?'
'sbg:x': 287.6455078125
'sbg:y': 344.1313171386719
- id: check_Ateam_separation.log
outputSource:
- prefactor/check_Ateam_separation.log
type: 'File[]?'
'sbg:x': 315.5941467285156
'sbg:y': 494.9656982421875
- id: parset - id: parset
outputSource: outputSource:
- prefactor/parset - prefactor/parset
type: 'File[]' type: 'File[]'
'sbg:x': 293.33331298828125 'sbg:x': 1000
'sbg:y': -305.4627990722656 'sbg:y': 200
steps: steps:
- id: prefactor - id: prefactor
in: in:
......
workflows/prefactor_calibrator.cwl
+ 86
− 32
View file @ f0f64d7a
...@@ -55,45 +55,82 @@ inputs: ...@@ -55,45 +55,82 @@ inputs:
'sbg:x': -89 'sbg:x': -89
'sbg:y': -276 'sbg:y': -276
- id: min_separation - id: min_separation
type: int type: float?
default: 20 default: 30
'sbg:x': -638.4987182617188 'sbg:x': -1000
'sbg:y': 31.238996505737305 'sbg:y': 1100
- id: A-Team_sky_model - id: max_separation_arcmin
type: string type: float?
'sbg:x': -889.9927978515625 default: 1
'sbg:y': -845.9927978515625 'sbg:x': -1000
'sbg:y': 1200
- id: calibrator_path_skymodel
type: Directory?
default: /data/skymodels
'sbg:x': -1000
'sbg:y': 1300
- id: A-Team_skymodel
type: File?
default: /data/skymodels/Ateam_LBA_CC.skymodel
'sbg:x': -1000
'sbg:y': 1400
- id: cal_solutions
type: string?
default: cal_solutions.h5
'sbg:x': -1000
'sbg:y': 1500
- id: avg_timeresolution
type: float?
default: 4
'sbg:x': -1000
'sbg:y': 1600
- id: avg_freqresolution
type: string?
default: 48.82kHz
'sbg:x': -1000
'sbg:y': 1700
- id: bandpass_freqresolution
type: string?
default: 195.3125kHz
'sbg:x': -1000
'sbg:y': 1800
outputs: outputs:
- id: outh5parm - id: check_Ateam_separation.png
outputSource: outputSource:
- h5parm_collector/outh5parm - prep/check_Ateam_separation.png
type: File type: 'File[]?'
'sbg:x': 477 'sbg:x': 1000
'sbg:y': -546.076171875 'sbg:y': -300
- id: log - id: check_Ateam_separation.log
outputSource: outputSource:
- h5parm_collector/log - prep/check_Ateam_separation.log
type: File type: 'File[]?'
'sbg:x': 481.1239318847656 'sbg:x': 1000
'sbg:y': -368.0228576660156 'sbg:y': -200
- id: output_imag - id: make_sourcedb_ateam.log
outputSource: outputSource:
- check_ateam_separation/output_imag - prep/make_sourcedb_ateam.log
type: File? type: File?
'sbg:x': 486.94464111328125 'sbg:x': 1000
'sbg:y': -5.156437873840332 'sbg:y': -100
- id: logfile - id: msout
outputSource: outputSource:
- check_ateam_separation/logfile - prep/msout
type: File? type: 'Directory[]'
'sbg:x': 492.1335754394531 'sbg:x': 1000
'sbg:y': 133 'sbg:y': 0
- id: log_1 - id: logfile_prep_cal
outputSource: outputSource:
- make_sourcedb/log - prep/logfile_prep_cal
type: File? type: 'File[]?'
'sbg:x': 495.6245422363281 'sbg:x': 1000
'sbg:y': -1257.4857177734375 'sbg:y': 100
- id: parset
outputSource:
- prep/parset
type: 'File[]'
'sbg:x': 1000
'sbg:y': 200
steps: steps:
- id: ndppp_prep_cal - id: ndppp_prep_cal
in: in:
...@@ -110,6 +147,17 @@ steps: ...@@ -110,6 +147,17 @@ steps:
source: memoryperc source: memoryperc
- id: raw_data - id: raw_data
source: raw_data source: raw_data
<<<<<<< HEAD
=======
- id: demix_sources
source: demix_sources
- id: demix_target
source: demix_target
- id: demix_freqstep
source: demix_freqstep
- id: demix_timestep
source: demix_timestep
>>>>>>> 7106ebf374d0653a881c8371a38edc570f793378
- id: demix - id: demix
source: demix source: demix
- id: msin - id: msin
...@@ -128,6 +176,7 @@ steps: ...@@ -128,6 +176,7 @@ steps:
label: ndppp_prep_cal label: ndppp_prep_cal
scatter: scatter:
- msin - msin
<<<<<<< HEAD
'sbg:x': -359 'sbg:x': -359
'sbg:y': -519 'sbg:y': -519
- id: aoflagger - id: aoflagger
...@@ -210,6 +259,11 @@ steps: ...@@ -210,6 +259,11 @@ steps:
label: make_sourcedb_ateam label: make_sourcedb_ateam
'sbg:x': -628.7400512695312 'sbg:x': -628.7400512695312
'sbg:y': -847.117919921875 'sbg:y': -847.117919921875
=======
'sbg:x': 0
'sbg:y': 0
>>>>>>> 7106ebf374d0653a881c8371a38edc570f793378
requirements: requirements:
- class: SubworkflowFeatureRequirement - class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement - class: ScatterFeatureRequirement
workflows/prefactor_calibrator_test.cwl
+ 106
− 62
View file @ f0f64d7a
...@@ -5,110 +5,154 @@ label: prefactor_calibrator ...@@ -5,110 +5,154 @@ label: prefactor_calibrator
$namespaces: $namespaces:
sbg: 'https://www.sevenbridges.com/' sbg: 'https://www.sevenbridges.com/'
inputs: inputs:
- id: msin
type: 'Directory[]'
'sbg:x': -1000
'sbg:y': -800
- id: filter_baselines
type: string
'sbg:x': -1000
'sbg:y': -700
- id: raw_data - id: raw_data
type: boolean type: boolean
'sbg:x': -634 'sbg:x': -1000
'sbg:y': -688 'sbg:y': -600
- id: demix - id: demix
type: boolean type: boolean
'sbg:x': -639 'sbg:x': -1000
'sbg:y': -206.68032836914062 'sbg:y': -500
- id: msin
type: 'Directory[]'
'sbg:x': -635
'sbg:y': -543
- id: memoryperc - id: memoryperc
type: int type: int
'sbg:x': -634 'sbg:x': -1000
'sbg:y': -411 'sbg:y': -400
- id: baselines_to_flag - id: flag_baselines
type: 'string[]' type: 'string[]'
'sbg:x': -635 'sbg:x': -1000
'sbg:y': -100.83224487304688 'sbg:y': -300
- id: avg_timeresolution
type: float
'sbg:x': -1000
'sbg:y': -200
- id: avg_freqresolution
type: string
'sbg:x': -1000
'sbg:y': -100
- id: process_baselines_cal
type: string
'sbg:x': -1000
'sbg:y': 0
- id: demix_timestep
type: int
'sbg:x': -1000
'sbg:y': 100
- id: demix_freqstep
type: int
'sbg:x': -1000
'sbg:y': 100
- id: demix_target
type: string
'sbg:x': -1000
'sbg:y': 200
- id: demix_sources
type: string
'sbg:x': -1000
'sbg:y': 300
- id: do_smooth
type: boolean
'sbg:x': -1000
'sbg:y': 400
- id: min_separation - id: min_separation
type: float? type: float?
'sbg:x': -638.4987182617188 'sbg:x': -1000
'sbg:y': 31.238996505737305 'sbg:y': 500
- id: A-Team_sky_model - id: A-Team_skymodel
default: /data/skymodels/Ateam_LBA_CC.skymodel default: /data/skymodels/Ateam_LBA_CC.skymodel
type: type:
- string? - string?
- File? - File?
'sbg:x': -889 'sbg:x': -1000
'sbg:y': -983.5078735351562 'sbg:y': 600
- id: timeresolution
type: float
'sbg:x': -634.4667358398438
'sbg:y': -817.0217895507812
- id: freqresolution
type: string
'sbg:x': -641.6406860351562
'sbg:y': -298.1281433105469
outputs: outputs:
- id: check_Ateam_separation.png - id: check_Ateam_separation.png
outputSource: outputSource:
- check_ateam_separation/output_imag - check_ateam_separation/output_imag
type: 'File[]?' type: 'File[]?'
'sbg:x': 68.06497955322266 'sbg:x': 1000
'sbg:y': -3.1985559463500977 'sbg:y': -300
- id: check_Ateam_separation.log - id: check_Ateam_separation.log
outputSource: outputSource:
- check_ateam_separation/logfile - check_ateam_separation/logfile
type: 'File[]?' type: 'File[]?'
'sbg:x': 83.07220458984375 'sbg:x': 1000
'sbg:y': 136.60289001464844 'sbg:y': -200
- id: make_sourcedb_ateam.log - id: make_sourcedb_ateam.log
outputSource: outputSource:
- make_sourcedb/log - make_sourcedb/log
type: File? type: File?
'sbg:x': 71.66065216064453 'sbg:x': 1000
'sbg:y': -880.4981689453125 'sbg:y': -100
- id: msout - id: msout
outputSource: outputSource:
- ndppp_prep_cal/msout - ndppp_prep_cal/msout
type: 'Directory[]' type: 'Directory[]'
'sbg:x': 52.33274459838867 'sbg:x': 1000
'sbg:y': -546.0951538085938 'sbg:y': 0
- id: logfile_prep_cal - id: logfile_prep_cal
outputSource: outputSource:
- ndppp_prep_cal/logfile - ndppp_prep_cal/logfile
type: 'File[]?' type: 'File[]?'
'sbg:x': 43.325523376464844 'sbg:x': 1000
'sbg:y': -371.35504150390625 'sbg:y': 100
- id: parset - id: parset
outputSource: outputSource:
- ndppp_prep_cal/parset - ndppp_prep_cal/parset
type: 'File[]' type: 'File[]'
'sbg:x': 49.54720687866211 'sbg:x': 1000
'sbg:y': -680.8679809570312 'sbg:y': 200
steps: steps:
- id: ndppp_prep_cal - id: ndppp_prep_cal
in: in:
- id: baselines_to_flag - id: msin
default: [] linkMerge: merge_flattened
source: source:
- baselines_to_flag - msin
- id: elevation_to_flag - id: filter_baselines
default: 0deg..20deg source: filter_baselines
- id: min_amplitude_to_flag default: "*"
default: 1.e-30
- id: memoryperc
default: 20
source: memoryperc
- id: raw_data - id: raw_data
default: false
source: raw_data source: raw_data
- id: demix - id: demix
default: false
source: demix source: demix
- id: msin - id: memoryperc
linkMerge: merge_flattened default: 20
source: source: memoryperc
- msin - id: baselines_to_flag
- id: skymodel default: []
source: make_sourcedb/sourcedb source: flag_baselines
- id: timeresolution - id: timeresolution
source: timeresolution default: 1.
source: avg_timeresolution
- id: freqresolution - id: freqresolution
source: freqresolution default: "12.21kHz"
source: avg_freqresolution
- id: process_baselines_cal
default: "*"
source: process_baselines_cal
- id: demix_freqstep
default: 1
source: demix_freqstep
- id: demix_timestep
default: 1
source: demix_timestep
- id: demix_target
source: demix_target
- id: demix_sources
source: demix_sources
- id: skymodel
source: make_sourcedb/sourcedb
out: out:
- id: msout - id: msout
- id: logfile - id: logfile
...@@ -117,8 +161,8 @@ steps: ...@@ -117,8 +161,8 @@ steps:
label: ndppp_prep_cal label: ndppp_prep_cal
scatter: scatter:
- msin - msin
'sbg:x': -359 'sbg:x': 0
'sbg:y': -519 'sbg:y': 0
- id: check_ateam_separation - id: check_ateam_separation
in: in:
- id: ms - id: ms
...@@ -131,8 +175,8 @@ steps: ...@@ -131,8 +175,8 @@ steps:
- id: logfile - id: logfile
run: ../lofar-cwl/steps/check_ateam_separation.cwl run: ../lofar-cwl/steps/check_ateam_separation.cwl
label: check_Ateam_separation label: check_Ateam_separation
'sbg:x': -331.452392578125 'sbg:x': 0
'sbg:y': 23.596216201782227 'sbg:y': -300
- id: make_sourcedb - id: make_sourcedb
in: in:
- id: sky_model - id: sky_model
...@@ -142,8 +186,8 @@ steps: ...@@ -142,8 +186,8 @@ steps:
- id: log - id: log
run: ../lofar-cwl/steps/makesourcedb.cwl run: ../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb_ateam label: make_sourcedb_ateam
'sbg:x': -647.0108642578125 'sbg:x': -500
'sbg:y': -981.3153076171875 'sbg:y': 300
requirements: requirements:
- class: SubworkflowFeatureRequirement - class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement - class: ScatterFeatureRequirement
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment