From 1ace2bc23439ea7f808a507f8fc11a0893d09c7c Mon Sep 17 00:00:00 2001 From: Sakhile Masoka Date: Mon, 25 Jan 2021 16:46:17 +0200 Subject: [PATCH 1/3] fix indexing the dataset --- tricolour/apps/tricolour/app.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tricolour/apps/tricolour/app.py b/tricolour/apps/tricolour/app.py index 836ee49..4ebe968 100644 --- a/tricolour/apps/tricolour/app.py +++ b/tricolour/apps/tricolour/app.py @@ -232,7 +232,7 @@ def support_tables(ms): support = {t: xds_from_table("::".join((ms, t)), group_cols="__row__") for t in ["FIELD", "POLARIZATION", "SPECTRAL_WINDOW"]} # These columns have fixed shapes - support.update({t: xds_from_table("::".join((ms, t))) + support.update({t: xds_from_table("::".join((ms, t)))[0] for t in ["ANTENNA", "DATA_DESCRIPTION"]}) # Reify all values upfront @@ -305,11 +305,11 @@ def _main(args): spw_ds = st["SPECTRAL_WINDOW"] ant_ds = st["ANTENNA"] - assert len(ant_ds) == 1 - assert len(ddid_ds) == 1 + # assert len(ant_ds) == 1 + # assert len(ddid_ds) == 1 - antspos = ant_ds[0].POSITION.data - antsnames = ant_ds[0].NAME.data + antspos = ant_ds.POSITION.data + antsnames = ant_ds.NAME.data fieldnames = [fds.NAME.data[0] for fds in field_ds] avail_scans = [ds.SCAN_NUMBER for ds in xds] @@ -367,9 +367,9 @@ def _main(args): "compute graph for processing" .format(field_dict[ds.FIELD_ID], ds.SCAN_NUMBER)) - ddid = ddid_ds[ds.attrs['DATA_DESC_ID']] - spw_info = spw_ds[ddid.SPECTRAL_WINDOW_ID.data[0]] - pol_info = pol_ds[ddid.POLARIZATION_ID.data[0]] + # ddid = ddid_ds[ds.attrs['DATA_DESC_ID']] + spw_info = spw_ds[ddid_ds.SPECTRAL_WINDOW_ID.data[ds.DATA_DESC_ID]] + pol_info = pol_ds[ddid_ds.POLARIZATION_ID.data[ds.DATA_DESC_ID]] nrow, nchan, ncorr = getattr(ds, data_column).data.shape From ae715d2469ab09178056b6211afa54ae0d70ffeb Mon Sep 17 00:00:00 2001 From: Sakhile Masoka Date: Mon, 25 Jan 2021 17:56:50 +0200 Subject: [PATCH 2/3] computing meta fix --- tricolour/window_statistics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tricolour/window_statistics.py b/tricolour/window_statistics.py index 135329a..6057e70 100644 --- a/tricolour/window_statistics.py +++ b/tricolour/window_statistics.py @@ -123,7 +123,7 @@ def window_stats(flag_window, ubls, chan_freqs, field_name, None, ddid, None, nchanbins, None, - dtype=np.object) + meta=np.empty((0,), dtype=np.object)) # Create an empty stats object if the user hasn't supplied one if prev_stats is None: @@ -131,13 +131,13 @@ def _window_stat_creator(): return WindowStatistics(nchanbins) prev_stats = da.blockwise(_window_stat_creator, (), - dtype=np.object) + meta=np.empty((), dtype=np.object)) # Combine per-baseline stats into a single stats object return da.blockwise(_combine_baseline_window_stats, (), stats, ("bl",), prev_stats, (), - dtype=np.object) + meta=np.empty((), dtype=np.object)) def _combine_window_stats(*args): From f01808afe0962d10cc2c078577ce9261498202ed Mon Sep 17 00:00:00 2001 From: Sakhile Masoka Date: Tue, 26 Jan 2021 22:18:00 +0200 Subject: [PATCH 3/3] Remove commented lines --- tricolour/apps/tricolour/app.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tricolour/apps/tricolour/app.py b/tricolour/apps/tricolour/app.py index 4ebe968..e420a7f 100644 --- a/tricolour/apps/tricolour/app.py +++ b/tricolour/apps/tricolour/app.py @@ -305,9 +305,6 @@ def _main(args): spw_ds = st["SPECTRAL_WINDOW"] ant_ds = st["ANTENNA"] - # assert len(ant_ds) == 1 - # assert len(ddid_ds) == 1 - antspos = ant_ds.POSITION.data antsnames = ant_ds.NAME.data fieldnames = [fds.NAME.data[0] for fds in field_ds] @@ -367,7 +364,6 @@ def _main(args): "compute graph for processing" .format(field_dict[ds.FIELD_ID], ds.SCAN_NUMBER)) - # ddid = ddid_ds[ds.attrs['DATA_DESC_ID']] spw_info = spw_ds[ddid_ds.SPECTRAL_WINDOW_ID.data[ds.DATA_DESC_ID]] pol_info = pol_ds[ddid_ds.POLARIZATION_ID.data[ds.DATA_DESC_ID]]