Apply "_is_valid_beam_tuple" to three classes

Apply "_is_valid_beam_tuple" static private method from "DataAccessor" to three of its derived classes.

Author: HannoSpreeuw

sourcefinder/accessors/casaimage.py

@@ -48,11 +48,13 @@ def __init__(self, url, plane=0, beam=None):
         self.freq_eff, self.freq_bw = self.parse_frequency(table)
         self.pixelsize = self.parse_pixelsize()
 
-        if not self.beam or beam:
+        if self._is_valid_beam_tuple(beam) or not self._is_valid_beam_tuple(
+                self.beam):
             # An argument-supplied beam overrides a beam derived from
             # (bmaj, bmin, bpa) in a config.toml. Only if those two options
             # are not specified, we parse the beam from the header.
-            bmaj, bmin, bpa = beam if beam else self.parse_beam(table)
+            bmaj, bmin, bpa = beam if self._is_valid_beam_tuple(beam) else (
+                self.parse_beam(table))
             self.beam = self.degrees2pixels(
                 bmaj, bmin, bpa, self.pixelsize[0], self.pixelsize[1]
             )

sourcefinder/accessors/fitsimage.py

@@ -43,11 +43,13 @@ def __init__(self, url, plane=None, beam=None, hdu_index=0):
         self.freq_eff, self.freq_bw = self.parse_frequency()
         self.pixelsize = self.parse_pixelsize()
 
-        if not self.beam or beam:
+        if self._is_valid_beam_tuple(beam) or not self._is_valid_beam_tuple(
+                self.beam):
             # An argument-supplied beam overrides a beam derived from
             # (bmaj, bmin, bpa) in a config.toml. Only if those two options
             # are not specified, we parse the beam from the header.
-            bmaj, bmin, bpa = beam if beam else self.parse_beam()
+            bmaj, bmin, bpa = beam if self._is_valid_beam_tuple(beam) else (
+                self.parse_beam())
             self.beam = self.degrees2pixels(
                 bmaj, bmin, bpa, self.pixelsize[0], self.pixelsize[1]
             )

sourcefinder/accessors/fitsimageblob.py

@@ -40,11 +40,13 @@ def __init__(self, hdulist, plane=None, beam=None, hdu_index=0):
                    self.freq_eff, self.freq_bw
         self.url = "_".join([str(x) for x in elements])
 
-        if not self.beam or beam:
+        if self._is_valid_beam_tuple(beam) or not self._is_valid_beam_tuple(
+                self.beam):
             # An argument-supplied beam overrides a beam derived from
             # (bmaj, bmin, bpa) in a config.toml. Only if those two options
             # are not specified, we parse the beam from the header.
-            bmaj, bmin, bpa = beam if beam else self.parse_beam()
+            bmaj, bmin, bpa = beam if self._is_valid_beam_tuple(beam) else (
+                self.parse_beam())
             self.beam = self.degrees2pixels(
                 bmaj, bmin, bpa, self.pixelsize[0], self.pixelsize[1]
             )