From 10e20cc331b0b09694b77893d09fdfa649d8c760 Mon Sep 17 00:00:00 2001
From: Matthijs van der Wild <matthijs.van-der-wild@durham.ac.uk>
Date: Tue, 15 Feb 2022 16:43:12 +0000
Subject: [PATCH] Added support for parset files in YAML format.
---
scripts/compareStationListVLBI.py | 1 -
steps/check_station_mismatch.cwl | 7 ++++++-
test.yaml | 20 ++++++++++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 test.yaml
diff --git a/scripts/compareStationListVLBI.py b/scripts/compareStationListVLBI.py
index 8244addc..9333d702 100644
--- a/scripts/compareStationListVLBI.py
+++ b/scripts/compareStationListVLBI.py
@@ -36,7 +36,6 @@ def plugin_main(args, **kwargs):
else:
MS = mslist[0]
pass
-
## reading ANTENNA table of MS
logging.info('Collecting information from the ANTENNA table.')
antennaTable = pt.table(MS + "::ANTENNA", ack = False)
diff --git a/steps/check_station_mismatch.cwl b/steps/check_station_mismatch.cwl
index 31396726..2869f38f 100644
--- a/steps/check_station_mismatch.cwl
+++ b/steps/check_station_mismatch.cwl
@@ -33,14 +33,19 @@ requirements:
entry: |
import sys
import json
+ import yaml
import os
from compareStationListVLBI import plugin_main as compareStationList
mss = sys.argv[1:]
- inputs = json.loads(r"""$(inputs)""")
+ try:
+ inputs = json.loads(r"""$(inputs)""")
+ except:
+ inputs = yaml.loads(r"""$(inputs)""")
h5parmdb = inputs['solset']['path']
solset_name = inputs['solset_name']
filter = inputs['filter_baselines']
+ print(mss)
output = compareStationList(mss,
h5parmdb = h5parmdb,
diff --git a/test.yaml b/test.yaml
new file mode 100644
index 00000000..01b5af99
--- /dev/null
+++ b/test.yaml
@@ -0,0 +1,20 @@
+---
+msin:
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB000_uv-compressed.MS"
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB001_uv-compressed.MS"
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB002_uv-compressed.MS"
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB003_uv-compressed.MS"
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB004_uv-compressed.MS"
+ - class: "Directory"
+ path : "/home/tjlv53/software/test_data/L693719_SB005_uv-compressed.MS"
+solset:
+ class: "File"
+ path : "/home/tjlv53/software/test_data/Pre-Facet-Target/results/cal_values/solutions.h5"
+parset:
+ class: "File"
+ path: "/home/tjlv53/software/VLBI-cwl/dp3.parset"
--
GitLab