Merge pull request #20 from lsst/tickets/PREOPS-4646

tickets/PREOPS-4646: Support addition of opsim data to an archive for use by schedview-prenight
lsst · Jan 16, 2024 · 4853d59 · 4853d59
2 parents 4d0b64e + b05caea
commit 4853d59
Show file tree

Hide file tree

Showing 10 changed files with 798 additions and 7 deletions.
diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
@@ -30,6 +30,7 @@ jobs:
         run: |
           mamba install --quiet --file=requirements.txt          
           mamba install --quiet pip
+          pip install lsst.resources
           pip install "documenteer[guide]"
 
       - name: install rubin_scheduler

diff --git a/.github/workflows/test_and_build.yaml b/.github/workflows/test_and_build.yaml
@@ -39,6 +39,7 @@ jobs:
         run: |
           mamba install --quiet --file=requirements.txt
           mamba install --quiet --file=test-requirements.txt
+          pip install lsst.resources
 
       - name: install rubin_scheduler
         shell: bash -l {0}

diff --git a/pyproject.toml b/pyproject.toml
@@ -35,6 +35,7 @@ dependencies = [
     "requests",
     "shapely",
     "tqdm",
+    "lsst.resources",
 ]
 
 [project.optional-dependencies]
@@ -53,6 +54,7 @@ dev = [
 [project.scripts]
 scheduler_download_data = "rubin_scheduler.data.scheduler_download_data:scheduler_download_data"
 rs_download_sky = "rubin_scheduler.data.rs_download_sky:rs_download_sky"
+archive_sim = "rubin_scheduler.sim_archive:make_sim_archive_cli"
 
 
 [tool.setuptools.dynamic]

diff --git a/requirements.txt b/requirements.txt
@@ -12,3 +12,4 @@ h5py
 requests
 shapely
 tqdm
+conda
diff --git a/rubin_scheduler/scheduler/example/example_scheduler.py b/rubin_scheduler/scheduler/example/example_scheduler.py
@@ -1087,10 +1087,10 @@ def ddf_surveys(detailers=None, season_unobs_frac=0.2, euclid_detailers=None, ns
     euclid_obs = np.where((obs_array["note"] == "DD:EDFS_b") | (obs_array["note"] == "DD:EDFS_a"))[0]
     all_other = np.where((obs_array["note"] != "DD:EDFS_b") & (obs_array["note"] != "DD:EDFS_a"))[0]
 
-    survey1 = ScriptedSurvey([bf.AvoidDirectWind(nside=nside)], detailers=detailers)
+    survey1 = ScriptedSurvey([bf.AvoidDirectWind(nside=nside)], nside=nside, detailers=detailers)
     survey1.set_script(obs_array[all_other])
 
-    survey2 = ScriptedSurvey([bf.AvoidDirectWind(nside=nside)], detailers=euclid_detailers)
+    survey2 = ScriptedSurvey([bf.AvoidDirectWind(nside=nside)], nside=nside, detailers=euclid_detailers)
     survey2.set_script(obs_array[euclid_obs])
 
     return [survey1, survey2]

diff --git a/rubin_scheduler/sim_archive/__init__.py b/rubin_scheduler/sim_archive/__init__.py
@@ -0,0 +1 @@
+from .sim_archive import *
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ h5py @@
     requests
     shapely
     tqdm
+    conda