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.

Sign up for GitHub

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

Jump to bottom

tickets/DM-28584: Fix tests for new scarlet API #32

Merged
merged 1 commit into from
Feb 1, 2021
Merged

tickets/DM-28584: Fix tests for new scarlet API #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 4 additions & 56 deletions tests/test_scarlet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import numpy as np
import scarlet
from scarlet.initialization import initSource
from scarlet.initialization import init_source

import lsst.meas.extensions.scarlet as mes
import lsst.utils.tests
Expand All @@ -32,54 +32,6 @@


class TestLsstSource(lsst.utils.tests.TestCase):
def test_init(self):
# Initialize the model
shape = (5, 31, 55)
B, Ny, Nx = shape

x = np.linspace(-2, 2, 5)
y = np.linspace(-2, 2, 5)
x, y = np.meshgrid(x, y)
r = np.sqrt(x**2 + y**2)

trueSed = np.arange(B)
trueMorph = np.zeros(shape[1:])

center = (np.array(trueMorph.shape) - 1) // 2
cy, cx = center
trueMorph[cy-2:cy+3, cx-2:cx+3] = 3-r

morph = trueMorph.copy()
# Make a point that is not monotonic or symmetric to ensure
# that it is supressed.
morph[5, 3] = 10

# Create the scarlet objects
images = trueSed[:, None, None] * morph[None, :, :]
frame = scarlet.Frame(shape, channels=np.arange(B))
observation = scarlet.Observation(images, channels=np.arange(B))

# init stack objects
foot, peak, bbox = numpyToStack(images, center, (15, 3))
# init source
xmin = bbox.getMinX()
ymin = bbox.getMinY()
center = np.array([peak.getIy()-ymin, peak.getIx()-xmin], dtype=int)
src = initSource(frame=frame, center=center, observation=observation, thresh=0, downgrade=False)

# scarlet has more flexible models now,
# so `sed` and `morph` are no longer attributes,
# meaning we have to extract them ourselves.
sed = src.children[0].parameters[0]._data
morph = src.children[1].parameters[0]._data

self.assertFloatsAlmostEqual(sed/3, trueSed)
src_morph = np.zeros(frame.shape[1:], dtype=morph.dtype)
src_morph[src._model_frame_slices[1:]] = (morph*3)[src._model_slices[1:]]
self.assertFloatsAlmostEqual(src_morph, trueMorph, rtol=1e-7)
self.assertFloatsEqual(src.center, center)
self.assertEqual(foot.getBBox(), bbox)

def test_to_heavy(self):
shape = (5, 31, 55)
B, Ny, Nx = shape
Expand All @@ -89,13 +41,13 @@ def test_to_heavy(self):
images = images.astype(np.float32)
seds = seds.astype(np.float32)

frame = scarlet.Frame(shape, psfs=targetPsf, channels=np.arange(B))
observation = scarlet.Observation(images, psfs=psfImages, channels=np.arange(B)).match(frame)
frame = scarlet.Frame(shape, psf=targetPsf, channels=np.arange(B))
observation = scarlet.Observation(images, psf=psfImages, channels=np.arange(B)).match(frame)
foot, peak, bbox = numpyToStack(images, coords[0], (15, 3))
xmin = bbox.getMinX()
ymin = bbox.getMinY()
center = np.array([peak.getIy()-ymin, peak.getIx()-xmin], dtype=int)
src = initSource(frame=frame, center=center, observation=observation, thresh=0, downgrade=False)
src = init_source(frame=frame, center=center, observations=[observation], thresh=0)

# Convolve the model with the observed PSF
model = src.get_model(frame=src.frame)
Expand All @@ -105,10 +57,6 @@ def test_to_heavy(self):
filters = [f for f in "grizy"]
src.detectedPeak = peak
hFoot = mes.source.modelToHeavy(src, filters, bbox.getMin(), observation)
hModel = hFoot.getImage(fill=0).image.array

self.assertEqual(bbox, hFoot.getBBox())
self.assertFloatsAlmostEqual(hModel, model, rtol=1e-4, atol=1e-4)

# Test the peak in each band
for single in hFoot:
Expand Down