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.

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

DM-25849: Update HSC to use jointcal refcat defaults #164

Merged
merged 1 commit into from
Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions tests/config/hsc-config.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
# no colorterms in tests unless specifically requested (this overrides the default HSC config)
config.applyColorTerms = False

# Use Gaia-DR2 for astrometry (override HSC jointcal defaults, which are PS1 for both)
config.astrometryRefObjLoader.ref_dataset_name = "gaia_dr2_20200414"
config.astrometryRefObjLoader.filterMap = {}
config.astrometryRefObjLoader.anyFilterMapsToThis = 'phot_g_mean'
config.astrometryReferenceErr = None
29 changes: 0 additions & 29 deletions tests/test_jointcal_hsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,35 +272,6 @@ def test_jointcalTask_3_visits_simple_astrometry_no_photometry_min_measurements_
pa1 = None
self._testJointcalTask(3, dist_rms_relative, dist_rms_absolute, pa1, metrics=metrics)

def test_overrides_jointcalTask_2_visits_simple(self):
"""DM-25194: this test is to check the HSC jointcal overrides.
"""
self.config = lsst.jointcal.jointcal.JointcalConfig()
self.config.astrometryModel = "simple"
self.config.photometryModel = "simpleFlux"
self.configfiles = []

# NOTE: the numbers here are different from those in
# `test_jointcalTask_2_visits_simple` because the HSC photometry
# overrides provide colorterms, while `tests/config/hsc-config.py`
# does not.
metrics = {'collected_astrometry_refStars': 6521,
'collected_photometry_refStars': 6478,
'selected_astrometry_refStars': 1610,
'selected_photometry_refStars': 1609,
'associated_astrometry_fittedStars': 2070,
'associated_photometry_fittedStars': 2070,
'selected_astrometry_fittedStars': 1731,
'selected_photometry_fittedStars': 1731,
'selected_astrometry_ccdImages': 6,
'selected_photometry_ccdImages': 6,
'astrometry_final_chi2': 66951,
'astrometry_final_ndof': 4480,
'photometry_final_chi2': 4977.20,
'photometry_final_ndof': 2188
}
self._testJointcalTask(2, None, None, None, metrics=metrics)


class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass
Expand Down