Skip to content

Commit

Permalink
Update test chi2 values now that PM values are applied internally
Browse files Browse the repository at this point in the history
  • Loading branch information
parejkoj committed Jun 11, 2021
1 parent 8c672c0 commit 5624b44
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
22 changes: 11 additions & 11 deletions tests/test_jointcal_cfht.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def test_jointcalTask_2_visits(self):
'selected_photometry_fittedStars': 2232,
'selected_astrometry_ccdImages': 12,
'selected_photometry_ccdImages': 12,
'astrometry_final_chi2': 1159.736,
'astrometry_final_ndof': 1872,
'astrometry_final_chi2': 1145.457,
'astrometry_final_ndof': 1868,
'photometry_final_chi2': 11624.3,
'photometry_final_ndof': 2778
}
Expand Down Expand Up @@ -137,8 +137,8 @@ def setup_jointcalTask_2_visits_constrainedAstrometry(self):
'associated_astrometry_fittedStars': 2272,
'selected_astrometry_fittedStars': 1229,
'selected_astrometry_ccdImages': 12,
'astrometry_final_chi2': 1144.88,
'astrometry_final_ndof': 1918,
'astrometry_final_chi2': 1100.75,
'astrometry_final_ndof': 1910,
}

return dist_rms_relative, metrics
Expand All @@ -158,7 +158,7 @@ def test_jointcalTask_2_visits_constrainedAstrometry_no_rank_update(self):
"""Demonstrate that skipping the rank update doesn't substantially affect astrometry.
"""
relative_error, metrics = self.setup_jointcalTask_2_visits_constrainedAstrometry()
metrics['astrometry_final_chi2'] = 1069.348
metrics['astrometry_final_chi2'] = 1069.538
metrics['astrometry_final_ndof'] = 1644

self.config.astrometryDoRankUpdate = False
Expand All @@ -171,8 +171,8 @@ def test_jointcalTask_2_visits_constrainedAstrometry_4sigma_outliers(self):
"""
dist_rms_relative, metrics = self.setup_jointcalTask_2_visits_constrainedAstrometry()
self.config.outlierRejectSigma = 4
metrics['astrometry_final_chi2'] = 772.409
metrics['astrometry_final_ndof'] = 1744
metrics['astrometry_final_chi2'] = 800.919
metrics['astrometry_final_ndof'] = 1796

self._testJointcalTask(2, dist_rms_relative, self.dist_rms_absolute, None, metrics=metrics)

Expand All @@ -183,8 +183,8 @@ def test_jointcalTask_2_visits_constrainedAstrometry_astrometryOutlierRelativeTo
"""
dist_rms_relative, metrics = self.setup_jointcalTask_2_visits_constrainedAstrometry()
self.config.astrometryOutlierRelativeTolerance = 0.01
metrics['astrometry_final_chi2'] = 1400.84
metrics['astrometry_final_ndof'] = 1986
metrics['astrometry_final_chi2'] = 1393.40
metrics['astrometry_final_ndof'] = 1982

self._testJointcalTask(2, dist_rms_relative, self.dist_rms_absolute, None, metrics=metrics)

Expand All @@ -194,8 +194,8 @@ def test_jointcalTask_2_visits_constrainedAstrometry_astrometryReferenceUncertai
test_config = os.path.join(lsst.utils.getPackageDir('jointcal'),
'tests/config/astrometryReferenceErr-config.py')
self.configfiles.append(test_config)
metrics['astrometry_final_chi2'] = 1275.70
metrics['astrometry_final_ndof'] = 2062
metrics['astrometry_final_chi2'] = 1303.55
metrics['astrometry_final_ndof'] = 2068

self._testJointcalTask(2, dist_rms_relative, self.dist_rms_absolute, None, metrics=metrics)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_jointcal_decam.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def test_jointcalTask_2_visits(self):
'selected_photometry_fittedStars': 4637,
'selected_astrometry_ccdImages': 15,
'selected_photometry_ccdImages': 15,
'astrometry_final_chi2': 2899.14,
'astrometry_final_chi2': 2899.20,
'astrometry_final_ndof': 896,
'photometry_final_chi2': 16529,
'photometry_final_ndof': 3634,
Expand Down
6 changes: 3 additions & 3 deletions tests/test_jointcal_hsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ def test_jointcalTask_10_visits_simple_astrometry_no_photometry(self):
'associated_astrometry_fittedStars': 5860,
'selected_astrometry_fittedStars': 3568,
'selected_astrometry_ccdImages': 30,
'astrometry_final_chi2': 10218.518,
'astrometry_final_ndof': 18574,
'astrometry_final_chi2': 10225.31,
'astrometry_final_ndof': 18576,
}
self._testJointcalTask(10, dist_rms_relative, dist_rms_absolute, pa1, metrics=metrics)

Expand Down Expand Up @@ -299,7 +299,7 @@ def test_jointcalTask_3_visits_simple_astrometry_no_photometry_min_measurements_
'associated_astrometry_fittedStars': 3199,
'selected_astrometry_fittedStars': 432,
'selected_astrometry_ccdImages': 9,
'astrometry_final_chi2': 567.443,
'astrometry_final_chi2': 567.433,
'astrometry_final_ndof': 1286,
}
pa1 = None
Expand Down

0 comments on commit 5624b44

Please sign in to comment.