A few bugfixes

nrcatalogtools/catalog.py

@@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs) -> None:
     def simulations_list(self):
         return list(self.simulations)
 
-    def get(self, sim_name):
+    def get(self, sim_name, **kwargs):
         """Retrieve waveform modes for this simulation
 
         Args:
@@ -63,9 +63,9 @@ def get(self, sim_name):
                     f"..As data does not exist in cache:"
                     f"  (in {filepath}),\n"
                     f"..we will now download it from"
-                    " {}".format(self.waveform_url_from_simname(sim_name))
+                    " {}".format(self.waveform_url_from_simname(sim_name, **kwargs))
                 )
-            self.download_waveform_data(sim_name)
+            self.download_waveform_data(sim_name, **kwargs)
         metadata = self.get_metadata(sim_name)
         if type(metadata) is not dict and hasattr(metadata, "to_dict"):
             metadata = metadata.to_dict()

nrcatalogtools/utils.py

@@ -27,18 +27,29 @@
 rit_catalog_info["url"] = "https://ccrgpages.rit.edu/~RITCatalog/"
 rit_catalog_info["metadata_url"] = rit_catalog_info["url"] + "/Metadata/"
 rit_catalog_info["data_url"] = rit_catalog_info["url"] + "/Data/"
-rit_catalog_info["possible_resolutions"] = [100, 120, 88, 118, 130, 140, 144, 160, 200]
+rit_catalog_info["possible_resolutions"] = [
+    100,
+    120,
+    88,
+    84,
+    118,
+    130,
+    140,
+    144,
+    160,
+    200,
+]
 rit_catalog_info["metadata_file_fmts"] = [
-    "RIT:BBH:{:04d}-n{:3d}-id{:d}_Metadata.txt",
-    "RIT:eBBH:{:04d}-n{:3d}-ecc_Metadata.txt",
+    "RIT:BBH:{:04d}-n{:03d}-id{:d}_Metadata.txt",
+    "RIT:eBBH:{:04d}-n{:03d}-ecc_Metadata.txt",
 ]
 rit_catalog_info["waveform_file_fmts"] = [
-    "ExtrapStrain_RIT-BBH-{:04d}-n{:3d}.h5",
-    "ExtrapStrain_RIT-eBBH-{:04d}-n{:3d}.h5",
+    "ExtrapStrain_RIT-BBH-{:04d}-n{:03d}.h5",
+    "ExtrapStrain_RIT-eBBH-{:04d}-n{:03d}.h5",
 ]
 rit_catalog_info["psi4_file_fmts"] = [
-    "ExtrapPsi4_RIT-BBH-{:04d}-n{:3d}-id{:d}.tar.gz",
-    "ExtrapPsi4_RIT-eBBH-{:04d}-n{:3d}-ecc.tar.gz",
+    "ExtrapPsi4_RIT-BBH-{:04d}-n{:03d}-id{:d}.tar.gz",
+    "ExtrapPsi4_RIT-eBBH-{:04d}-n{:03d}-ecc.tar.gz",
 ]
 rit_catalog_info["max_id_val"] = 6
 

nrcatalogtools/waveform.py

@@ -131,10 +131,21 @@ def load_from_h5(cls, file_path_or_open_file, metadata={}, verbosity=0):
                 pfmt = f"phase_l{ell}_m{em}"
                 if afmt not in h5_file or pfmt not in h5_file:
                     continue
-                amp_time = h5_file[afmt]["X"][:]
-                amp = h5_file[afmt]["Y"][:]
-                phase_time = h5_file[pfmt]["X"][:]
-                phase = h5_file[pfmt]["Y"][:]
+
+                try:
+                    amp_time = h5_file[afmt]["X"][:]
+                    amp = h5_file[afmt]["Y"][:]
+                    phase_time = h5_file[pfmt]["X"][:]
+                    phase = h5_file[pfmt]["Y"][:]
+                except KeyError:
+                    # Some RIT files have empty modes stored (*sigh*)
+                    # Skip these modes, and print a warning
+                    if verbosity > 0:
+                        print(
+                            f"Skipping mode l={ell}, m={em} for {file_path_or_open_file} "
+                            "since columns 'X' and 'Y' not found"
+                        )
+                    continue
                 mode_data[(ell, em)] = [amp_time, amp, phase_time, phase]
                 # get the minimum time and maximum time stamps for all modes
                 t_min = max(t_min, amp_time[0], phase_time[0])