xradio 0.0.33__py3-none-any.whl → 0.0.34__py3-none-any.whl

xradio/vis/_vis_utils/_ms/conversion.py

@@ -558,21 +558,16 @@ def create_data_variables(
             try:
                 start = time.time()
                 if col == "WEIGHT":
-                    xds[col_to_data_variable_names[col]] = xr.DataArray(
-                        np.tile(
-                            read_col_conversion(
-                                tb_tool,
-                                col,
-                                time_baseline_shape,
-                                tidxs,
-                                bidxs,
-                                use_table_iter,
-                            )[:, :, None, :],
-                            (1, 1, xds.sizes["frequency"], 1),
-                        ),
-                        dims=col_dims[col],
+                    xds = get_weight(
+                        xds,
+                        col,
+                        tb_tool,
+                        time_baseline_shape,
+                        tidxs,
+                        bidxs,
+                        use_table_iter,
+                        main_column_descriptions,
                     )
-
                 else:
                     xds[col_to_data_variable_names[col]] = xr.DataArray(
                         read_col_conversion(
@@ -585,20 +580,61 @@ def create_data_variables(
                         ),
                         dims=col_dims[col],
                     )
-                    logger.debug(
-                        "Time to read column "
-                        + str(col)
-                        + " : "
-                        + str(time.time() - start)
-                    )
+
+                xds[col_to_data_variable_names[col]].attrs.update(
+                    create_attribute_metadata(col, main_column_descriptions)
+                )
+
+                logger.debug(
+                    "Time to read column " + str(col) + " : " + str(time.time() - start)
+                )
             except:
-                # logger.debug("Could not load column",col)
-                # print("Could not load column", col)
-                continue
+                logger.debug("Could not load column", col)
+
+                if ("WEIGHT_SPECTRUM" == col) and (
+                    "WEIGHT" in col_names
+                ):  # Bogus WEIGHT_SPECTRUM column, need to use WEIGHT.
+                    xds = get_weight(
+                        xds,
+                        "WEIGHT",
+                        tb_tool,
+                        time_baseline_shape,
+                        tidxs,
+                        bidxs,
+                        use_table_iter,
+                        main_column_descriptions,
+                    )
 
-            xds[col_to_data_variable_names[col]].attrs.update(
-                create_attribute_metadata(col, main_column_descriptions)
-            )
+
+def get_weight(
+    xds,
+    col,
+    tb_tool,
+    time_baseline_shape,
+    tidxs,
+    bidxs,
+    use_table_iter,
+    main_column_descriptions,
+):
+    xds[col_to_data_variable_names[col]] = xr.DataArray(
+        np.tile(
+            read_col_conversion(
+                tb_tool,
+                col,
+                time_baseline_shape,
+                tidxs,
+                bidxs,
+                use_table_iter,
+            )[:, :, None, :],
+            (1, 1, xds.sizes["frequency"], 1),
+        ),
+        dims=col_dims[col],
+    )
+
+    xds[col_to_data_variable_names[col]].attrs.update(
+        create_attribute_metadata(col, main_column_descriptions)
+    )
+    return xds
 
 
 def create_taql_query(partition_info):
@@ -756,13 +792,22 @@ def convert_and_write_partition(
                 use_table_iter,
             )
 
+            # Add data_groups and field_info
+            xds, is_single_dish = add_data_groups(xds)
+
             if (
                 "WEIGHT" not in xds.data_vars
             ):  # Some single dish datasets don't have WEIGHT.
-                xds["WEIGHT"] = xr.DataArray(
-                    np.ones(xds.SPECTRUM.shape, dtype=np.float64),
-                    dims=xds.SPECTRUM.dims,
-                )
+                if is_single_dish:
+                    xds["WEIGHT"] = xr.DataArray(
+                        np.ones(xds.SPECTRUM.shape, dtype=np.float64),
+                        dims=xds.SPECTRUM.dims,
+                    )
+                else:
+                    xds["WEIGHT"] = xr.DataArray(
+                        np.ones(xds.VISIBILITY.shape, dtype=np.float64),
+                        dims=xds.VISIBILITY.dims,
+                    )
 
             logger.debug("Time create data variables " + str(time.time() - start))
 
@@ -832,9 +877,6 @@ def convert_and_write_partition(
             if len(xds.time) > 1 and xds.time[1] - xds.time[0] < 0:
                 xds = xds.sel(time=slice(None, None, -1))
 
-            # Add data_groups and field_info
-            xds, is_single_dish = add_data_groups(xds)
-
             # Create field_and_source_xds (combines field, source and ephemeris data into one super dataset)
             start = time.time()
             if ephemeris_interpolate:

{xradio-0.0.33.dist-info → xradio-0.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xradio
-Version: 0.0.33
+Version: 0.0.34
 Summary: Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>
 License: BSD 3-Clause License

{xradio-0.0.33.dist-info → xradio-0.0.34.dist-info}/RECORD

@@ -38,7 +38,7 @@ xradio/vis/_vis_utils/__init__.py,sha256=Scu6rKJ2SpO8aG7F-xdTZcYfyWx0viV8gFh8E8u
 xradio/vis/_vis_utils/ms.py,sha256=hkJHFDC6O4PNhqDALX7CJ-krEpF9vxu-N_ur-UXi0Zo,4311
 xradio/vis/_vis_utils/zarr.py,sha256=OYCOdUVUE-KbG0-OZKIbD0bFpOy1tt2YqiQMStVzHDs,3948
 xradio/vis/_vis_utils/_ms/chunks.py,sha256=JTPk3il6fk570BjWZMoOAtsbvnLmqPcBv9EPY6A2yOs,2964
-xradio/vis/_vis_utils/_ms/conversion.py,sha256=TiMG9COEWpGwlGT-U2PXhkTAlA4DZSOk7esxfqJY3Vw,37279
+xradio/vis/_vis_utils/_ms/conversion.py,sha256=pHewprOik2aM8ZN5uQeez386uvZ1MkUjYfToBzDZT0Y,38330
 xradio/vis/_vis_utils/_ms/create_field_and_source_xds.py,sha256=btIaOnfTy7oQUBbrXtH1Jbh_1w2Igz-mTzDnYZU1qyY,27590
 xradio/vis/_vis_utils/_ms/descr.py,sha256=dYK8mhXxODIh-dfqaOm-YZb7kmoN1N2golX_RFncO94,5215
 xradio/vis/_vis_utils/_ms/msv2_msv3.py,sha256=9AKs2HWly7Ivv_Cjr11dIPGmm33_rtSBoGF9wN5ZwEQ,116
@@ -64,8 +64,8 @@ xradio/vis/_vis_utils/_utils/xds_helper.py,sha256=BudDNSiQyaZCMEzqScTb_LoqRgha1K
 xradio/vis/_vis_utils/_zarr/encoding.py,sha256=GENIlThV6a9CUCL6gIGlu9c6NR3OFWNos6mpxZjMwDc,536
 xradio/vis/_vis_utils/_zarr/read.py,sha256=9UKX_kKztE5jhsriBPnLhWtbptk5DRSVUEHT8V5qh8w,7597
 xradio/vis/_vis_utils/_zarr/write.py,sha256=vebYh-rAKfY3Feuv6H400s-2UuciPtfZMIlMtb23YSk,10044
-xradio-0.0.33.dist-info/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
-xradio-0.0.33.dist-info/METADATA,sha256=AoUoBeNorPBjVCIehmL1aKi1OuGptESuOaJeUHMYEmM,4449
-xradio-0.0.33.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-xradio-0.0.33.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
-xradio-0.0.33.dist-info/RECORD,,
+xradio-0.0.34.dist-info/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
+xradio-0.0.34.dist-info/METADATA,sha256=ldNjvtWhYhKL8Gzu0ZS0rk4Ij5MnxuOWXuWWFHddqHw,4449
+xradio-0.0.34.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+xradio-0.0.34.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
+xradio-0.0.34.dist-info/RECORD,,