Spergel fits to exponential

README.md

@@ -22,6 +22,9 @@ pip install -e ".[dev]"
 # Install JAX-Galsim
 pip install git+https://github.com/GalSim-developers/JAX-GalSim.git --no-deps --no-build-isolation
 
+# Install ornax
+pip install git+https://github.com/beckermr/ornax.git --no-deps --no-build-isolation
+
 # Might be necessary
 conda install -c nvidia cuda-nvcc
 ```

bpd/draw.py

@@ -55,6 +55,31 @@ def draw_exponential(
     return image.array
 
 
+def draw_spergel(
+    *,
+    nu: float,
+    f: float,
+    hlr: float,
+    e1: float,
+    e2: float,
+    x: float,  # pixels
+    y: float,
+    slen: int,
+    fft_size: int,  # rule of thumb: at least 4 times `slen`
+    psf_fwhm: float = 0.8,
+    pixel_scale: float = 0.2,
+):
+    gsparams = GSParams(minimum_fft_size=fft_size, maximum_fft_size=fft_size)
+
+    gal = xgalsim.Spergel(nu=nu, flux=f, half_light_radius=hlr)
+    gal = gal.shear(g1=e1, g2=e2)
+
+    psf = xgalsim.Gaussian(flux=1.0, fwhm=psf_fwhm)
+    gal_conv = xgalsim.Convolve([gal, psf]).withGSParams(gsparams)
+    image = gal_conv.drawImage(nx=slen, ny=slen, scale=pixel_scale, offset=(x, y))
+    return image.array
+
+
 def draw_gaussian_galsim(
     *,
     f: float,

experiments/exp70/collate_samples.py

@@ -9,14 +9,15 @@
 
 def main(
     tag: str = typer.Option(),
-    mode: str = typer.Option(),
     start_string: str = typer.Option(),
+    mode: str = typer.Option(),
+    contains: str = "",
     overwrite: bool = False,
 ):
     assert mode in ("plus", "minus", "")
     mode_txt = f"_{mode}" if mode else ""
     dirpath = DATA_DIR / "cache_chains" / tag
-    newpath = dirpath / f"{start_string}{mode_txt}.npz"
+    newpath = dirpath / f"{start_string}{mode_txt}_{contains}.npz"
 
     if newpath.exists():
         if overwrite:
@@ -30,7 +31,8 @@ def main(
         cond1 = fp.name.startswith(start_string)
         cond2 = fp.name != newpath.name  # technically not necessary
         cond3 = mode in fp.name
-        if cond1 and cond2 and cond3:
+        cond4 = contains in fp.name
+        if cond1 and cond2 and cond3 and cond4:
             fps.append(fp)
 
     full_ds = {}

experiments/exp72/get_shear.py

@@ -29,18 +29,20 @@ def main(
     initial_step_size: float = 0.001,
     n_samples: int = 3000,
     overwrite: bool = False,
+    extra: str = "",
 ):
     rng_key = jax.random.key(seed)
 
     assert mode in ("plus", "minus", "")
     mode_txt = f"_{mode}" if mode else ""
+    extra_txt = "" if not extra else f"_{extra}"
 
     # directory structure
     dirpath = DATA_DIR / "cache_chains" / tag
     samples_fpath = Path(samples_fpath)
     assert dirpath.exists()
     assert samples_fpath.exists(), "ellipticity samples file does not exist"
-    out_fpath = dirpath / f"g_samples_{seed}{mode_txt}.npz"
+    out_fpath = dirpath / f"g_samples_{seed}{mode_txt}{extra_txt}.npz"
 
     if out_fpath.exists() and not overwrite:
         raise IOError("overwriting...")
@@ -103,6 +105,7 @@ def main(
     g_samples = pipe(rng_key, post_params)
     assert g_samples.ndim == 2
     assert g_samples.shape[1] == 2
+    print("Done running!")
 
     save_dataset(
         {"samples": {"g1": np.array(g_samples[:, 0]), "g2": np.array(g_samples[:, 1])}},

experiments/exp72/simple_bootstrap.py

@@ -28,6 +28,8 @@ def main(
     n_boots: int = 25,
     no_bar: bool = False,
     n_gals: int | None = None,
+    extra: str = "",
+    overwrite: bool = False,
 ):
     rng_key = random.key(seed)
     k1, k2 = random.split(rng_key)
@@ -36,7 +38,10 @@ def main(
     pfpath = Path(samples_plus_fpath)
     mfpath = Path(samples_minus_fpath)
     assert dirpath.exists() and pfpath.exists() and mfpath.exists()
-    fpath = dirpath / f"g_samples_boots_{seed}.npz"
+    extra_txt = "" if not extra else f"_{extra}"
+    fpath = dirpath / f"g_samples_boots_{seed}{extra_txt}.npz"
+    if not overwrite:
+        assert not fpath.exists()
 
     # start in cpu to avoid memory issues.
     dsp = load_dataset(samples_plus_fpath)
@@ -144,7 +149,7 @@ def pipe(k, d):
             "minus": {"g1": samples_minus["g1"], "g2": samples_minus["g2"]},
         },
         fpath,
-        overwrite=True,
+        overwrite=overwrite,
     )
 
 

experiments/exp72/slurm_bootstrap.py

@@ -3,6 +3,7 @@
 
 import typer
 
+from bpd import HOME_DIR
 from bpd.slurm import run_multi_gpu_job
 
 
@@ -17,33 +18,38 @@ def main(
     time: str = "00:30",  # HH:MM
     mem_per_gpu: str = "10G",
     qos: str = "debug",
+    extra: str = "",
 ):
     n_splits = n_nodes * 4
     split_size = math.ceil(n_boots / n_splits)
 
     cmds = []
+    script = HOME_DIR / "experiments" / "exp72" / "simple_bootstrap.py"
     for ii in range(n_splits):
         n_gals_txt = f" --n-gals {n_gals}" if n_gals else ""
-        base_cmd = """./simple_bootstrap.py {new_seed}
+        extra_txt = f"--extra {extra}" if extra else ""
+        base_cmd = """{script} {new_seed}
         --samples-plus-fpath {samples_plus_fpath}
         --samples-minus-fpath {samples_minus_fpath}
-        --tag {tag} --n-boots {split_size}{n_gals_txt}
+        --tag {tag} --n-boots {split_size}{n_gals_txt} {extra_txt}
         """
         base_cmd = " ".join(base_cmd.split())
         new_seed = f"{seed}{ii}"
         cmd = base_cmd.format(
+            script=script,
             new_seed=new_seed,
             tag=tag,
             split_size=split_size,
             samples_plus_fpath=samples_plus_fpath,
             samples_minus_fpath=samples_minus_fpath,
             n_gals_txt=n_gals_txt,
+            extra_txt=extra_txt,
         )
         cmds.append(cmd)
 
     run_multi_gpu_job(
         cmds,
-        jobname=f"{tag}_boot",
+        jobname=f"{tag}_boot_{seed}_{extra}",
         time=time,
         mem_per_gpu=mem_per_gpu,
         qos=qos,

experiments/exp93/Makefile

@@ -0,0 +1,202 @@
+SHELL=/bin/bash
+SEED := 51
+EXP := exp93
+TAG := ${EXP}_${SEED}
+DIR := /pscratch/sd/i/imendoza/data/cache_chains/${TAG}
+SHEAR := 0.02
+
+
+# image sampling phase 
+QOS := regular
+TIME_SAMPLE := 02:00
+NODES_SAMPLE := 8
+MEM_PER_GPU := 10G
+N_GALS := 10_000
+N_SAMPLES_PER_GAL := 300
+
+export JAX_ENABLE_X64=True
+
+PLUS_SAMPLES_FPATH_NU01 = ${DIR}/interim_samples_${SEED}1_plus_nu10.npz
+MINUS_SAMPLES_FPATH_NU01 = ${DIR}/interim_samples_${SEED}1_minus_nu10.npz
+
+PLUS_SAMPLES_FPATH_NU03 = ${DIR}/interim_samples_${SEED}1_plus_nu30.npz
+MINUS_SAMPLES_FPATH_NU03 = ${DIR}/interim_samples_${SEED}1_minus_nu30.npz
+
+PLUS_SAMPLES_FPATH_NU05 = ${DIR}/interim_samples_${SEED}1_plus_nu50.npz
+MINUS_SAMPLES_FPATH_NU05 = ${DIR}/interim_samples_${SEED}1_minus_nu50.npz
+
+PLUS_SAMPLES_FPATH_NU10 = ${DIR}/interim_samples_${SEED}1_plus_nu100.npz
+MINUS_SAMPLES_FPATH_NU10 = ${DIR}/interim_samples_${SEED}1_minus_nu100.npz
+
+PLUS_SAMPLES_FPATH_NU20 = ${DIR}/interim_samples_${SEED}1_plus_nu200.npz
+MINUS_SAMPLES_FPATH_NU20 = ${DIR}/interim_samples_${SEED}1_minus_nu200.npz
+
+PLUS_SAMPLES_FPATH_NU30 = ${DIR}/interim_samples_${SEED}1_plus_nu300.npz
+MINUS_SAMPLES_FPATH_NU30 = ${DIR}/interim_samples_${SEED}1_minus_nu300.npz
+
+PLUS_SAMPLES_FPATH_NU-02 = ${DIR}/interim_samples_${SEED}1_plus_nu-20.npz
+MINUS_SAMPLES_FPATH_NU-02 = ${DIR}/interim_samples_${SEED}1_minus_nu-20.npz
+
+PLUS_SAMPLES_FPATH_NU-04 = ${DIR}/interim_samples_${SEED}1_plus_nu-40.npz
+MINUS_SAMPLES_FPATH_NU-04 = ${DIR}/interim_samples_${SEED}1_minus_nu-40.npz
+
+PLUS_SAMPLES_FPATH_NU-06 = ${DIR}/interim_samples_${SEED}1_plus_nu-60.npz
+MINUS_SAMPLES_FPATH_NU-06 = ${DIR}/interim_samples_${SEED}1_minus_nu-60.npz
+
+
+shear_samples: 
+	export CUDA_VISIBLE_DEVICES=0
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU01} --tag ${TAG} --mode "plus" --extra "nu10"
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU01} --tag ${TAG} --mode "minus" --extra "nu10"
+
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU03} --tag ${TAG} --mode "plus" --extra "nu30"
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU03} --tag ${TAG} --mode "minus" --extra "nu30"
+
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU05} --tag ${TAG} --mode "plus" --extra "nu50"
+# 	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU05} --tag ${TAG} --mode "minus" --extra "nu50"
+
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU10} --tag ${TAG} --mode "plus" --extra "nu100"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU10} --tag ${TAG} --mode "minus" --extra "nu100"
+
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU20} --tag ${TAG} --mode "plus" --extra "nu200"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU20} --tag ${TAG} --mode "minus" --extra "nu200"
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU30} --tag ${TAG} --mode "plus" --extra "nu300"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU30} --tag ${TAG} --mode "minus" --extra "nu300"
+
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU-02} --tag ${TAG} --mode "plus" --extra "nu-20"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU-02} --tag ${TAG} --mode "minus" --extra "nu-20"
+
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU-04} --tag ${TAG} --mode "plus" --extra "nu-40"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU-04} --tag ${TAG} --mode "minus" --extra "nu-40"
+
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${PLUS_SAMPLES_FPATH_NU-06} --tag ${TAG} --mode "plus" --extra "nu-60"
+	../exp72/get_shear.py ${SEED}2 --samples-fpath ${MINUS_SAMPLES_FPATH_NU-06} --tag ${TAG} --mode "minus" --extra "nu-60"
+
+boot:
+# 	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU05} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU05} --n-boots 100 --extra "nu50" --time "03:00" --qos "regular" --mem-per-gpu 40G
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU01} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU01} --n-boots 100 --extra "nu10" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU03} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU03} --n-boots 100 --extra "nu30" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU10} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU10} --n-boots 100 --extra "nu100" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU20} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU20} --n-boots 100 --extra "nu200" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU30} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU30} --n-boots 100 --extra "nu300" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU-02} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU-02} --n-boots 100 --extra "nu-20" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU-04} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU-04} --n-boots 100 --extra "nu-40" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+	../exp72/slurm_bootstrap.py ${SEED}3 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU-06} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU-06} --n-boots 100 --extra "nu-60" --time "03:00" --qos "regular" --mem-per-gpu 40G
+
+collate_boot:
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu50" --mode ""
+
+	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu10" --mode ""
+
+	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu30" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu100" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu200" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu300" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu-20" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu-40" --mode ""
+
+# 	../exp70/collate_samples.py --tag ${TAG} --start-string "g_samples_boots_${SEED}3" --contains "nu-60" --mode ""
+
+
+test_slurm_boot:
+	../exp72/slurm_bootstrap.py 992 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU05} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU05} --n-boots 8 --extra "nu50" --time "00:15" --qos "debug" --mem-per-gpu 40G
+
+test_boot:
+	../exp72/simple_bootstrap.py 991 --tag ${TAG} --samples-plus-fpath ${PLUS_SAMPLES_FPATH_NU05} --samples-minus-fpath ${MINUS_SAMPLES_FPATH_NU05} --n-boots 5 --extra "nu50" --n-gals 1000
+
+
+collate_interim:
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu10"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu10"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu30"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu30"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu50"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu50"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu-20"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu-20"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu-40"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu-40"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu-60"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu-60"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu100"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu100"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu200"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu200"
+
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "plus" --start-string "interim_samples_${SEED}1" --contains "nu300"
+# 	../exp70/collate_samples.py --tag ${TAG} --mode "minus" --start-string "interim_samples_${SEED}1" --contains "nu300"
+
+######################################################
+
+samples_nu:
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.3
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.3
+
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.1
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.1
+
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.5
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 0.5
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 1.0
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 1.0
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 2.0
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 2.0
+
+
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.2
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.2
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.4
+
+# 	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.4
+
+	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 3.0
+
+	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu 3.0
+
+	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "plus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.6
+
+	./slurm_get_interim_samples.py ${SEED}1 --tag ${TAG} --g1 -${SHEAR} --g2 0.0 --n-gals ${N_GALS} --n-samples-per-gal ${N_SAMPLES_PER_GAL} --time ${TIME_SAMPLE} --mode "minus" --mem-per-gpu ${MEM_PER_GPU} --qos ${QOS} --nodes ${NODES_SAMPLE} --nu -0.6
+
+
+test_slurm_samples:
+	./slurm_get_interim_samples.py 991 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals 1000 --n-samples-per-gal 300 --mode "plus" --batch-size 1000 --qos "debug" --nodes 1 --time 00:10 --nu 0.1
+
+test_samples_simple:
+	./get_interim_samples.py 990 --tag ${TAG} --g1 ${SHEAR} --g2 0.0 --n-gals 100 --n-samples-per-gal 300 --mode "plus" --batch-size 100 --nu 0.1