Add more MANTICORE (#148)

* Add path to fields

* Add new Manticore field support

* Downsample Manticore to 20 snapshots

* Add manticore snapshot

* Remove downsampling

* Add Manticore

* Add names of manti

* Add manti

* Simplify

* Update script

* Update CF4 ICs

* Updaet LOS settings

* Update nb

* Update imports

* Reorganise funcs

* Update script

* Add basic void model

scripts/field_prop/field_bulk.py

@@ -54,6 +54,8 @@ def get_reader(simname, paths, nsim):
         kind = simname.split("_")[-1]
         reader = csiborgtools.read.CSiBORG2Snapshot(nsim, 99, kind, paths,
                                                     flip_xz=True)
+    elif simname == "manticore_2MPP_N128_DES_V1":
+        reader = csiborgtools.read.CSiBORG2XSnapshot(nsim)
     else:
         raise ValueError(f"Unknown simname: `{simname}`.")
 
@@ -72,7 +74,7 @@ def get_particles(reader, boxsize, get_velocity=True, verbose=True):
     if get_velocity:
         fprint("reading velocities.", verbose)
         vel = reader.velocities().astype(dtype)
-        vrad = np.sum(pos, vel, axis=1) / dist
+        vrad = np.sum(pos * vel, axis=1) / dist
 
     del pos
     collect()
@@ -282,14 +284,14 @@ if __name__ == "__main__":
     parser.add_argument("--simname", type=str, help="Simulation name.",
                         choices=["csiborg1", "csiborg2_main", "csiborg2_varysmall", "csiborg2_random",  # noqa
                                  "borg1", "borg2", "borg2_all", "csiborg2X", "Carrick2015",             # noqa
-                                 "Lilow2024", "CLONES", "CF4"])                                         # noqa
+                                 "Lilow2024", "CLONES", "CF4", "manticore_2MPP_N128_DES_V1"])           # noqa
     args = parser.parse_args()
 
     folder = "/mnt/extraspace/rstiskalek/csiborg_postprocessing/field_shells"
     if args.simname in ["csiborg2X", "Carrick2015", "Lilow2024",
                         "CLONES", "CF4"]:
         main_from_field(args, folder)
-    elif "csiborg" in args.simname:
+    elif "csiborg" in args.simname or args.simname == "manticore_2MPP_N128_DES_V1":  # noqa
         main_csiborg(args, folder)
     elif "borg" in args.simname:
         main_borg(args, folder)

scripts/field_prop/field_los.py

@@ -179,7 +179,9 @@ def get_field(simname, nsim, kind, MAS, grid):
         simkind = simname.split("_")[-1]
         field_reader = csiborgtools.read.CSiBORG2Field(nsim, simkind)
     elif simname == "csiborg2X":
-        field_reader = csiborgtools.read.CSiBORG2XField(nsim)
+        field_reader = csiborgtools.read.CSiBORG2XField(nsim, version=0)
+    elif simname == "manticore_2MPP_N128_DES_V1":
+        field_reader = csiborgtools.read.CSiBORG2XField(nsim, version=1)
     elif simname == "CLONES":
         field_reader = csiborgtools.read.CLONESField(nsim)
     elif simname == "Carrick2015":
@@ -429,10 +431,10 @@ if __name__ == "__main__":
 
     Om0 = csiborgtools.simname2Omega_m(args.simname)
     # r = make_spacing(200, 0.75, 23.25, 34, 0.01, Om0)
-    r = np.arange(0, 200, 0.75)
+    r = np.arange(0, 200, 0.5)
 
     # smooth_scales = [0, 2, 4, 6, 8]
-    smooth_scales = [0]
+    smooth_scales = [0, 8]
 
     print(f"Running catalogue {args.catalogue} for simulation {args.simname} "
           f"with {len(r)} radial points.")

scripts/field_prop/field_los.sh

@@ -1,5 +1,5 @@
 nthreads=1
-memory=48
+memory=32
 on_login=${1}
 queue="berg"
 env="/mnt/users/rstiskalek/csiborgtools/venv_csiborg/bin/python"
@@ -18,11 +18,8 @@ then
 fi
 
 
-# for simname in "csiborg1" "csiborg2_main" "csiborg2X" "Lilow2024" "Carrick2015" "CF4"; do
-for simname in "Carrick2015"; do
-    # for catalogue in "2MTF" "SFI_gals" "CF4_TFR"; do
-    # for catalogue in "Foundation" "2MTF" "SFI_gals" "CF4_TFR"; do
-    for catalogue in "CF4_TFR"; do
+for simname in "csiborg1" "csiborg2_main" "csiborg2X" "Lilow2024" "Carrick2015" "CF4" "manticore_2MPP_N128_DES_V1"; do
+    for catalogue in "LOSS" "Foundation" "2MTF" "SFI_gals" "CF4_TFR"; do
         pythoncm="$env $file --catalogue $catalogue --nsims $nsims --simname $simname --MAS $MAS --grid $grid"
         if [ $on_login -eq 1 ]; then
             echo $pythoncm

scripts/flow/flow_validation.sh

@@ -37,15 +37,17 @@ else
 fi
 
 
-for simname in "IndranilVoid_exp" "IndranilVoid_gauss" "IndranilVoid_mb"; do
+# for simname in "IndranilVoid_exp" "IndranilVoid_gauss" "IndranilVoid_mb"; do
+for simname in "Carrick2015"; do
 # for simname in "no_field"; do
-    # for catalogue in "2MTF" "SFI_gals" "CF4_TFR_i" "CF4_TFR_w1"; do
+    # for catalogue in "LOSS" "Foundation" "2MTF" "SFI_gals" "CF4_TFR_i" "CF4_TFR_w1"; do
+    for catalogue in "LOSS"; do
     # for catalogue in "CF4_TFR_i" "CF4_TFR_w1"; do
-    for catalogue in "2MTF" "SFI_gals" "CF4_TFR_i" "CF4_TFR_w1"; do
-        # for ksim in "none"; do
+    # for catalogue in "2MTF" "SFI_gals" "CF4_TFR_i" "CF4_TFR_w1"; do
+        for ksim in "none"; do
         # for ksim in 0; do
         # for ksim in $(seq 0 5 500); do
-        for ksim in "0_100_5" "100_200_5" "200_300_5" "300_400_5" "400_500_5"; do
+        # for ksim in "0_100_5" "100_200_5" "200_300_5" "300_400_5" "400_500_5"; do
         # for ksim in {0..500}; do
             for ksmooth in 0; do
                 pythoncm="$env $file --catalogue $catalogue --simname $simname --ksim $ksim --ksmooth $ksmooth --ndevice $ndevice --device $device"