I'm dumb, this can be so much simpler

Author: TomWagg

cogsworth/pop.py

@@ -1167,7 +1167,6 @@ def save(self, file_name, overwrite=False):
         self.kick_info.to_hdf(file_name, key="kick_info")
 
         with h5.File(file_name, "a") as f:
-            f.attrs["has_pop"] = True
             f.attrs["potential_dict"] = yaml.dump(potential_to_dict(self.galactic_potential),
                                                   default_flow_style=None)
         self.initial_galaxy.save(file_name, key="initial_galaxy")
@@ -1232,7 +1231,7 @@ def load(file_name):
 
     BSE_settings = {}
     with h5.File(file_name, "r") as file:
-        if "has_pop" not in file.attrs or not file.attrs["has_pop"]:
+        if "numeric_params" not in file.keys():
             raise ValueError((f"{file_name} is not a Population file, "
                              "perhaps you meant to use `cogsworth.sfh.load`?"))
         numeric_params = file["numeric_params"][...]

cogsworth/sfh.py

@@ -398,7 +398,6 @@ def save(self, file_name, key="sfh"):
 
         # dump it all into the file attrs using yaml
         with h5.File(file_name, "a") as file:
-            file.attrs["has_sfh"] = True
             file[key].attrs["params"] = yaml.dump(params, default_flow_style=None)
 
 
@@ -966,9 +965,8 @@ def load(file_name, key="sfh"):
 
     # load the parameters back in using yaml
     with h5.File(file_name, "r") as file:
-        if "has_sfh" not in file.attrs or not file.attrs["has_sfh"]:
-            raise ValueError((f"{file_name} is not a SFH file, "
-                             "perhaps you meant to use `cogsworth.pop.load`?"))
+        if key not in file.keys():
+            raise ValueError((f"Can't find a saved SFH in {file_name} under the key {key}."))
         params = yaml.load(file[key].attrs["params"], Loader=yaml.Loader)
 
     # get the current module, get a class using the name, delete it from parameters that will be passed