Pantheon+ covariance (#138)

* Add improt

* Add PP reading attempt

* Remoe odd step requirement

* Update script

* Add CF4

* Add CF4

* Fix path bug

* Update scripts

* Update nb

* Update script

scripts/field_los.py

@@ -160,18 +160,17 @@ def get_field(simname, nsim, kind, MAS, grid):
             return field
         else:
             raise ValueError(f"Unknown field kind: `{kind}`.")
-    elif "CF4" in simname:
-        folder = "/mnt/extraspace/rstiskalek/catalogs"
+    elif simname == "CF4":
+        folder = "/mnt/extraspace/rstiskalek/catalogs/CF4"
         warn(f"Using local paths from `{folder}`.", RuntimeWarning)
 
         if kind == "density":
-            fpath = join(folder, "CF4_new_64-z008_delta.fits")
+            fpath = join(folder, f"CF4_new_128-z008_realization{nsim}_delta.fits")     # noqa
         elif kind == "velocity":
-            fpath = join(folder, "CF4_new_64-z008_velocity.fits")
+            fpath = join(folder, f"CF4_new_128-z008_realization{nsim}_velocity.fits")  # noqa
         else:
             raise ValueError(f"Unknown field kind: `{kind}`.")
 
-        fpath = fpath.replace("CF4", "CF4gp") if "CF4gp" in simname else fpath
         field = fits.open(fpath)[0].data
 
         # https://projets.ip2i.in2p3.fr//cosmicflows/ says to multiply by 52

scripts/field_los.sh

@@ -1,29 +1,29 @@
 nthreads=1
 memory=64
-on_login=0
+on_login=1
 queue="berg"
 env="/mnt/users/rstiskalek/csiborgtools/venv_csiborg/bin/python"
 file="field_los.py"
 
-simname=${1}
 nsims="-1"
 MAS="SPH"
 grid=1024
 
 
-for catalogue in "UPGLADE"; do
-# for catalogue in "Foundation"; do
-    pythoncm="$env $file --catalogue $catalogue --nsims $nsims --simname $simname --MAS $MAS --grid $grid"
-    if [ $on_login -eq 1 ]; then
-        echo $pythoncm
-        $pythoncm
-    else
-        cm="addqueue -q $queue -n $nthreads -m $memory $pythoncm"
-        echo "Submitting:"
-        echo $cm
-        echo
-        eval $cm
-    fi
+for simname in "CF4"; do
+    for catalogue in "Foundation"; do
+        pythoncm="$env $file --catalogue $catalogue --nsims $nsims --simname $simname --MAS $MAS --grid $grid"
+        if [ $on_login -eq 1 ]; then
+            echo $pythoncm
+            $pythoncm
+        else
+            cm="addqueue -q $queue -n $nthreads -m $memory $pythoncm"
+            echo "Submitting:"
+            echo $cm
+            echo
+            eval $cm
+        fi
 
-    sleep 0.05
+        sleep 0.05
+    done
 done

scripts/flow_validation.py

@@ -248,7 +248,7 @@ if __name__ == "__main__":
                                "beta_min": -1.0, "beta_max": 3.0,
                                "sigma_v_min": 1.0, "sigma_v_max": 750.,
                                "sample_Vmono": False,
-                               "sample_alpha": False,
+                               "sample_alpha": True,
                                "sample_beta": True,
                                "sample_sigma_v_ext": False,
                                }

scripts/flow_validation.sh

@@ -21,7 +21,7 @@ fi
 # for simname in "Lilow2024" "CF4" "CF4gp" "csiborg1" "csiborg2_main" "csiborg2X"; do
 for simname in "Carrick2015"; do
 # for simname in "csiborg1" "csiborg2_main" "csiborg2X"; do
-    for catalogue in "Pantheon+_zSN"; do
+    for catalogue in "Foundation"; do
     # for catalogue in "2MTF"; do
         # for ksim in 0 1 2; do
         # for ksim in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do