Commit b0479028 authored by mancini's avatar mancini

Resolve conflict in CI file

# Conflicts:
#   .gitlab-ci.yml
parents 89aa83e3 ce5da5b0
Pipeline #248 passed with stages
in 6 minutes and 55 seconds
......@@ -46,6 +46,7 @@ losoto_abs:
allow_failure: true
script:
- cwl-runner --no-container steps/LoSoTo.Abs.cwl test_jobs/losoto_abs.json
losoto_plot:
stage: test_steps
allow_failure: true
......@@ -58,6 +59,18 @@ losoto_plotscreen:
script:
- cwl-runner --no-container steps/LoSoTo.Plotscreen.cwl test_jobs/losoto_plotscreen.json
losoto_norm:
stage: test_steps
allow_failure: true
script:
- cwl-runner --no-container steps/LoSoTo.Norm.cwl test_jobs/losoto_norm.json
losoto_residual:
stage: test_steps
allow_failure: true
script:
- cwl-runner --no-container steps/LoSoTo.Residual.cwl test_jobs/losoto_residual.json
parset_selector:
stage: test_steps
allow_failure: true
......
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.0
id: losoto_abs
doc: |
Normalize the solutions to a given value WEIGHT: Weights compliant
requirements:
InlineJavascriptRequirement: {}
InitialWorkDirRequirement:
listing:
- entryname: 'parset.config'
entry: |
[norm]
soltab = $(inputs.soltab)
operation = NORM
axesToNorm = $(inputs.axesToNorm)
$(inputs.normVal !== null? 'normVal=' + inputs.normVal: '')
- entryname: $(inputs.input_h5parm.basename)
entry: $(inputs.input_h5parm)
writable: true
baseCommand: "losoto"
arguments:
- $(inputs.input_h5parm.basename)
- parset.config
hints:
DockerRequirement:
dockerPull: lofareosc/prefactor-ci:master
inputs:
- id: input_h5parm
type: File
- id: soltab
type: string
doc: "Solution table"
- id: axesToNorm
type: string[]
doc: Axes along which compute the normalization
- id: normVal
type: float?
doc: Number to normalize to vals = vals * (normVal/valsMean), by default 1.
outputs:
- id: output_h5parm
type: File
outputBinding:
glob: $(inputs.input_h5parm.basename)
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.0
id: losoto_abs
doc: Subtract/divide two tables or a clock/tec/tec3rd/rm from a phase.
requirements:
InitialWorkDirRequirement:
listing:
- entryname: 'parset.config'
entry: |
[residuals]
soltab = $(inputs.soltab)
operation=RESIDUALS
soltabsToSub=$(inputs.soltabsToSub)
ratio=$(inputs.ratio)
- entryname: $(inputs.input_h5parm.basename)
entry: $(inputs.input_h5parm)
writable: true
baseCommand: "losoto"
arguments:
- $(inputs.input_h5parm.basename)
- parset.config
hints:
DockerRequirement:
dockerPull: lofareosc/prefactor-ci:master
inputs:
- id: input_h5parm
type: File
- id: soltab
type: string
doc: "Solution table"
- id: soltabsToSub
type: string[]
doc: List of soltabs to subtract
- id: ratio
type: boolean?
default: false
doc: Return the ratio instead of subtracting.
outputs:
- id: output_h5parm
type: File
outputBinding:
glob: $(inputs.input_h5parm.basename)
{
"input_h5parm": {
"class": "File",
"path": "/data/example.h5"
},
"soltab": "sol000/amplitude000",
"axesToNorm": ["time"]
}
{
"input_h5parm": {
"class": "File",
"path": "/data/example.h5"
},
"soltab": "sol000/amplitude000",
"soltabsToSub": ["amplitude000"]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment