cleaned up reading of RA/dec for sky header keys

Author: ymamay

python/lvmdrp/core/sky.py

@@ -252,28 +252,13 @@ def sky_pars_header(header):
 
     """
 
-    # extract useful header information
-    try:
-        sci_ra, sci_dec = header["SCIRA"], header["SCIDEC"]
-    except Exception: 
-        try:
-            sci_ra, sci_dec = header["TESCIRA"], header["TESCIDE"]
-        except Exception:
-            sci_ra, sci_dec = np.nan, np.nan
-    try:
-        skye_ra, skye_dec = header["SKYERA"], header["SKYEDEC"]
-    except Exception: 
-        try:
-            skye_ra, skye_dec = header["TESKYERA"], header["TESKYEDE"]
-        except Exception:
-            skye_ra, skye_dec = np.nan, np.nan
-    try:
-        skyw_ra, skyw_dec = header["SKYWRA"], header["SKYWDEC"]
-    except Exception: 
-        try:
-            skyw_ra, skyw_dec = header["TESKYWRA"], header["TESKYWDE"]
-        except Exception:
-            skyw_ra, skyw_dec = np.nan, np.nan
+    # extract useful header information,
+    sci_ra = header.get("SCIRA", header.get("TESCIRA", np.nan)) 
+    sci_dec = header.get("SCIDEC", header.get("TESCIDE", np.nan))
+    skye_ra = header.get("SKYERA", header.get("TESKYERA", np.nan)) 
+    skye_dec = header.get("SKYEDEC", header.get("TESKYEDE", np.nan))
+    skyw_ra = header.get("SKYWRA", header.get("TESKYWRA", np.nan)) 
+    skyw_dec = header.get("SKYWDEC", header.get("TESKYWDE", np.nan))    
 
     obstime = Time(header["OBSTIME"])
 
@@ -838,10 +823,8 @@ def get_telescope_shadowheight(header, telescope):
     if telescope not in {"SKYE", "SKYW", "SCI", "SPEC"}:
         raise ValueError(f"invalid value for 'telescope' parameter: '{telescope}', valid values are 'SKYE', 'SKYW', 'SCI', or 'SPEC'")
 
-    try:
-        ra, dec = header[f"{telescope}RA"], header[f"{telescope}DEC"]
-    except Exception:
-        ra, dec = header[f"TE{telescope}RA"], header[f"TE{telescope}DE"]
+    ra = header.get(f"{telescope}RA", header.get(f"TE{telescope}RA", np.nan))
+    dec = header.get(f"{telescope}DEC", header.get(f"TE{telescope}DE", np.nan))
 
     time = Time(header["OBSTIME"],format='isot', scale='utc')
     jd = time.jd