emu_cosmo

igmhub · Nov 22, 2024 · ba12de5 · ba12de5
1 parent 5bd0812
commit ba12de5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 23 deletions.
diff --git a/data/sim_suites/post_768/mpg_emu_cosmo.npy b/data/sim_suites/post_768/mpg_emu_cosmo.npy
diff --git a/lace/archive/gadget_archive.py b/lace/archive/gadget_archive.py
@@ -310,29 +310,42 @@ def _get_emu_cosmo(self, sim_label, force_recompute_linP_params=False):
             compute_linP_params = True
         else:
             # open file with precomputed values to check kp_Mpc
+            fname = self.fulldir + "mpg_emu_cosmo.npy"
             try:
-                file_cosmo = np.load(
-                    self.fulldir + "mpg_emu_cosmo.npy", allow_pickle=True
-                )
+                file_cosmo = np.load(fname, allow_pickle=True).item()
             except:
-                raise IOError("The file " + file_cosmo + " does not exist")
-
-            for ii in range(len(file_cosmo)):
-                if file_cosmo[ii]["sim_label"] == sim_label:
-                    # if kp_Mpc not defined, use precomputed value
-                    if self.kp_Mpc is None:
-                        self.kp_Mpc = file_cosmo[ii]["linP_params"]["kp_Mpc"]
-
-                    # if kp_Mpc different from precomputed value, compute
-                    if self.kp_Mpc != file_cosmo[ii]["linP_params"]["kp_Mpc"]:
-                        if self.verbose:
-                            print("Recomputing kp_Mpc at " + str(self.kp_Mpc))
-                        compute_linP_params = True
-                    else:
-                        cosmo_params = file_cosmo[ii]["cosmo_params"]
-                        linP_params = file_cosmo[ii]["linP_params"]
-                        star_params = file_cosmo[ii]["star_params"]
-                    break
+                raise IOError("The file " + fname + " does not exist")
+
+            if sim_label not in file_cosmo:
+                file_error = (
+                    "The file "
+                    + fname
+                    + " does not contain "
+                    + sim_label
+                    + ". To speed up calculations, "
+                    + " you can recompute the file by running "
+                    + "lace/scripts/developers/compute_nyx_emu_cosmo.py"
+                )
+                if self.verbose:
+                    print(file_error)
+                compute_linP_params = True
+            else:
+                # if kp_Mpc not defined, use precomputed value
+                if self.kp_Mpc is None:
+                    self.kp_Mpc = file_cosmo[sim_label]["linP_params"]["kp_Mpc"]
+
+                # if kp_Mpc different from precomputed value, compute
+                if (
+                    self.kp_Mpc
+                    != file_cosmo[sim_label]["linP_params"]["kp_Mpc"]
+                ):
+                    if self.verbose:
+                        print("Recomputing kp_Mpc at " + str(self.kp_Mpc))
+                    compute_linP_params = True
+                else:
+                    cosmo_params = file_cosmo[sim_label]["cosmo_params"]
+                    linP_params = file_cosmo[sim_label]["linP_params"]
+                    star_params = file_cosmo[sim_label]["star_params"]
 
         if compute_linP_params == True:
             # this is the only place you actually need CAMB

diff --git a/lace/archive/nyx_archive.py b/lace/archive/nyx_archive.py
@@ -210,8 +210,8 @@ def _get_emu_cosmo(
             # open file with precomputed values to check kp_Mpc
             try:
                 file_cosmo = np.load(self.file_cosmo, allow_pickle=True).item()
-            except Exception as e:
-                raise e
+            except:
+                raise IOError("The file " + file_cosmo + " does not exist")
 
             if isim not in file_cosmo:
                 file_error = (