Add mass to name

csiborgtools/read/paths.py

@@ -462,7 +462,7 @@ class Paths:
         fname = f"out_{str(nsim).zfill(5)}_{str(nsnap).zfill(5)}.npy"
         return join(fdir, fname)
 
-    def overlap(self, simname, nsim0, nsimx, smoothed):
+    def overlap(self, simname, nsim0, nsimx, min_logmass, smoothed):
         """
         Path to the overlap files between two CSiBORG simulations.
 
@@ -474,6 +474,8 @@ class Paths:
             IC realisation index of the first simulation.
         nsimx : int
             IC realisation index of the second simulation.
+        min_logmass : float
+            Minimum log mass of halos to consider.
         smoothed : bool
             Whether the overlap is smoothed or not.
 
@@ -490,7 +492,11 @@ class Paths:
 
         try_create_directory(fdir)
 
-        fname = f"overlap_{str(nsim0).zfill(5)}_{str(nsimx).zfill(5)}.npz"
+        nsim0 = str(nsim0).zfill(5)
+        nsimx = str(nsimx).zfill(5)
+        min_logmass = float('%.4g' % min_logmass)
+
+        fname = f"overlap_{nsim0}_{nsimx}_{min_logmass}.npz"
         if smoothed:
             fname = fname.replace("overlap", "overlap_smoothed")
         return join(fdir, fname)

scripts/match_all.py

@@ -53,7 +53,7 @@ def get_combs(simname):
     return combs
 
 
-def main(comb, simname, sigma, verbose):
+def main(comb, simname, min_logmass, sigma, verbose):
     """
     Match a pair of simulations.
 
@@ -63,6 +63,8 @@ def main(comb, simname, sigma, verbose):
         Pair of simulation IC indices.
     simname : str
         Simulation name.
+    min_logmass : float
+        Minimum log halo mass.
     sigma : float
         Smoothing scale in number of grid cells.
     verbose : bool
@@ -73,13 +75,15 @@ def main(comb, simname, sigma, verbose):
     None
     """
     nsim0, nsimx = comb
-    pair_match(nsim0, nsimx, simname, sigma, verbose)
+    pair_match(nsim0, nsimx, simname, min_logmass, sigma, verbose)
 
 
 if __name__ == "__main__":
     parser = ArgumentParser()
-    parser.add_argument("--simname", type=str, help="Simulation name.",
+    parser.add_argument("--simname", type=str, required=True,
-                        choices=["csiborg", "quijote"])
+                        help="Simulation name.", choices=["csiborg", "quijote"])
+    parser.add_argument("--min_logmass", type=float, required=True,
+                        help="Minimum log halo mass.")
     parser.add_argument("--sigma", type=float, default=0,
                         help="Smoothing scale in number of grid cells.")
     parser.add_argument("--verbose", type=lambda x: bool(strtobool(x)),
@@ -89,7 +93,7 @@ if __name__ == "__main__":
     combs = get_combs()
 
     def _main(comb):
-        main(comb, args.simname, args.sigma, args.verbose)
+        main(comb, args.simname, args.min_logmass, args.sigma, args.verbose)
 
     work_delegation(_main, combs, MPI.COMM_WORLD)
 

scripts/match_singlematch.py

@@ -13,10 +13,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 """
 A script to calculate overlap between two IC realisations of the same
-simulation. The matching is performed for haloes whose total particles mass is
+simulation.
-    - CSiBORG: > 1e13 Msun/h,
-    - Quijote: > 1e14 Msun/h,
-since Quijote has much lower resolution than CSiBORG.
 """
 from argparse import ArgumentParser
 from copy import deepcopy
@@ -35,7 +32,7 @@ except ModuleNotFoundError:
     import csiborgtools
 
 
-def pair_match(nsim0, nsimx, simname, sigma, verbose):
+def pair_match(nsim0, nsimx, simname, min_logmass, sigma, verbose):
     """
     Calculate overlaps between two simulations.
 
@@ -47,6 +44,8 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
         The cross simulation IC index.
     simname : str
         Simulation name.
+    min_logmass : float
+        Minimum log halo mass.
     sigma : float
         Smoothing scale in number of grid cells.
     verbose : bool
@@ -62,7 +61,7 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
     if simname == "csiborg":
         overlapper_kwargs = {"box_size": 2048, "bckg_halfsize": 512}
         mass_kind = "fof_totpartmass"
-        bounds = {"dist": (0, 155), mass_kind: (10**13.25, None)}
+        bounds = {"dist": (0, 155), mass_kind: (10**min_logmass, None)}
 
         cat0 = csiborgtools.read.CSiBORGHaloCatalogue(
             nsim0, paths, bounds=bounds, load_fitted=False,
@@ -73,7 +72,7 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
     elif simname == "quijote":
         overlapper_kwargs = {"box_size": 512, "bckg_halfsize": 256}
         mass_kind = "group_mass"
-        bounds = {mass_kind: (10**13.25, None)}
+        bounds = {mass_kind: (10**min_logmass, None)}
 
         cat0 = csiborgtools.read.QuijoteHaloCatalogue(
             nsim0, paths, 4, bounds=bounds, load_fitted=False,
@@ -120,7 +119,7 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
         for j, match in enumerate(matches):
             match_hids[i][j] = catx["index"][match]
 
-    fout = paths.overlap(simname, nsim0, nsimx, smoothed=False)
+    fout = paths.overlap(simname, nsim0, nsimx, min_logmass, smoothed=False)
     if verbose:
         print(f"{datetime.now()}: saving to ... `{fout}`.", flush=True)
     numpy.savez(fout, ref_hids=cat0["index"], match_hids=match_hids,
@@ -139,7 +138,7 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
                                               match_indxs, smooth_kwargs,
                                               verbose=verbose)
 
-    fout = paths.overlap(simname, nsim0, nsimx, smoothed=True)
+    fout = paths.overlap(simname, nsim0, nsimx, min_logmass, smoothed=True)
     if verbose:
         print(f"{datetime.now()}: saving to ... `{fout}`.", flush=True)
     numpy.savez(fout, smoothed_overlap=smoothed_overlap, sigma=sigma)
@@ -147,15 +146,19 @@ def pair_match(nsim0, nsimx, simname, sigma, verbose):
 
 if __name__ == "__main__":
     parser = ArgumentParser()
-    parser.add_argument("--nsim0", type=int,
+    parser.add_argument("--nsim0", type=int, required=True,
                         help="Reference simulation IC index.")
-    parser.add_argument("--nsimx", type=int,
+    parser.add_argument("--nsimx", type=int, required=True,
                         help="Cross simulation IC index.")
-    parser.add_argument("--simname", type=str, help="Simulation name.")
+    parser.add_argument("--simname", type=str, required=True,
+                        help="Simulation name.")
+    parser.add_argument("--min_logmass", type=float, required=True,
+                        help="Minimum log halo mass.")
     parser.add_argument("--sigma", type=float, default=0,
                         help="Smoothing scale in number of grid cells.")
     parser.add_argument("--verbose", type=lambda x: bool(strtobool(x)),
                         default=False, help="Verbosity flag.")
     args = parser.parse_args()
 
-    pair_match(args.nsim0, args.nsimx, args.simname, args.sigma, args.verbose)
+    pair_match(args.nsim0, args.nsimx, args.simname, args.min_logmass,
+               args.sigma, args.verbose)