Merge branch 'master' into CCD-1385

spacetelescope · Nov 13, 2023 · 4245823 · 4245823
2 parents 69370a7 + ba57aaf
commit 4245823
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,11 +1,20 @@
-11.17.9 (unreleased)
+11.17.10 (unreleased)
 ====================
 
 JWST
 ----
 - Added PIXAR_SR and PIXAR_A2 to miri photom tpn. [#1013]
 
 
+11.17.9 (2023-11-08)
+====================
+
+General
+-------
+
+- bugfix: get observatory metadata inside asdf file handler [#1012]
+
+
 11.17.8 (2023-11-07)
 ====================
 

diff --git a/crds/io/factory.py b/crds/io/factory.py
@@ -75,13 +75,12 @@ def get_observatory(filepath, original_name=None):
         except KeyError:
             pass
     elif original_name.endswith(".asdf"):
-        try:
-            import asdf
-            with asdf.open(filepath) as handle:
-                observatory = handle["meta"]["telescope"]
-        except KeyError:
+        import asdf
+        with asdf.open(filepath) as handle:
             if "roman" in handle.keys():
                 observatory = "roman"
+            else:
+                observatory = handle["meta"]["telescope"]
     elif original_name.endswith((".yaml", ".json", ".text", ".txt")):
         return "jwst"
     return observatory.lower()