better API error message, fix wrong catmatch cache file

desy-multimessenger · May 15, 2023 · 21e1a2b · 21e1a2b
1 parent 3e74f26
commit 21e1a2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/nuztf/ampel_api.py b/nuztf/ampel_api.py
@@ -636,8 +636,14 @@ def ampel_api_catalog(
     https://ampel.zeuthen.desy.de/api/catalogmatch/catalogs
 
     """
-    assert catalog_type in ["extcats", "catsHTM"]
-    assert search_type in ["all", "nearest"]
+    if not catalog_type in ["extcats", "catsHTM"]:
+        raise ValueError(
+            f"Expected parameter catalog_type in ['extcats', 'catsHTM'], got {catalog_type}"
+        )
+    if not search_type in ["all", "nearest"]:
+        raise ValueError(
+            f"Expected parameter catalog_type in ['all', 'nearest'], got {search_type}"
+        )
 
     if logger is None:
         logger = logging.getLogger(__name__)

diff --git a/nuztf/base_scanner.py b/nuztf/base_scanner.py
@@ -666,7 +666,7 @@ def peak_mag_summary(self):
             if tns_name:
                 tns_result = f"({tns_name})"
 
-            cache_file = Path(self.cache_dir) / f"{name}_catchmatch.json"
+            cache_file = Path(self.cache_dir) / f"{name}_catmatch.json"
             xmatch_info = get_cross_match_info(
                 raw=res, cache_file=cache_file, logger=self.logger
             )