rename frequency_cal => frequency_system_cal

casangi · Jan 16, 2025 · c0f61b1 · c0f61b1
1 parent ca18bd4
commit c0f61b1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/docs/source/measurement_set/schema_and_api/measurement_set_schema.rst b/docs/source/measurement_set/schema_and_api/measurement_set_schema.rst
@@ -183,9 +183,9 @@ as frequencies or timestamps.
 
    .. xradio_array_schema_table:: xradio.measurement_set.schema.TimeSystemCalCoordArray
 
-.. autoclass:: xradio.measurement_set.schema.FrequencyCalArray()
+.. autoclass:: xradio.measurement_set.schema.FrequencySystemCalArray()
 
-   .. xradio_array_schema_table:: xradio.measurement_set.schema.FrequencyCalArray
+   .. xradio_array_schema_table:: xradio.measurement_set.schema.FrequencySystemCalArray
 
 .. autoclass:: xradio.measurement_set.schema.TimeEphemerisCoordArray()
 

diff --git a/src/xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py b/src/xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py
@@ -545,7 +545,7 @@ def create_system_calibration_xds(
     if "frequency" not in generic_sys_cal_xds.sizes:
         dims_all = mandatory_dimensions
     else:
-        dims_all = mandatory_dimensions + ["frequency_cal"]
+        dims_all = mandatory_dimensions + ["frequency_system_cal"]
 
     to_new_data_variables = {
         "PHASE_DIFF": ["PHASE_DIFFERENCE", ["antenna_name", "time_system_cal"]],
@@ -566,7 +566,7 @@ def create_system_calibration_xds(
     to_new_coords = {
         "TIME": ["time_system_cal", ["time_system_cal"]],
         "receptor": ["receptor_label", ["receptor_label"]],
-        "frequency": ["frequency_cal", ["frequency_cal"]],
+        "frequency": ["frequency_system_cal", ["frequency_system_cal"]],
     }
 
     sys_cal_xds = xr.Dataset(attrs={"type": "system_calibration"})
@@ -581,17 +581,17 @@ def create_system_calibration_xds(
     )
 
     # Add frequency coord and its measures data, if present
-    if "frequency_cal" in dims_all:
+    if "frequency_system_cal" in dims_all:
         frequency_coord = {
-            "frequency_cal": generic_sys_cal_xds.coords["frequency"].data
+            "frequency_system_cal": generic_sys_cal_xds.coords["frequency"].data
         }
         sys_cal_xds = sys_cal_xds.assign_coords(frequency_coord)
         frequency_measure = {
             "type": main_xds_frequency.attrs["type"],
             "units": main_xds_frequency.attrs["units"],
             "observer": main_xds_frequency.attrs["observer"],
         }
-        sys_cal_xds.coords["frequency_cal"].attrs.update(frequency_measure)
+        sys_cal_xds.coords["frequency_system_cal"].attrs.update(frequency_measure)
 
     sys_cal_xds = rename_and_interpolate_to_time(
         sys_cal_xds, "time_system_cal", sys_cal_interp_time, "system_calibration_xds"

diff --git a/src/xradio/measurement_set/schema.py b/src/xradio/measurement_set/schema.py
@@ -34,7 +34,7 @@
 """ Baseline ID dimension """
 Frequency = Literal["frequency"]
 """ Frequency dimension """
-FrequencyCal = Literal["frequency_cal"]
+FrequencySystemCal = Literal["frequency_system_cal"]
 """ Frequency dimension in the system calibration dataset """
 Polarization = Literal["polarization"]
 """ Polarization dimension """
@@ -718,11 +718,11 @@ class FrequencyArray:
 
 
 @xarray_dataarray_schema
-class FrequencyCalArray:
-    """The frequency_cal coordinate of the system calibration dataset. It has
+class FrequencySystemCalArray:
+    """The frequency_system_cal coordinate of the system calibration dataset. It has
     only measures data, as opposed to the frequency array of the main dataset."""
 
-    data: Data[FrequencyCal, float]
+    data: Data[FrequencySystemCal, float]
     """ Center frequencies for each channel. """
 
     type: Attr[SpectralCoord] = "spectral_coord"
@@ -1716,9 +1716,9 @@ class SystemCalibrationXds:
     """ Midpoint of time for which this set of parameters is accurate. Labeled 'time' when interpolating to main time axis """
     time_system_cal: Optional[Coordof[TimeSystemCalCoordArray]] = None
     """ Midpoint of time for which this set of parameters is accurate. Labeled 'time_system_cal' when not interpolating to main time axis """
-    frequency: Optional[Coordof[FrequencyCalArray]] = None
+    frequency: Optional[Coordof[FrequencySystemCalArray]] = None
     """  """
-    frequency_cal: Optional[Coord[FrequencyCal, int]] = None
+    frequency_system_cal: Optional[Coord[FrequencySystemCal, int]] = None
     """TODO: What is this?"""
 
     # Data variables (all optional)
@@ -1732,10 +1732,10 @@ class SystemCalibrationXds:
     TCAL: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],
@@ -1746,10 +1746,10 @@ class SystemCalibrationXds:
     TRX: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],
@@ -1760,10 +1760,10 @@ class SystemCalibrationXds:
     TSKY: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],
@@ -1774,10 +1774,10 @@ class SystemCalibrationXds:
     TSYS: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],
@@ -1788,10 +1788,10 @@ class SystemCalibrationXds:
     TANT: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],
@@ -1802,10 +1802,10 @@ class SystemCalibrationXds:
     TANT_SYS: Optional[
         Data[
             Union[
-                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, TimeSystemCal, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel, Frequency],
                 tuple[AntennaName, TimeSystemCal, ReceptorLabel],
-                tuple[AntennaName, Time, ReceptorLabel, FrequencyCal],
+                tuple[AntennaName, Time, ReceptorLabel, FrequencySystemCal],
                 tuple[AntennaName, Time, ReceptorLabel, Frequency],
                 tuple[AntennaName, Time, ReceptorLabel],
             ],