Skip to content

Commit

Permalink
Merge pull request #7 from observatorycontrolsystem/fix_wcs_calc
Browse files Browse the repository at this point in the history
fix check for header values for wcs calculation and add a test
  • Loading branch information
jnation3406 authored Feb 22, 2022
2 parents 1753fe8 + f4e5da0 commit 264142c
Show file tree
Hide file tree
Showing 4 changed files with 47,228 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.2.8
2022-02-22

Fix wcs calculation for files with missing wcs headers

0.2.7
2022-02-15

Expand Down
2 changes: 1 addition & 1 deletion ocs_archive/input/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def get_wcs_corners(self):
It will search for the standard header keys to build a polygon fov.
"""
headers = self.header_data.get_headers()
if settings.RADIUS_KEY in headers and settings.RA_KEY in headers and settings.DEC_KEY in headers:
if self.header_data.headers_are_set([settings.RADIUS_KEY, settings.RA_KEY, settings.DEC_KEY]):
ra = headers[settings.RA_KEY]
dec = headers[settings.DEC_KEY]
r = headers[settings.RADIUS_KEY]
Expand Down
7 changes: 7 additions & 0 deletions tests/test_datafiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@ def test_500_error_fallback_to_environment_variable(self):
header_data = data_file.get_header_data()
self.assertEqual(header_data.get_public_date(), header_data.get_observation_date())

def test_get_wcs_corners_with_malformed_headers(self):
with open(os.path.join(FITS_PATH, 'elpnrs02-fa17-20220219-0039-b00.fits.fz'), 'rb') as fp:
b00_file = File(fp, 'elpnrs02-fa17-20220219-0039-b00.fits.fz')
data_file = LcoFitsFile(b00_file)
wcs = data_file.get_wcs_corners()
self.assertIsNone(wcs)

def test_get_wcs_corners_from_dict_for_ccd(self):
headers = {'CD1_1': 6, 'CD1_2': 2, 'CD2_1': 3, 'CD2_2': 4, 'NAXIS1': 1000, 'NAXIS2': 1100, 'DATE-OBS': '2015-02-19T13:56:05.261'}
data_file = DataFile(self.file, file_metadata=headers, required_headers=[])
Expand Down
Loading

0 comments on commit 264142c

Please sign in to comment.