Merge pull request #462 from lsst/tickets/SP-2165

tickets/SP-2165: Set up automatic pre-night opsim simulations for lsstcam

Author: ehneilsen

batch/run_prenight_sims.sh

@@ -29,6 +29,7 @@ conda activate /sdf/data/rubin/shared/scheduler/envs/prenight
 
 set -o xtrace
 
+export TELESCOPE=$1
 export AWS_PROFILE=prenight
 WORK_DIR=$(date '+/sdf/data/rubin/shared/scheduler/prenight/work/run_prenight_sims/%Y-%m-%dT%H%M%S' --utc)
 echo "Working in $WORK_DIR"
@@ -55,7 +56,7 @@ TS_FBS_UTILS_TAG=$(curl -s https://api.github.com/repos/lsst-ts/ts_fbs_utils/tag
 pip install --no-deps --target=${PACKAGE_DIR} git+https://github.com/lsst-ts/ts_fbs_utils.git@${TS_FBS_UTILS_TAG}
 
 # Get the scheduler configuration script
-SCHEDULER_CONFIG_SCRIPT=$(scheduler_config_at_time latiss)
+SCHEDULER_CONFIG_SCRIPT=$(scheduler_config_at_time ${TELESCOPE})
 
 # Get the path to prenight_sim as provided by the current environment,
 # so we do not accidentally run one from the adjusted PATH below.
@@ -67,6 +68,6 @@ export PYTHONPATH=${PACKAGE_DIR}:${PYTHONPATH}
 export PATH=${PACKAGE_DIR}/bin:${PATH}
 printenv > env.out
 date --iso=s
-time ${PRENIGHT_SIM} --scheduler auxtel.pickle.xz --opsim None --repo=${TS_CONFIG_OCS_REPO} --script ${SCHEDULER_CONFIG_SCRIPT} --config_version ${TS_CONFIG_OCS_VERSION} 2>&1 > ${WORK_DIR}/prenight_sim.out
+time ${PRENIGHT_SIM} --scheduler ${TELESCOPE}.pickle.xz --opsim None --repo=${TS_CONFIG_OCS_REPO} --script ${SCHEDULER_CONFIG_SCRIPT} --config_version ${TS_CONFIG_OCS_VERSION} --telescope ${TELESCOPE} 2>&1 > ${WORK_DIR}/prenight_sim.out
 date --iso=s
 echo "******* END of run_prenight_sims.sh *********"

rubin_sim/sim_archive/prenight.py

@@ -344,6 +344,7 @@ def prenight_sim_cli(cli_args: list = []) -> None:
     )
     parser.add_argument("--scheduler", type=str, default=None, help="pickle file of the scheduler to run.")
     parser.add_argument("--config_version", type=str, default=None, help="Version of ts_config_ocs used.")
+    parser.add_argument("--telescope", type=str, default=None, help="Telescope scheduled.")
 
     # Configure logging
     stream_handler = logging.StreamHandler()
@@ -388,31 +389,34 @@ def prenight_sim_cli(cli_args: list = []) -> None:
     opsim_db = None if args.opsim in ("", "None") else args.opsim
 
     scheduler_file = args.scheduler
+    opsim_metadata = {"telescope": args.telescope}
     if args.repo is not None:
         if os.path.exists(scheduler_file):
             raise ValueError(f"File {scheduler_file} already exists!")
 
         if args.config_version is not None:
             scheduler: CoreScheduler = get_scheduler_instance_from_path(args.script)
             save_scheduler(scheduler, scheduler_file)
-            opsim_metadata = {
-                "opsim_config_repository": args.repo,
-                "opsim_config_script": args.script,
-                "opsim_config_version": args.config_version,
-            }
+            opsim_metadata.update(
+                {
+                    "opsim_config_repository": args.repo,
+                    "opsim_config_script": args.script,
+                    "opsim_config_version": args.config_version,
+                }
+            )
         elif args.branch is not None:
             scheduler: CoreScheduler = get_scheduler(args.repo, args.script, args.branch)
             save_scheduler(scheduler, scheduler_file)
 
-            opsim_metadata = {
-                "opsim_config_repository": args.repo,
-                "opsim_config_script": args.script,
-                "opsim_config_branch": args.branch,
-            }
+            opsim_metadata.update(
+                {
+                    "opsim_config_repository": args.repo,
+                    "opsim_config_script": args.script,
+                    "opsim_config_branch": args.branch,
+                }
+            )
         else:
             raise ValueError("Either the branch or the version of ts_ocs_config must be specified")
-    else:
-        opsim_metadata = None
 
     run_prenights(
         day_obs_mjd,

rubin_sim/sim_archive/sim_archive.py

@@ -998,6 +998,7 @@ def find_latest_prenight_sim_for_nights(
     first_day_obs: str | None = None,
     last_day_obs: str | None = None,
     tags: tuple[str] = ("ideal", "nominal"),
+    telescope: str = "simonyi",
     max_simulation_age: int = 2,
     archive_uri: str = "s3://rubin:rubin-scheduler-prenight/opsim/",
     compilation_uri: str = "s3://rubin:rubin-scheduler-prenight/opsim/compiled_metadata_cache.h5",
@@ -1015,6 +1016,9 @@ def find_latest_prenight_sim_for_nights(
     tags : `tuple[str]`
         A tuple of tags to filter simulations by.
         Defaults to ``('ideal', 'nominal')``.
+    telescope : `str`
+        The telescope to search for (simonyi or auxtel).
+        Defaults to simonyi.
     max_simulation_age : `int`
         The maximum age of simulations to consider, in days.
         Simulations older than ``max_simulation_age`` will not be considered.
@@ -1053,6 +1057,8 @@ def find_latest_prenight_sim_for_nights(
             continue
         if sim["simulated_dates"]["last"] < last_day_obs:
             continue
+        if "telescope" in sim and sim["telescope"].lower() != telescope.lower():
+            continue
         if not set(tags).issubset(sim["tags"]):
             continue
         if best_sim is not None:
@@ -1080,6 +1086,7 @@ def fetch_latest_prenight_sim_for_nights(
     first_day_obs: str | None = None,
     last_day_obs: str | None = None,
     tags: tuple[str] = ("ideal", "nominal"),
+    telescope: str = "simonyi",
     max_simulation_age: int = 2,
     archive_uri: str = "s3://rubin:rubin-scheduler-prenight/opsim/",
     compilation_uri: str = "s3://rubin:rubin-scheduler-prenight/opsim/compiled_metadata_cache.h5",
@@ -1099,6 +1106,9 @@ def fetch_latest_prenight_sim_for_nights(
     tags : `tuple[str]`
         A tuple of tags to filter simulations by.
         Defaults to ``('ideal', 'nominal')``.
+    telescope : `str`
+        The telescope to get sims for, "simonyi" or "auxtel".
+        Defaults to "simonyi".
     max_simulation_age : `int`
         The maximum age of simulations to consider, in days. Simulations older
         than ``max_simulation_age`` will not be considered. Defaults to 2.
@@ -1119,7 +1129,7 @@ def fetch_latest_prenight_sim_for_nights(
     """
 
     sim_metadata = find_latest_prenight_sim_for_nights(
-        first_day_obs, last_day_obs, tags, max_simulation_age, archive_uri, compilation_uri
+        first_day_obs, last_day_obs, tags, telescope, max_simulation_age, archive_uri, compilation_uri
     )
     if sim_metadata is None:
         LOGGER.info("No simulations meet requested criteria.")
@@ -1132,7 +1142,9 @@ def fetch_latest_prenight_sim_for_nights(
     return result
 
 
-def fetch_obsloctap_visits(day_obs: str | None = None, nights: int = 2) -> pd.DataFrame:
+def fetch_obsloctap_visits(
+    day_obs: str | None = None, nights: int = 2, telescope: str = "simonyi"
+) -> pd.DataFrame:
     """Return visits from latest nominal prenight briefing simulation.
 
     Parameters
@@ -1143,6 +1155,9 @@ def fetch_obsloctap_visits(day_obs: str | None = None, nights: int = 2) -> pd.Da
     nights : `int`
         The number of nights of observations to return.
         Defaults to 2.
+    telescope : `str`
+        The telescope to get visits for: "simonyi" or "auxtel".
+        Defaults to "simonyi".
 
     Returns
     -------
@@ -1182,6 +1197,7 @@ def fetch_obsloctap_visits(day_obs: str | None = None, nights: int = 2) -> pd.Da
         first_day_obs,
         last_day_obs,
         tags=("ideal", "nominal"),
+        telescope=telescope,
         max_simulation_age=max_simulation_age,
         sqlconstraint=sqlconstraint,
         dbcols=dbcols,

tests/sim_archive/test_prenight.py

@@ -25,4 +25,5 @@ class TestPrenight(unittest.TestCase):
     def test_prenight(self):
         with TemporaryDirectory() as test_archive_dir:
             archive_uri = ResourcePath(test_archive_dir).geturl()  # type: ignore
-            prenight_sim_cli("--archive", archive_uri)
+            prenight_sim_cli(["--archive", archive_uri, "--telescope", "simonyi"])
+            pass

tests/sim_archive/test_sim_archive.py

@@ -142,21 +142,21 @@ def test_cli(self):
 
     @unittest.skipIf(not HAVE_LSST_RESOURCES, "No lsst.resources")
     def test_find_latest_prenight_sim_for_night(self):
-        day_obs = "2025-03-25"
+        day_obs = "2025-04-25"
         max_simulation_age = int(np.ceil(Time.now().mjd - Time(day_obs).mjd)) + 1
         sim_metadata = find_latest_prenight_sim_for_nights(day_obs, max_simulation_age=max_simulation_age)
         assert sim_metadata["simulated_dates"]["first"] <= day_obs <= sim_metadata["simulated_dates"]["last"]
 
     @unittest.skipIf(not HAVE_LSST_RESOURCES, "No lsst.resources")
     def test_fetch_latest_prenight_sim_for_night(self):
-        day_obs = "2025-03-25"
+        day_obs = "2025-04-25"
         max_simulation_age = int(np.ceil(Time.now().mjd - Time(day_obs).mjd)) + 1
         visits = fetch_latest_prenight_sim_for_nights(day_obs, max_simulation_age=max_simulation_age)
         assert len(visits) > 0
 
     @unittest.skipIf(not HAVE_LSST_RESOURCES, "No lsst.resources")
     def test_fetch_obsloctap_visits(self):
-        day_obs = "2025-03-25"
+        day_obs = "2025-04-25"
         num_nights = 2
         visits = pd.DataFrame(fetch_obsloctap_visits(day_obs, nights=num_nights))
         assert np.floor(visits["observationStartMJD"].min() - 0.5) == Time(day_obs).mjd