Merge branch 'move-tests'

* move-tests: (5 commits) Add missing data files ...
transientskp · Oct 23, 2024 · 4e8a705 · 4e8a705
2 parents caa1d01 + 98aac47
commit 4e8a705
Show file tree

Hide file tree

Showing 99 changed files with 2,582 additions and 53 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -67,7 +67,7 @@ dependencies = [
 
 [tool.pytest.ini_options]
 testpaths = ["test"]
-addopts = ["--import-mode=importlib", "--cov=sourcefinder", "-q"]
+addopts = ["--import-mode=importlib", "--cov=sourcefinder", "-q", "-ra"]
 
 [tool.black]
 include = '\.pyi?$'

diff --git a/sourcefinder/testutil/mock.py b/sourcefinder/testutil/mock.py
@@ -69,7 +69,7 @@ def __init__(self,
         Generate a synthetic image for use in tests
 
         Args:
-            wcs (tkp.utility.coordinates.WCS): WCS for the image.
+            wcs (sourcefinder.utility.coordinates.WCS): WCS for the image.
             data (array_like): Data for the image. Default is a 512x512 array of
                 zeroes.
             beam (tuple): Beamsemi-major axis (in pixels), semi-minor axis (pixels)
@@ -102,4 +102,4 @@ def __init__(self,
     def calculate_phase_centre(self):
         x, y = self.data.shape
         centre_ra, centre_decl = self.wcs.p2s((x / 2, y / 2))
-        return centre_ra, centre_decl
+        return centre_ra, centre_decl
diff --git a/sourcefinder/utility/__init__.py b/sourcefinder/utility/__init__.py
@@ -1,50 +0,0 @@
-"""
-Root level :mod:`sourcefinder.utility` functions that don't justify a submodule:
-"""
-import math
-
-
-def nice_format(f):
-    if f > 9999 or f < 0.01:
-        return "%.2e" % f
-    else:
-        return "%.2f" % f
-
-
-def substitute(value, sub, test_f):
-    try:
-        if test_f(value):
-            return sub
-    except TypeError:
-        pass
-    return value
-
-
-def substitute_inf(value, sub="Infinity"):
-    """
-    If value is not infinite, return value. Otherwise, return sub.
-    """
-    return substitute(value, sub, math.isinf)
-
-
-def substitute_nan(value, sub=0.0):
-    """
-    If value is not NaN, return value. Otherwise, return sub.
-
-    """
-    return substitute(value, sub, math.isnan)
-
-
-class adict(dict):
-    """
-    Accessing dict keys like an attribute.
-    """
-
-    def __getattr__(self, key):
-        try:
-            return self[key]
-        except KeyError:
-            msg = "can't find %s, please check your settings file"
-            raise AttributeError(msg % key)
-
-    __setattr__ = dict.__setitem__

diff --git a/sourcefinder/utility/coordinates.py b/sourcefinder/utility/coordinates.py
@@ -697,6 +697,7 @@ def __setattr__(self, attrname, value):
     def __getattr__(self, attrname):
         if attrname in self.WCS_ATTRS:
             return getattr(self.wcs.wcs, attrname)
+        raise AttributeError(f"{type(self)!r} object has no attribute {attrname!r}")
 
     def p2s(self, pixpos):
         """

diff --git a/test/data/aartfaac.fits b/test/data/aartfaac.fits
diff --git a/test/data/aartfaac.table/logtable/table.dat b/test/data/aartfaac.table/logtable/table.dat
diff --git a/test/data/aartfaac.table/logtable/table.f0 b/test/data/aartfaac.table/logtable/table.f0
diff --git a/test/data/aartfaac.table/logtable/table.info b/test/data/aartfaac.table/logtable/table.info
@@ -0,0 +1,4 @@
+Type = Log message
+SubType = 
+
+Repository for software-generated logging messages
diff --git a/test/data/aartfaac.table/logtable/table.lock b/test/data/aartfaac.table/logtable/table.lock
diff --git a/test/data/aartfaac.table/table.dat b/test/data/aartfaac.table/table.dat
diff --git a/test/data/aartfaac.table/table.f0 b/test/data/aartfaac.table/table.f0
diff --git a/test/data/aartfaac.table/table.f0_TSM0 b/test/data/aartfaac.table/table.f0_TSM0
diff --git a/test/data/aartfaac.table/table.info b/test/data/aartfaac.table/table.info
@@ -0,0 +1,3 @@
+Type = Image
+SubType = 
+
diff --git a/test/data/aartfaac.table/table.lock b/test/data/aartfaac.table/table.lock
diff --git a/test/data/ami-la.image/logtable/table.dat b/test/data/ami-la.image/logtable/table.dat
diff --git a/test/data/ami-la.image/logtable/table.f0 b/test/data/ami-la.image/logtable/table.f0
diff --git a/test/data/ami-la.image/logtable/table.info b/test/data/ami-la.image/logtable/table.info
@@ -0,0 +1,4 @@
+Type = Log message
+SubType = 
+
+Repository for software-generated logging messages
diff --git a/test/data/ami-la.image/logtable/table.lock b/test/data/ami-la.image/logtable/table.lock
diff --git a/test/data/ami-la.image/table.dat b/test/data/ami-la.image/table.dat
diff --git a/test/data/ami-la.image/table.f0 b/test/data/ami-la.image/table.f0
diff --git a/test/data/ami-la.image/table.f0_TSM0 b/test/data/ami-la.image/table.f0_TSM0
diff --git a/test/data/ami-la.image/table.info b/test/data/ami-la.image/table.info
@@ -0,0 +1,3 @@
+Type = Image
+SubType = 
+
diff --git a/test/data/ami-la.image/table.lock b/test/data/ami-la.image/table.lock
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.dat b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.dat
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.f0 b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.f0
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.info b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.lock b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ANTENNA/table.lock
diff --git a/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.dat b/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.dat
diff --git a/...sc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.f0 b/...sc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.f0
diff --git a/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.f0i b/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.f0i
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.info b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.lock b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_FIELD/table.lock
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.dat b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.dat
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.f0 b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.f0
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.info b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.lock b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_HISTORY/table.lock
diff --git a/...6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.dat b/...6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.dat
diff --git a/...x6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.f0 b/...x6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.f0
diff --git a/...6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.f0i b/...6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.f0i
diff --git a/...000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.info b/...000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.lock b/...000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_OBSERVATION/table.lock
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.dat b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.dat
diff --git a/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.f0 b/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.f0
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.info b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.lock b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_ORIGIN/table.lock
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.dat b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.dat
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.f0 b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.f0
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.f0i b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.f0i
diff --git a/...ax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.info b/...ax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...ax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.lock b/...ax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_POINTING/table.lock
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.dat b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.dat
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.f0 b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.f0
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.info b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.lock b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_QUALITY/table.lock
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.dat b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.dat
diff --git a/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.f0 b/...c_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.f0
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.f0i b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.f0i
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.info b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.lock b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_SOURCE/table.lock
diff --git a/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.dat b/...wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.dat
diff --git a/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.f0 b/..._wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.f0
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.info b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.lock b/...max6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/LOFAR_STATION/table.lock
diff --git a/...llsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.dat b/...llsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.dat
diff --git a/...ellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.f0 b/...ellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.f0
diff --git a/...lsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.info b/...lsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.info
@@ -0,0 +1,4 @@
+Type = Log message
+SubType = 
+
+Repository for software-generated logging messages
diff --git a/...lsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.lock b/...lsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/logtable/table.lock
diff --git a/...9_skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.dat b/...9_skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.dat
diff --git a/...09_skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.f0 b/...09_skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.f0
diff --git a/...ymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.f0_TSM0 b/...ymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.f0_TSM0
diff --git a/..._skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.info b/..._skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.info
@@ -0,0 +1,3 @@
+Type = Image
+SubType = 
+
diff --git a/..._skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.lock b/..._skymodellsc_wmax6000_noise_mult10_cell40_npix512_wplanes215.img.restored.corr/table.lock
diff --git a/test/data/kat7.image/logtable/table.dat b/test/data/kat7.image/logtable/table.dat
diff --git a/test/data/kat7.image/logtable/table.f0 b/test/data/kat7.image/logtable/table.f0
diff --git a/test/data/kat7.image/logtable/table.info b/test/data/kat7.image/logtable/table.info
@@ -0,0 +1,4 @@
+Type = Log message
+SubType = 
+
+Repository for software-generated logging messages
diff --git a/test/data/kat7.image/logtable/table.lock b/test/data/kat7.image/logtable/table.lock
diff --git a/test/data/kat7.image/table.dat b/test/data/kat7.image/table.dat
diff --git a/test/data/kat7.image/table.f0 b/test/data/kat7.image/table.f0
diff --git a/test/data/kat7.image/table.f0_TSM0 b/test/data/kat7.image/table.f0_TSM0
diff --git a/test/data/kat7.image/table.info b/test/data/kat7.image/table.info
@@ -0,0 +1,3 @@
+Type = Image
+SubType = 
+
diff --git a/test/data/kat7.image/table.lock b/test/data/kat7.image/table.lock
diff --git a/test/data/lofar.fits b/test/data/lofar.fits
diff --git a/test/data/lofar.h5 b/test/data/lofar.h5