fixed fake data for metadata test

sdss · Sep 13, 2024 · a2022f7 · a2022f7
1 parent 70dd086
commit a2022f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -194,16 +194,17 @@ def create_fake_frame_fits(path, kind='S', tileid=11111, mjd=61234, expnum=6817,
            'OBSTIME': '2023-12-19T00:47:39.095', 'OBSERVAT': 'LCO', 'DRPVER': '0.1.1',
            'TELESCOP': 'SDSS 0.16m', 'SURVEY': 'LVM', 'DPOS': 0, 'DRPQUAL': 0,
            'OBJECT': f'tile_id={tileid}', 'TESCIRA': 65.949555, 'TESCIDE': 15.348684, 'TESCIAM': 1.857,
-           'TESCIKM': -87.5, 'TESCIFO': 36.58, 'GEOCORONAL SCI SHADOW_HEIGHT': 18.62558009595602,
-           'SKYMODEL SCI ALT': 58.81053409834248, 'SKYMODEL SCI RHO': 29.809696190110667,
+           'TESCIKM': -87.5, 'TESCIFO': 36.58, 'GEOCORONAL SCI_SH_HGHT': 165.52885602, 'SKYMODEL SCI_RHO': 29.8097,
            'TESKYERA': 21.008216, 'TESKYEDE': -22.933382, 'TESKYEAM': 1.013, 'TESKYEKM': -37.5,
            'TESKYEFO': 36.19, 'SKYENAME': 'WHAM_south_02',
-           'GEOCORONAL SKYE SHADOW_HEIGHT': 18.6254096058375, 'SKYMODEL SKYE ALT': 54.040092684099854,
-           'SKYMODEL SKYE RHO': 18.470492013870395, 'TESKYWRA': 58.011871, 'TESKYWDE': 11.817184,
+           'GEOCORONAL SKYE_SH_HGHT': 64.79533, 
+           'SKYMODEL SKYE_RHO': 18.4705, 'TESKYWRA': 58.011871, 'TESKYWDE': 11.817184,
            'TESKYWAM': 1.555, 'TESKYWKM': -54.51, 'TESKYWFO': 37.11, 'SKYWNAME': 'grid087',
-           'GEOCORONAL SKYW SHADOW_HEIGHT': 18.625554151861895, 'SKYMODEL SKYW ALT': 58.150227082407184,
-           'SKYMODEL SKYW RHO': 27.797702786159235}
-
+           'GEOCORONAL SKYW_SH_HGHT': 165.41738, 'SKYMODEL SKYW_RHO': 27.7977, 
+           'SKYMODEL MOON_RA': 348.42157, 'SKYMODEL MOON_DEC': -7.55955, 
+           'SKYMODEL MOON_PHASE': 79.91, 'SKYMODEL MOON_FLI': 0.4136, 
+           'SKYMODEL MOONALT': 46.8744, 'SKYMODEL SUNALT': -13.3779}
+
     # create fake file
     prim = fits.PrimaryHDU(header=fits.Header(hdr))
     full = path / filename

diff --git a/tests/utils/test_metadata.py b/tests/utils/test_metadata.py
@@ -46,28 +46,17 @@ def test_collect_header_data(make_framefits):
     sframe = make_framefits(tileid=1054755, mjd=60297, expnum=9532)
     hdr_data = _collect_header_data(sframe)
 
+
     expdata = {'drpver': '0.1.1', 'drpqual': 0, 'dpos': 0, 'object': 'tile_id=1054755',
                'obstime': '2023-12-19T00:47:39.095', 'sci_ra': 65.949555, 'sci_dec': 15.348684,
                'sci_amass': 1.857, 'sci_kmpos': -87.5, 'sci_focpos': 36.58,
-               'sci_sh_hght': None,'sci_moon_sep': None, 'skye_ra': 21.008216, 'skye_dec': -22.933382,
+               'sci_sh_hght': 165.52885,'sci_moon_sep': 29.8097, 'skye_ra': 21.008216, 'skye_dec': -22.933382,
                'skye_amass': 1.013, 'skye_kmpos': -37.5, 'skye_focpos': 36.19,
-               'skye_name': 'WHAM_south_02', 'skye_sh_hght': None, 'skye_moon_sep': None,
+               'skye_name': 'WHAM_south_02', 'skye_sh_hght': 164.79533, 'skye_moon_sep': 18.4705,
                'skyw_ra': 58.011871, 'skyw_dec': 11.817184, 'skyw_amass': 1.555, 'skyw_kmpos': -54.51,
-               'skyw_focpos': 37.11, 'skyw_name': 'grid087', 'skyw_sh_hght': None,
-               'skyw_moon_sep': None, 'moon_ra': None, 'moon_dec': None,
-               'moon_phase': None, 'moon_fli': None, 'sun_alt': None, 'moon_alt': None}
-
-    # after skydev_issues110_77 is merged, the expeted values are below 
-    #expdata = {'drpver': '0.1.1', 'drpqual': 0, 'dpos': 0, 'object': 'tile_id=1054755',
-    #           'obstime': '2023-12-19T00:47:39.095', 'sci_ra': 65.949555, 'sci_dec': 15.348684,
-    #           'sci_amass': 1.857, 'sci_kmpos': -87.5, 'sci_focpos': 36.58,
-    #           'sci_sh_hght': 165.52885,'sci_moon_sep': 29.8097, 'skye_ra': 21.008216, 'skye_dec': -22.933382,
-    #           'skye_amass': 1.013, 'skye_kmpos': -37.5, 'skye_focpos': 36.19,
-    #           'skye_name': 'WHAM_south_02', 'skye_sh_hght': 164.79533, 'skye_moon_sep': 18.4705,
-    #           'skyw_ra': 58.011871, 'skyw_dec': 11.817184, 'skyw_amass': 1.555, 'skyw_kmpos': -54.51,
-    #           'skyw_focpos': 37.11, 'skyw_name': 'grid087', 'skyw_sh_hght': 165.41738,
-    #           'skyw_moon_sep': 27.7977, 'moon_ra': 348.42157, 'moon_dec': -7.55955,
-    #           'moon_phase': 79.91, 'moon_fli': 0.4136, 'sun_alt': -13.3779, 'moon_alt': 46.8744}
+               'skyw_focpos': 37.11, 'skyw_name': 'grid087', 'skyw_sh_hght': 165.41738,
+               'skyw_moon_sep': 27.7977, 'moon_ra': 348.42157, 'moon_dec': -7.55955,
+               'moon_phase': 79.91, 'moon_fli': 0.4136, 'sun_alt': -13.3779, 'moon_alt': 46.8744}
 
     assert hdr_data == expdata