Applied black

Author: vsmagalhaes

etc/alma-nf-filler/alma_nf_filler_lib.py

@@ -1230,7 +1230,9 @@ def _compute_grid_params(meta_dict, extent):
     clight = scipy.constants.speed_of_light
     wavelength = clight / meta_dict["spw"]["frequency"][0]
 
-    telescope = get_proper_telescope(meta_dict["ant"]["telescope"], meta_dict["ant"]["antenna"])
+    telescope = get_proper_telescope(
+        meta_dict["ant"]["telescope"], meta_dict["ant"]["antenna"]
+    )
 
     cell_size = wavelength / telescope.diameter / 3.0
 

src/astrohack/antenna/antenna_surface.py

@@ -92,16 +92,24 @@ def __init__(
             self.phase = phase_wrapping(self.phase)
 
         self._create_aperture_mask(clip_type, clip_level, exclude_shadows)
-        self.deviation = self.telescope.phase_to_deviation(self.rad, self.phase, self.wavelength)
+        self.deviation = self.telescope.phase_to_deviation(
+            self.rad, self.phase, self.wavelength
+        )
         self.panels = self.telescope.build_panel_list(pmodel, panel_margins)
         if not self.reread:
             self.panelmodel = pmodel
             self.panel_margins = panel_margins
             if crop:
                 self._crop_maps()
-            self.panel_distribution = self.telescope.attribute_pixels_to_panels(self.panels, self.u_axis, self.v_axis,
-                                                                                self.rad, self.phi, self.deviation,
-                                                                                self.mask)
+            self.panel_distribution = self.telescope.attribute_pixels_to_panels(
+                self.panels,
+                self.u_axis,
+                self.v_axis,
+                self.rad,
+                self.phi,
+                self.deviation,
+                self.mask,
+            )
 
         if nan_out_of_bounds:
             self._nan_out_of_bounds()
@@ -225,7 +233,9 @@ def _read_xds(self, inputxds):
         self.label = create_dataset_label(
             inputxds.attrs["ant_name"], inputxds.attrs["ddi"]
         )
-        self.telescope = get_proper_telescope(inputxds.attrs["telescope_name"], inputxds.attrs["ant_name"])
+        self.telescope = get_proper_telescope(
+            inputxds.attrs["telescope_name"], inputxds.attrs["ant_name"]
+        )
 
     def _define_amp_clip(self, clip_type, clip_level):
         self.amplitude_noise = np.where(self.base_mask, np.nan, self.amplitude)
@@ -249,7 +259,9 @@ def _compute_noise_threshold_clip(self, threshold, step_multiplier=0.95):
         noise_stats = data_statistics(self.amplitude_noise)
 
         in_disk = np.where(self.rad < self.telescope.diameter / 2.0, 1.0, np.nan)
-        in_disk = np.where(self.rad < self.telescope.inner_radial_limit, np.nan, in_disk)
+        in_disk = np.where(
+            self.rad < self.telescope.inner_radial_limit, np.nan, in_disk
+        )
         n_in_disk = np.nansum(in_disk)
         in_disk_amp = in_disk * self.amplitude
 
@@ -309,7 +321,6 @@ def _nan_out_of_bounds(self):
         self.phase = np.where(self.base_mask, self.phase, np.nan)
         self.amplitude = np.where(self.base_mask, self.amplitude, np.nan)
 
-
     def _fetch_panel_ringed(self, ring, panel):
         """
         Fetch a panel object from the panel list using its ring and panel numbers,
@@ -427,8 +438,12 @@ def correct_surface(self):
                 ix, iy = int(corr[0]), int(corr[1])
                 self.residuals[ix, iy] -= corr[-1]
                 self.corrections[ix, iy] = -corr[-1]
-        self.phase_corrections = self.telescope.deviation_to_phase(self.rad, self.corrections, self.wavelength)
-        self.phase_residuals = self.telescope.deviation_to_phase(self.rad, self.residuals, self.wavelength)
+        self.phase_corrections = self.telescope.deviation_to_phase(
+            self.rad, self.corrections, self.wavelength
+        )
+        self.phase_residuals = self.telescope.deviation_to_phase(
+            self.rad, self.residuals, self.wavelength
+        )
         self._build_panel_data_arrays()
         self.solved = True
 

src/astrohack/antenna/telescope.py

@@ -32,7 +32,7 @@ def read(self, filename):
             filename: name of the input file
         """
         try:
-            logger.debug('Reading telescope data from: filename')
+            logger.debug("Reading telescope data from: filename")
             xds = xr.open_zarr(filename)
             for key in xds.attrs:
                 setattr(self, key, xds.attrs[key])
@@ -47,10 +47,11 @@ def read(self, filename):
         self.file_path = abs_path.parent
 
     def read_from_distro(self, name):
-        dest_path = "/".join([astrohack.__path__[0], f'data/telescopes/{name.lower()}.zarr'])
+        dest_path = "/".join(
+            [astrohack.__path__[0], f"data/telescopes/{name.lower()}.zarr"]
+        )
         self.read(dest_path)
 
-
     def write(self, filename):
         """
         Write the telescope object to an X array .zarr telescope configuration file
@@ -62,7 +63,7 @@ def write(self, filename):
         obj_dict.pop("filename", None)
         xds = xr.Dataset()
         xds.attrs = obj_dict
-        logger.debug('Writing telescope data to: filename')
+        logger.debug("Writing telescope data to: filename")
         xds.to_zarr(filename, mode="w", compute=True, consolidated=True)
         return
 
@@ -74,7 +75,12 @@ def __repr__(self):
         return outstr
 
     def write_to_distro(self):
-        dest_path = "/".join([astrohack.__path__[0], f'data/telescopes/{self.name.lower().replace(" ", "_")}.zarr'])
+        dest_path = "/".join(
+            [
+                astrohack.__path__[0],
+                f'data/telescopes/{self.name.lower().replace(" ", "_")}.zarr',
+            ]
+        )
         self.write(dest_path)
 
 
@@ -110,7 +116,11 @@ def from_name(cls, name):
     def consistency_check(self):
         error = False
 
-        if not self.n_rings_of_panels == len(self.panel_inner_radii) == len(self.panel_outer_radii):
+        if (
+            not self.n_rings_of_panels
+            == len(self.panel_inner_radii)
+            == len(self.panel_outer_radii)
+        ):
             logger.error(
                 "Number of panels don't match radii or number of panels list sizes"
             )
@@ -119,7 +129,7 @@ def consistency_check(self):
         if error:
             raise Exception("Failed Consistency check")
         else:
-            print('Consistency passed')
+            print("Consistency passed")
 
         return
 
@@ -161,6 +171,7 @@ def _alma_panel_labeling(self, iring, ipanel):
 
     def build_panel_list(self, panel_model, panel_margins):
         from time import time
+
         start = time()
         if self.name in ["VLA", "VLBA"]:
             self._panel_label = self._vla_panel_labeling
@@ -189,7 +200,9 @@ def build_panel_list(self, panel_model, panel_margins):
 
         return panel_list
 
-    def attribute_pixels_to_panels(self, panel_list, u_axis, v_axis, radius, phi, deviation, mask):
+    def attribute_pixels_to_panels(
+        self, panel_list, u_axis, v_axis, radius, phi, deviation, mask
+    ):
         """
         Attribute pixels in deviation to the panels in the panel_list
         Args:
@@ -220,9 +233,7 @@ def attribute_pixels_to_panels(self, panel_list, u_axis, v_axis, radius, phi, de
                 ipanel = panel_map[ix, iy]
                 if ipanel >= 0:
                     panel = panel_list[int(ipanel)]
-                    issample, inpanel = panel.is_inside(
-                        radius[ix, iy], phi[ix, iy]
-                    )
+                    issample, inpanel = panel.is_inside(radius[ix, iy], phi[ix, iy])
                     if inpanel:
                         if issample and mask[ix, iy]:
                             panel.add_sample([xc, yc, ix, iy, deviation[ix, iy]])
@@ -231,7 +242,6 @@ def attribute_pixels_to_panels(self, panel_list, u_axis, v_axis, radius, phi, de
 
         return panel_map
 
-
     def phase_to_deviation(self, radius, phase, wavelength):
         acoeff = (wavelength / twopi) / (4.0 * self.focus)
         bcoeff = 4 * self.focus**2
@@ -267,34 +277,34 @@ def get_proper_telescope(name: str, antenna_name: str = None):
     name = name.lower()
     if isinstance(antenna_name, str):
         antenna_name = antenna_name.lower()
-    if 'vla' in name:
-        if antenna_name is None or 'ea' in antenna_name:
-            return RingedCassegrain.from_name('vla')
-        elif 'na' in antenna_name:
-            print('ngvla antenna not yet supported')
+    if "vla" in name:
+        if antenna_name is None or "ea" in antenna_name:
+            return RingedCassegrain.from_name("vla")
+        elif "na" in antenna_name:
+            print("ngvla antenna not yet supported")
             return None
         else:
-            raise Exception(f'Unsupported antenna type for the VLA: {antenna_name}')
+            raise Exception(f"Unsupported antenna type for the VLA: {antenna_name}")
 
-    elif 'vlba' in name:
-        return RingedCassegrain.from_name('vlba')
+    elif "vlba" in name:
+        return RingedCassegrain.from_name("vlba")
 
-    elif 'alma' in name:
+    elif "alma" in name:
         if antenna_name is None:
-            raise Exception('ALMA is an heterogenious array and hence an antenna name is needed')
-        elif 'dv' in antenna_name:
-            return RingedCassegrain.from_name('alma_dv')
-        elif 'da' in antenna_name:
-            return RingedCassegrain.from_name('alma_da')
-        elif 'tp' in antenna_name:
-            return RingedCassegrain.from_name('alma_tp')
+            raise Exception(
+                "ALMA is an heterogenious array and hence an antenna name is needed"
+            )
+        elif "dv" in antenna_name:
+            return RingedCassegrain.from_name("alma_dv")
+        elif "da" in antenna_name:
+            return RingedCassegrain.from_name("alma_da")
+        elif "tp" in antenna_name:
+            return RingedCassegrain.from_name("alma_tp")
         else:
-            raise Exception(f'Unsupported antenna type for ALMA: {antenna_name}')
+            raise Exception(f"Unsupported antenna type for ALMA: {antenna_name}")
 
-    elif 'aca' in name:
-        return RingedCassegrain.from_name('aca_7m')
+    elif "aca" in name:
+        return RingedCassegrain.from_name("aca_7m")
 
     else:
         return None
-
-

src/astrohack/cassegrain_ray_tracing.py

@@ -540,7 +540,7 @@ def apply_holog_phase_fitting_to_rt_xds(
     ]
 
     # Manipulate VLA telescope object so that it has compatible parameters to the ones in the RT model.
-    telescope = get_proper_telescope('VLA')
+    telescope = get_proper_telescope("VLA")
     telescope.focus = telescope_pars["focal_length"]
     c_fact = telescope_pars["foci_half_distance"]
     a_fact = telescope_pars["z_intercept"]

src/astrohack/core/holog.py

@@ -45,7 +45,9 @@ def process_holog_chunk(holog_chunk_params):
     ddi = holog_chunk_params["this_ddi"]
     convert_to_stokes = holog_chunk_params["to_stokes"]
     ref_xds = ant_data_dict[ddi]["map_0"]
-    telescope = get_proper_telescope(meta_data["telescope_name"], ref_xds.attrs["antenna_name"])
+    telescope = get_proper_telescope(
+        meta_data["telescope_name"], ref_xds.attrs["antenna_name"]
+    )
     try:
         is_near_field = ref_xds.attrs["near_field"]
     except KeyError:
@@ -75,7 +77,9 @@ def process_holog_chunk(holog_chunk_params):
 
     # Current bottleneck
     if is_near_field:
-        distance, focus_offset = telescope.station_distance_dict[holog_chunk_params["alma_osf_pad"]]
+        distance, focus_offset = telescope.station_distance_dict[
+            holog_chunk_params["alma_osf_pad"]
+        ]
         aperture_grid, u_axis, v_axis, _, used_wavelength = (
             calculate_near_field_aperture(
                 grid=beam_grid,

src/astrohack/utils/zernike_aperture_fitting.py

@@ -900,7 +900,9 @@ def fit_zernike_coefficients(
             arm_angle=telescope.arm_shadow_rotation,
         )
     else:
-        mask = create_aperture_mask(u_axis, v_axis, telescope.inner_radial_limit, aperture_radius)
+        mask = create_aperture_mask(
+            u_axis, v_axis, telescope.inner_radial_limit, aperture_radius
+        )
 
     # Vectorize grids with only valid points
     u_lin = u_grid[mask]

src/astrohack/visualization/diagnostics.py

@@ -662,7 +662,9 @@ def plot_position_corrections(parm_dict, data_dict):
     Returns:
     PNG file(s) with the correction plots
     """
-    telescope = get_proper_telescope(data_dict._meta_data["telescope_name"], parm_dict["ant"])
+    telescope = get_proper_telescope(
+        data_dict._meta_data["telescope_name"], parm_dict["ant"]
+    )
     destination = parm_dict["destination"]
     ref_ant = data_dict._meta_data["reference_antenna"]
     combined = parm_dict["combined"]

tests/unit/test_class_telescope.py

@@ -41,7 +41,8 @@ def test_write(self):
             testfile
         ), "Telescope configuration file not created at the proper location"
         assert (
-                filecmp.cmp(tel.file_path + "/vlba.zarr/.zattrs", testfile + "/.zattrs") == 0
+            filecmp.cmp(tel.file_path + "/vlba.zarr/.zattrs", testfile + "/.zattrs")
+            == 0
         ), ("Telescope configuration " "file is not equal to the " "reference")
         shutil.rmtree(testfile)