updated sky keywords for DRPall, still needs testing

sdss · Sep 11, 2024 · 823032c · 823032c
1 parent 5d3e90f
commit 823032c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/python/lvmdrp/utils/metadata.py b/python/lvmdrp/utils/metadata.py
@@ -1433,18 +1433,21 @@ def _collect_header_data(filename: str) -> dict:
                         # sci
                         'sci_ra': 'TESCIRA', 'sci_dec': 'TESCIDE', 'sci_amass': 'TESCIAM',
                         'sci_kmpos': 'TESCIKM', 'sci_focpos': 'TESCIFO',
-                        'sci_geoshadow_hgt':'GEOCORONAL SCI SHADOW_HEIGHT',
-                        'sci_moon_alt': 'SKYMODEL SCI ALT', 'sci_moon_rho': 'SKYMODEL SCI RHO',
                         # skye
                         'skye_ra': 'TESKYERA', 'skye_dec': 'TESKYEDE', 'skye_amass': 'TESKYEAM',
                         'skye_kmpos': 'TESKYEKM', 'skye_focpos': 'TESKYEFO', 'skye_name': 'SKYENAME',
-                        'skye_geoshadow_hgt':'GEOCORONAL SKYE SHADOW_HEIGHT',
-                        'skye_moon_alt': 'SKYMODEL SKYE ALT', 'skye_moon_rho': 'SKYMODEL SKYE RHO',
                         # skyw
                         'skyw_ra': 'TESKYWRA', 'skyw_dec': 'TESKYWDE', 'skyw_amass': 'TESKYWAM',
                         'skyw_kmpos': 'TESKYWKM', 'skyw_focpos': 'TESKYWFO', 'skyw_name': 'SKYWNAME',
-                        'skyw_geoshadow_hgt':'GEOCORONAL SKYW SHADOW_HEIGHT',
-                        'skyw_moon_alt': 'SKYMODEL SKYW ALT', 'skyw_moon_rho': 'SKYMODEL SKYW RHO'
+                        # sky parameters
+                        'sci_sh_hght': 'GEOCORONAL SCI_SH_HGHT', 
+                        'skye_sh_hght': 'GEOCORONAL SKYE_SH_HGHT',
+                        'skyw_sh_hght': 'GEOCORONAL SKYW_SH_HGHT',
+                        'moon_ra': 'SKYMODEL MOON_RA', 'moon_dec': 'SKYMODEL MOON_DEC',
+                        'moon_phase': 'SKYMODEL MOON_PHASE', 'moon_fli': 'SKYMODEL MOON_FLI',
+                        'sun_alt': 'SKYMODEL SUNALT', 'moon_alt': 'SKYMODEL MOONALT',
+                        'sci_moon_sep': 'SKYMODEL SCI_RHO', 'skye_moon_sep': 'SKYMODEL SKYE_RHO',
+                        'skyw_moon_sep': 'SKYMODEL SKYW_RHO'
                         }
 
     with fits.open(filename) as hdulist:
@@ -1508,7 +1511,7 @@ def update_summary_file(filename: str, tileid: int = None, mjd: int = None, expn
     # explicitly set some column dtypes to try and handle cases with null data
     # sci, skye, skye keys
     tels = {'sci', 'skye', 'skyw'}
-    keys = {'ra', 'dec', 'amass', 'kmpos', 'focpos', 'geoshadow_hgt', 'moon_alt', 'moon_rho'}
+    keys = {'ra', 'dec', 'amass', 'kmpos', 'focpos'}
     dtypes = {f'{i}_{j}': 'float64' for i, j in itertools.product(tels, keys)}
     dtypes['calib_mjd'] = 'int64'
     df = df.astype(dtypes)