Merge pull request #63 from ratt-ru/dev

Bug fixes
ratt-ru · May 11, 2020 · 5a667c8 · 5a667c8
2 parents 283bd35 + 8657588
commit 5a667c8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+0.3.6
+-----
+**ragavi-vis**
+
+  - Fixed bug in correlation selection
+
 0.3.5
 -----
 **ragavi-vis**

diff --git a/ragavi/ragavi.py b/ragavi/ragavi.py
@@ -1671,6 +1671,8 @@ def main(**kwargs):
                                       })
                             inv_source = ColumnDataSource(data={})
 
+                            logger.debug(f"Processing data for {legend}")
+
                             data_obj = DataCoreProcessor(
                                 sub, tab, gain,
                                 fid=fid, yaxis=yaxis, corr=corr,
@@ -1679,6 +1681,7 @@ def main(**kwargs):
                             data = data_obj.act()
                             xaxis = data_obj.xaxis
 
+                            logger.debug(f"Getting the flagged data")
                             infl_data = DataCoreProcessor(
                                 sub, tab, gain, fid=fid, yaxis=yaxis,
                                 corr=corr, flag=not _FLAG_DATA_,
@@ -1695,6 +1698,8 @@ def main(**kwargs):
 
                             iy = infl_data.y
 
+                            logger.debug(f"Done")
+
                             source.add(x, name='x')
                             source.add(y, name=f"y{_y}")
 
@@ -1714,6 +1719,7 @@ def main(**kwargs):
                             fig_glyphs.append(glyphs)
                             fig_legends.append((legend, []))
                             fig_ebars.append(bars)
+                            sub.close()
 
             title = f"{yaxis.capitalize()} vs {xaxis.capitalize()}"
             fig = create_bk_fig(xlab=x_label, ylab=y_label, title=title,
@@ -1738,6 +1744,7 @@ def main(**kwargs):
                 for spw in spw_ids:
                     # do this here otherwise extra x added after title
                     title = fig.above.pop()
+                    logger.debug("Adding extra chan/freq axis")
                     fig = add_axis(fig, (freqs[spw][0], freqs[spw][-1]),
                                    ax_label="Frequency [GHz]",
                                    ax_name=f"spw{spw}")

diff --git a/ragavi/utils.py b/ragavi/utils.py
@@ -245,6 +245,7 @@ def get_frequencies(ms_name, spwid=None, chan=None, cbin=None):
     frequencies = []
     for s in spw_subtab:
         frequencies.append(s.CHAN_FREQ)
+        s.close()
     frequencies = xr.concat(frequencies, dim="row")
 
     if spwid is not None:

diff --git a/ragavi/visibilities.py b/ragavi/visibilities.py
@@ -1085,8 +1085,8 @@ def get_ms(ms_name,  ants=None, cbin=None, chan_select=None, chunks=None,
                 tab_objs = antenna_iter(ms_name, **xds_inputs)
             else:
                 tab_objs = xm.xds_from_ms(ms_name, **xds_inputs)
-                corr_select = None
                 if iter_axis == "corr":
+                    corr_select = None
                     tab_objs = corr_iter(tab_objs)
             # select channels
             if chan_select is not None:

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def requirements():
         return [pname.strip() for pname in f.readlines()]
 
 setup(name='ragavi',
-      version="0.3.5",
+      version="0.3.6",
       description='Radio Astronomy Gain and Visibility Inspector',
       long_description=readme(),
       url='https://github.com/ratt-ru/ragavi',