Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add optional partition_info/antenna_name #352

Merged
merged 5 commits into from
Jan 24, 2025
Merged
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/xradio/measurement_set/_utils/_msv2/conversion.py
Original file line number Diff line number Diff line change
@@ -1029,7 +1029,7 @@ def get_observation_info(in_file, observation_id, intents):
datetime.timezone.utc
).isoformat(),
"xradio_version": importlib.metadata.version("xradio"),
"schema_version": "4.0.-9990",
"schema_version": "4.0.-9987",
"type": "visibility",
}
)
@@ -1242,6 +1242,10 @@ def get_observation_info(in_file, observation_id, intents):
"intents": intents,
"taql_where": taql_where,
}
if with_antenna_partitioning:
partition_info_misc_fields["antenna_name"] = xds.coords[
"antenna_name"
].data[0]
info_dicts = create_info_dicts(
in_file, xds, field_and_source_xds, partition_info_misc_fields, tb_tool
)
4 changes: 4 additions & 0 deletions src/xradio/measurement_set/_utils/_msv2/msv4_info_dicts.py
Original file line number Diff line number Diff line change
@@ -62,6 +62,10 @@ def create_info_dicts(
"taql": partition_info_misc_fields["taql_where"],
"line_name": line_name,
}
if "antenna_name" in partition_info_misc_fields:
info_dicts["partition_info"]["antenna_name"] = partition_info_misc_fields[
"antenna_name"
]

observation_id = check_if_consistent(
tb_tool.getcol("OBSERVATION_ID"), "OBSERVATION_ID"
2 changes: 2 additions & 0 deletions src/xradio/measurement_set/schema.py
Original file line number Diff line number Diff line change
@@ -1221,6 +1221,8 @@ class PartitionInfoDict:
""" The taql query used if converted from MSv2. """
line_name: list[str]
""" Spectral line names """
antenna_name: Optional[str]
""" Name of antenna when partitioning also by antenna (single-dish). """


@dict_schema
7 changes: 7 additions & 0 deletions tests/stakeholder/test_measure_set_stakeholder.py
Original file line number Diff line number Diff line change
@@ -135,6 +135,13 @@ def base_test(
combined_antenna = ps.get_combined_antenna_xds()
assert type(combined_antenna) == xr.Dataset
ps.get_combined_field_and_source_xds()
assert all(
[
"antenna_name" in ps[xds_name].attrs["partition_info"]
for xds_name in ps.keys()
if "ANTENNA1" in partition_scheme
]
)

sum = 0.0
sum_lazy = 0.0