restructuring and preparing 3band

deepskies · Jun 21, 2024 · 15c4e16 · 15c4e16
1 parent ff9215f
commit 15c4e16
Show file tree

Hide file tree

Showing 64 changed files with 2,869 additions and 42 deletions.
diff --git a/data b/data
@@ -0,0 +1 @@
+/deepskieslab/agarwal/data
diff --git a/src/sim/.DS_Store → sim/.DS_Store b/src/sim/.DS_Store → sim/.DS_Store
diff --git a/src/sim/configs/delve_galgal.yaml → sim/configs/delve_galgal.yaml b/src/sim/configs/delve_galgal.yaml → sim/configs/delve_galgal.yaml
diff --git a/src/sim/configs/delve_shrihan.yaml → sim/configs/delve_shrihan.yaml b/src/sim/configs/delve_shrihan.yaml → sim/configs/delve_shrihan.yaml
diff --git a/src/sim/configs/pax_original_source.yaml → sim/configs/fid_source.yaml b/src/sim/configs/pax_original_source.yaml → sim/configs/fid_source.yaml
@@ -2,7 +2,7 @@ DATASET:
     NAME: SourceData # set a name, this value is only used if you request the h5 file format
     PARAMETERS:
         SIZE: 50000 # number of images in the full datase.
-        OUTDIR: ../src/sim/data/pax_orig_source # will be created on your system if your request to save images
+        OUTDIR: ../../data/fid_source # will be created on your system if your request to save images
         SEED: 10 
 
 COSMOLOGY:

diff --git a/src/sim/configs/pax_original_target.yaml → sim/configs/fid_target.yaml b/src/sim/configs/pax_original_target.yaml → sim/configs/fid_target.yaml
@@ -2,7 +2,7 @@ DATASET:
     NAME: TargetData # set a name, this value is only used if you request the h5 file format
     PARAMETERS:
         SIZE: 50000 # number of images in the full datase.
-        OUTDIR: pax_orig_target
+        OUTDIR: ../../data/fid_target
         SEED: 10 
 
 COSMOLOGY:

diff --git a/src/sim/configs/multiband_source.yaml → sim/configs/multiband_source.yaml b/src/sim/configs/multiband_source.yaml → sim/configs/multiband_source.yaml
@@ -2,7 +2,7 @@ DATASET:
     NAME: SourceData # set a name, this value is only used if you request the h5 file format
     PARAMETERS:
         SIZE: 50000 # number of images in the full datase.
-        OUTDIR: ../src/sim/data/mb_source # will be created on your system if your request to save images
+        OUTDIR: ../../data/mb_source # will be created on your system if your request to save images
         SEED: 10 
 
 COSMOLOGY:

diff --git a/src/sim/configs/multiband_target.yaml → sim/configs/multiband_target.yaml b/src/sim/configs/multiband_target.yaml → sim/configs/multiband_target.yaml
@@ -2,7 +2,7 @@ DATASET:
     NAME: TargetData # set a name, this value is only used if you request the h5 file format
     PARAMETERS:
         SIZE: 50000 # number of images in the full datase.
-        OUTDIR: ../src/sim/data/mb_target
+        OUTDIR: ../../data/mb_target
         SEED: 10 
 
 COSMOLOGY:

diff --git a/src/sim/configs/pax_source.yaml → sim/configs/pax_source.yaml b/src/sim/configs/pax_source.yaml → sim/configs/pax_source.yaml
diff --git a/src/sim/configs/pax_source_des.yaml → sim/configs/pax_source_des.yaml b/src/sim/configs/pax_source_des.yaml → sim/configs/pax_source_des.yaml
diff --git a/src/sim/configs/pax_target.yaml → sim/configs/pax_target.yaml b/src/sim/configs/pax_target.yaml → sim/configs/pax_target.yaml
diff --git a/src/sim/configs/sky1.yaml → sim/configs/sky1.yaml b/src/sim/configs/sky1.yaml → sim/configs/sky1.yaml
diff --git a/src/sim/configs/sky100.yaml → sim/configs/sky100.yaml b/src/sim/configs/sky100.yaml → sim/configs/sky100.yaml
diff --git a/src/sim/configs/sky10000.yaml → sim/configs/sky10000.yaml b/src/sim/configs/sky10000.yaml → sim/configs/sky10000.yaml
diff --git a/src/sim/configs/test.yaml → sim/configs/test.yaml b/src/sim/configs/test.yaml → sim/configs/test.yaml
diff --git a/notebooks/gen_sim.ipynb → sim/notebooks/gen_sim.ipynb b/notebooks/gen_sim.ipynb → sim/notebooks/gen_sim.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -12,7 +12,23 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def rename_result(name, head):\n",
+    "    datapath = head / f'data/{name}'\n",
+    "    imgpath = datapath / 'CONFIGURATION_1_images.npy'\n",
+    "    mdpath = datapath / 'CONFIGURATION_1_metadata.csv'\n",
+    "    if imgpath.exists():\n",
+    "        imgpath.rename(datapath / (datapath.name + '.npy'))\n",
+    "    if mdpath.exists():\n",
+    "        mdpath.rename(datapath / (datapath.name + '_metadata.csv'))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -22,19 +38,28 @@
       "Entering main organization loop\n",
       "Organizing CONFIGURATION_1\n",
       "Generating images for CONFIGURATION_1\n",
-      "\tProgress: 100.0 %  ---  Elapsed Time: 0 H 8 M 46 S         \n"
+      "\tProgress: 100.0 %  ---  Elapsed Time: 0 H 1 M 58 S         \n"
      ]
     }
    ],
    "source": [
-    "head = Path.cwd().parent\n",
-    "config_file = head / 'src/sim/configs/multiband_source.yaml'\n",
+    "head = Path.cwd().parent.parent\n",
+    "config_file = head / 'sim/configs/fid_source.yaml'\n",
     "dataset = dl.make_dataset(config_file, verbose=True, save_to_disk=True)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "rename_result('fid_source', head)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -44,16 +69,25 @@
       "Entering main organization loop\n",
       "Organizing CONFIGURATION_1\n",
       "Generating images for CONFIGURATION_1\n",
-      "\tProgress: 100.0 %  ---  Elapsed Time: 0 H 8 M 20 S         \n"
+      "\tProgress: 100.0 %  ---  Elapsed Time: 0 H 1 M 58 S         \n"
      ]
     }
    ],
    "source": [
-    "head = Path.cwd().parent\n",
-    "config_file = head / 'src/sim/configs/multiband_target.yaml'\n",
+    "head = Path.cwd().parent.parent\n",
+    "config_file = head / 'sim/configs/fid_target.yaml'\n",
     "dataset = dl.make_dataset(config_file, verbose=True, save_to_disk=True)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "rename_result('fid_target', head)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -64,9 +98,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "deeplens",
+   "display_name": "Python [conda env:.conda-deeplens]",
    "language": "python",
-   "name": "python3"
+   "name": "conda-env-.conda-deeplens-py"
   },
   "language_info": {
    "codemirror_mode": {
@@ -78,9 +112,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.16"
+   "version": "3.7.12"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/notebooks/old/dlsim_Shrihan.ipynb → sim/notebooks/old/dlsim_Shrihan.ipynb b/notebooks/old/dlsim_Shrihan.ipynb → sim/notebooks/old/dlsim_Shrihan.ipynb
diff --git a/notebooks/old/example.ipynb → sim/notebooks/old/example.ipynb b/notebooks/old/example.ipynb → sim/notebooks/old/example.ipynb
diff --git a/notebooks/old/explore.ipynb → sim/notebooks/old/explore.ipynb b/notebooks/old/explore.ipynb → sim/notebooks/old/explore.ipynb
diff --git a/notebooks/old/paxsim_Shrihan.ipynb → sim/notebooks/old/paxsim_Shrihan.ipynb b/notebooks/old/paxsim_Shrihan.ipynb → sim/notebooks/old/paxsim_Shrihan.ipynb
diff --git a/notebooks/old/sim_training_set_cleaned.ipynb → ...ebooks/old/sim_training_set_cleaned.ipynb b/notebooks/old/sim_training_set_cleaned.ipynb → ...ebooks/old/sim_training_set_cleaned.ipynb
diff --git a/notebooks/old/sky_brightness_testing.ipynb → ...otebooks/old/sky_brightness_testing.ipynb b/notebooks/old/sky_brightness_testing.ipynb → ...otebooks/old/sky_brightness_testing.ipynb
diff --git a/notebooks/old/testsim_Shrihan.ipynb → sim/notebooks/old/testsim_Shrihan.ipynb b/notebooks/old/testsim_Shrihan.ipynb → sim/notebooks/old/testsim_Shrihan.ipynb
diff --git a/notebooks/renorm.ipynb → sim/notebooks/renorm.ipynb b/notebooks/renorm.ipynb → sim/notebooks/renorm.ipynb
diff --git a/src/scripts/__init__.py → sim/scripts/__init__.py b/src/scripts/__init__.py → sim/scripts/__init__.py
diff --git a/src/scripts/__version__.py → sim/scripts/__version__.py b/src/scripts/__version__.py → sim/scripts/__version__.py
diff --git a/src/scripts/evaluate.py → sim/scripts/evaluate.py b/src/scripts/evaluate.py → sim/scripts/evaluate.py
diff --git a/src/scripts/paths.py → sim/scripts/paths.py b/src/scripts/paths.py → sim/scripts/paths.py
diff --git a/src/scripts/train.py → sim/scripts/train.py b/src/scripts/train.py → sim/scripts/train.py
diff --git a/src/static/.gitignore → sim/static/.gitignore b/src/static/.gitignore → sim/static/.gitignore
diff --git a/src/tex/.gitignore → sim/tex/.gitignore b/src/tex/.gitignore → sim/tex/.gitignore
diff --git a/src/tex/bib.bib → sim/tex/bib.bib b/src/tex/bib.bib → sim/tex/bib.bib
diff --git a/src/tex/figures/.gitignore → sim/tex/figures/.gitignore b/src/tex/figures/.gitignore → sim/tex/figures/.gitignore
diff --git a/src/tex/ms.tex → sim/tex/ms.tex b/src/tex/ms.tex → sim/tex/ms.tex
diff --git a/src/tex/output/.gitignore → sim/tex/output/.gitignore b/src/tex/output/.gitignore → sim/tex/output/.gitignore
diff --git a/src/tex/showyourwork.sty → sim/tex/showyourwork.sty b/src/tex/showyourwork.sty → sim/tex/showyourwork.sty
diff --git a/src/sim/data/.DS_Store b/src/sim/data/.DS_Store
diff --git a/src/sim/data/.gitignore b/src/sim/data/.gitignore
diff --git a/src/sim/data/mb_target/.DS_Store b/src/sim/data/mb_target/.DS_Store
diff --git a/test/test_example.py b/test/test_example.py
diff --git a/src/.DS_Store → training/.DS_Store b/src/.DS_Store → training/.DS_Store
diff --git a/notebooks/Shrihan_MMD_practice.ipynb → ...ebooks/MMD_old/Shrihan_MMD_practice.ipynb b/notebooks/Shrihan_MMD_practice.ipynb → ...ebooks/MMD_old/Shrihan_MMD_practice.ipynb
diff --git a/notebooks/Shrihan_Norm2_MMD_practice.ipynb → .../MMD_old/Shrihan_Norm2_MMD_practice.ipynb b/notebooks/Shrihan_Norm2_MMD_practice.ipynb → .../MMD_old/Shrihan_Norm2_MMD_practice.ipynb
diff --git a/notebooks/Shrihan_Norm_MMD_practice.ipynb → ...s/MMD_old/Shrihan_Norm_MMD_practice.ipynb b/notebooks/Shrihan_Norm_MMD_practice.ipynb → ...s/MMD_old/Shrihan_Norm_MMD_practice.ipynb
diff --git a/notebooks/ShrihanPaperMMD.ipynb → .../MMD_paper/fiducial/ShrihanPaperMMD.ipynb b/notebooks/ShrihanPaperMMD.ipynb → .../MMD_paper/fiducial/ShrihanPaperMMD.ipynb
diff --git a/notebooks/ShrihanPaperMMD_fidcheck.ipynb → ...r/fiducial/ShrihanPaperMMD_fidcheck.ipynb b/notebooks/ShrihanPaperMMD_fidcheck.ipynb → ...r/fiducial/ShrihanPaperMMD_fidcheck.ipynb