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

DM-34484: Update tests to remove dependency on obs_test. #164

Merged
merged 2 commits into from
May 9, 2022
Merged

DM-34484: Update tests to remove dependency on obs_test. #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f161a2d
Remove gen2 obs_test mapper.
erykoff Apr 19, 2022
ed0fd76
Update tests to use MockReferenceObjectLoaderFromFiles.
erykoff Apr 19, 2022
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
1 change: 0 additions & 1 deletion tests/data/sdssrefcat/_mapper
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions tests/test_astrometryTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import os.path
import math
import unittest
import glob

from astropy import units
import scipy.stats
Expand All @@ -35,8 +36,7 @@
import lsst.afw.image as afwImage
import lsst.meas.base as measBase
import lsst.pipe.base as pipeBase
from lsst.daf.persistence import Butler
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
from lsst.meas.algorithms.testUtils import MockReferenceObjectLoaderFromFiles
from lsst.meas.astrom import AstrometryTask


Expand All @@ -53,8 +53,8 @@ def setUp(self):
self.exposure = afwImage.ExposureF(self.bbox)
self.exposure.setWcs(self.tanWcs)
self.exposure.setFilterLabel(afwImage.FilterLabel(band="r", physical="rTest"))
butler = Butler(refCatDir)
self.refObjLoader = LoadIndexedReferenceObjectsTask(butler=butler)
filenames = sorted(glob.glob(os.path.join(refCatDir, 'ref_cats', 'cal_ref_cat', '??????.fits')))
self.refObjLoader = MockReferenceObjectLoaderFromFiles(filenames, htmLevel=8)

def tearDown(self):
del self.tanWcs
Expand Down
16 changes: 8 additions & 8 deletions tests/test_directMatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@
import os
import sys
import unittest
import glob

import numpy as np

import lsst.utils.tests
import lsst.meas.astrom
import lsst.geom

from lsst.daf.persistence import Butler
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
from lsst.meas.algorithms.testUtils import MockReferenceObjectLoaderFromFiles


RefCatDir = os.path.join(os.path.dirname(__file__), "data", "sdssrefcat")

Expand All @@ -42,21 +43,20 @@ class DirectMatchTestCase(lsst.utils.tests.TestCase):

def setUp(self):
np.random.seed(12345)
self.butler = Butler(RefCatDir)
refObjLoader = LoadIndexedReferenceObjectsTask(butler=self.butler)
filenames = sorted(glob.glob(os.path.join(RefCatDir, 'ref_cats', 'cal_ref_cat', '??????.fits')))
self.refObjLoader = MockReferenceObjectLoaderFromFiles(filenames, htmLevel=8)
center = lsst.geom.SpherePoint(215.5, 53.0, lsst.geom.degrees)
radius = 0.5*lsst.geom.degrees
self.filter = "r"
self.references = refObjLoader.loadSkyCircle(center, radius, self.filter).refCat
self.references = self.refObjLoader.loadSkyCircle(center, radius, self.filter).refCat

def tearDown(self):
del self.butler
del self.refObjLoader
del self.references

def checkMatching(self, catalog):
config = lsst.meas.astrom.DirectMatchConfig()
config.refObjLoader.retarget(LoadIndexedReferenceObjectsTask)
task = lsst.meas.astrom.DirectMatchTask(config=config, butler=self.butler)
task = lsst.meas.astrom.DirectMatchTask(config=config, refObjLoader=self.refObjLoader)
results = task.run(catalog, self.filter)

self.assertEqual(len(results.matches), len(catalog))
Expand Down
8 changes: 4 additions & 4 deletions tests/test_joinMatchListWithCatalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
import os
import unittest
import logging
import glob

import lsst.geom
from lsst.afw.image import ExposureF
from lsst.afw.table import packMatches, SourceCatalog
import lsst.utils.tests
from lsst.daf.persistence import Butler
from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
from lsst.meas.algorithms.testUtils import MockReferenceObjectLoaderFromFiles
from lsst.meas.astrom import AstrometryTask


Expand All @@ -55,8 +55,8 @@ def setUp(self):

logLevel = logging.INFO
refCatDir = os.path.join(testDir, "data", "sdssrefcat")
butler = Butler(refCatDir)
refObjLoader = LoadIndexedReferenceObjectsTask(butler=butler)
filenames = sorted(glob.glob(os.path.join(refCatDir, 'ref_cats', 'cal_ref_cat', '??????.fits')))
refObjLoader = MockReferenceObjectLoaderFromFiles(filenames, htmLevel=8)
astrometryConfig = AstrometryTask.ConfigClass()
self.astrom = AstrometryTask(config=astrometryConfig, refObjLoader=refObjLoader)
self.astrom.log.setLevel(logLevel)
Expand Down