rubin-sim 2.2.3__tar.gz → 2.2.5.dev1__tar.gz

{rubin_sim-2.2.3/rubin_sim.egg-info → rubin_sim-2.2.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubin-sim
-Version: 2.2.3
+Version: 2.2.5.dev1
 Summary: Scheduler, survey strategy analysis, and other simulation tools for Rubin Observatory.
 License: GPL
 Project-URL: documentation, https://rubin-sim.lsst.io
@@ -26,7 +26,7 @@ Requires-Dist: numexpr
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pyarrow
-Requires-Dist: rubin-scheduler>=3.0
+Requires-Dist: rubin-scheduler>=3.8
 Requires-Dist: scipy
 Requires-Dist: shapely
 Requires-Dist: skyfield>=1.52

rubin_sim-2.2.5.dev1/batch/run_auxtel_prenight_sims.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+#SBATCH --account=rubin:developers      # Account name
+#SBATCH --job-name=auxtel_prenight_daily   # Job name
+#SBATCH --output=/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.out # Output file (stdout)
+#SBATCH --error=/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.err  # Error file (stderr)
+#SBATCH --partition=milano              # Partition (queue) names
+#SBATCH --nodes=1                       # Number of nodes
+#SBATCH --ntasks=1                      # Number of tasks run in parallel
+#SBATCH --cpus-per-task=1               # Number of CPUs per task
+#SBATCH --mem=6G                       # Requested memory
+#SBATCH --time=1:00:00                 # Wall time (hh:mm:ss)
+
+echo "******** START of run_prenight_sims.sh **********"
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# SLAC S3DF - source all files under ~/.profile.d
+if [[ -e ~/.profile.d && -n "$(ls -A ~/.profile.d/)" ]]; then
+  source <(cat $(find -L  ~/.profile.d -name '*.conf'))
+fi
+
+date --iso=s
+
+LATEST_TAGGED_STACK=$(find /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib -maxdepth 1 -regex .*/'v[0-9]+\.[0-9]+\.[0-9]+' -printf "%f\n" | sort -V | tail -1)
+echo "Using stack ${LATEST_TAGGED_STACK}"
+source /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/${LATEST_TAGGED_STACK}/loadLSST-ext.sh
+
+set -o xtrace
+
+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"
+mkdir ${WORK_DIR}
+cd ${WORK_DIR}
+
+# Install required python packages
+PACKAGE_DIR=$(readlink -f ${WORK_DIR}/packages)
+mkdir ${PACKAGE_DIR}
+export PYTHONPATH=${PACKAGE_DIR}:${PYTHONPATH}
+export PATH=${PACKAGE_DIR}/bin:${PATH}
+
+# Install most of the packages we need, carefully controlling the
+# versions and not installing dependincies, such that versions not
+# explicitly installed or specified come from either the base LSST
+# environment or the pip install of the tagged rubin_scheduler below.
+
+# Cannot get ts_fbs_utils from the EFD, so just guess the highest semantic version tag in the repo.
+# A "reference" can be a tag, hash, or branch.
+TS_FBS_UTILS_REFERENCE=$(curl -s https://api.github.com/repos/lsst-ts/ts_fbs_utils/tags | jq -r '.[].name' | egrep '^v[0-9]+.[0-9]+.[0-9]+$' | sort -V | tail -1)
+RUBIN_SIM_REFERENCE="v2.2.5.dev1"
+SCHEDVIEW_REFERENCE="v0.19.0.dev1"
+
+pip install --no-deps --target=${PACKAGE_DIR} \
+  git+https://github.com/lsst/rubin_sim.git@${RUBIN_SIM_REFERENCE} \
+  git+https://github.com/lsst/schedview.git@${SCHEDVIEW_REFERENCE} \
+  git+https://github.com/lsst-ts/ts_fbs_utils.git@${TS_FBS_UTILS_REFERENCE} \
+  lsst-resources
+
+# Get the scheduler version from the EFD and install it.
+# We have to do this after the others, because we want
+# the version of obs_version_at_time supplied by the
+# version of schedview we specify.
+# Go ahead and install any missing dependencies as well.
+RUBIN_SCHEDULER_REFERENCE=v$(obs_version_at_time rubin_scheduler)
+echo "Using rubin_scheduler $RUBIN_SCHEDULER_REFERENCE"
+pip install --ignore-installed --no-deps --target=${PACKAGE_DIR} git+https://github.com/lsst/rubin_scheduler.git@${RUBIN_SCHEDULER_REFERENCE}
+
+# Get the scheduler configuration script
+# It lives in ts_ocs_config
+TS_CONFIG_OCS_REPO="https://github.com/lsst-ts/ts_config_ocs"
+TS_CONFIG_OCS_REFERENCE=$(obs_version_at_time ts_config_ocs)
+echo "Using ts_config_ocs ${TS_CONFIG_OCS_REFERENCE}"
+curl --location --output ts_config_ocs.zip ${TS_CONFIG_OCS_REPO}/archive/${TS_CONFIG_OCS_REFERENCE}.zip
+unzip ts_config_ocs.zip
+mv $(find . -maxdepth 1 -type d -name ts_config_ocs\*) ts_config_ocs
+
+# Get the scheduler configuration script
+SCHEDULER_CONFIG_SCRIPT=$(scheduler_config_at_time auxtel)
+
+# Get the path to prenight_sim as provided by the current environment,
+# so we do not accidentally run one from the adjusted PATH below.
+PRENIGHT_SIM=$(which prenight_sim)
+
+export SIM_ARCHIVE_LOG_FILE=${WORK_DIR}/sim_archive_log.txt
+export PRENIGHT_LOG_FILE=${WORK_DIR}/prenight_log.txt
+
+date --iso=s
+time ${PRENIGHT_SIM} --scheduler auxtel.pickle.xz --repo=${TS_CONFIG_OCS_REPO} --script ${SCHEDULER_CONFIG_SCRIPT} --config_version ${TS_CONFIG_OCS_REFERENCE} --telescope auxtel 2>&1 > ${WORK_DIR}/prenight_sim.out
+date --iso=s
+echo "******* END of run_prenight_sims.sh *********"

rubin_sim-2.2.5.dev1/batch/run_prenight_sims.sh

@@ -0,0 +1,138 @@
+#!/usr/bin/env bash
+#SBATCH --account=rubin:developers      # Account name
+#SBATCH --job-name=auxtel_prenight_daily   # Job name
+#SBATCH --output=/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.out # Output file (stdout)
+#SBATCH --error=/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.out  # Error file (stderr)
+#SBATCH --partition=milano              # Partition (queue) names
+#SBATCH --nodes=1                       # Number of nodes
+#SBATCH --ntasks=1                      # Number of tasks run in parallel
+#SBATCH --cpus-per-task=1               # Number of CPUs per task
+#SBATCH --mem=6G                       # Requested memory
+#SBATCH --time=1:00:00                 # Wall time (hh:mm:ss)
+
+echo "******** START of run_prenight_sims.sh **********"
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# SLAC S3DF - source all files under ~/.profile.d
+if [[ -e ~/.profile.d && -n "$(ls -A ~/.profile.d/)" ]]; then
+  source <(cat $(find -L  ~/.profile.d -name '*.conf'))
+fi
+
+date --iso=s
+
+LATEST_TAGGED_STACK=$(find /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib -maxdepth 1 -regex .*/'v[0-9]+\.[0-9]+\.[0-9]+' -printf "%f\n" | sort -V | tail -1)
+echo "Using stack ${LATEST_TAGGED_STACK}"
+source /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/${LATEST_TAGGED_STACK}/loadLSST-ext.sh
+
+set -o xtrace
+
+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"
+mkdir ${WORK_DIR}
+cd ${WORK_DIR}
+
+# Install required python packages
+PACKAGE_DIR=$(readlink -f ${WORK_DIR}/packages)
+mkdir ${PACKAGE_DIR}
+export PYTHONPATH=${PACKAGE_DIR}:${PYTHONPATH}
+export PATH=${PACKAGE_DIR}/bin:${PATH}
+
+# Install most of the packages we need, carefully controlling the
+# versions and not installing dependincies, such that versions not
+# explicitly installed or specified come from either the base LSST
+# environment or the pip install of the tagged rubin_scheduler below.
+
+# Cannot get ts_fbs_utils from the EFD, so just guess the highest semantic version tag in the repo.
+# A "reference" can be a tag, hash, or branch.
+TS_FBS_UTILS_REFERENCE=$(curl -s https://api.github.com/repos/lsst-ts/ts_fbs_utils/tags | jq -r '.[].name' | egrep '^v[0-9]+.[0-9]+.[0-9]+$' | sort -V | tail -1)
+RUBIN_SIM_REFERENCE="v2.2.5.dev1"
+SCHEDVIEW_REFERENCE="v0.19.0.dev1"
+SIMS_SV_SURVEY_REFERENCE="v0.1.0"
+RUBIN_NIGHTS_REFERENCE="v0.3.0"
+
+pip install --no-deps --target=${PACKAGE_DIR} \
+  git+https://github.com/lsst/rubin_sim.git@${RUBIN_SIM_REFERENCE} \
+  git+https://github.com/lsst/schedview.git@${SCHEDVIEW_REFERENCE} \
+  git+https://github.com/lsst-ts/ts_fbs_utils.git@${TS_FBS_UTILS_REFERENCE} \
+  git+https://github.com/lsst-sims/sims_sv_survey.git@${SIMS_SV_SURVEY_REFERENCE} \
+  git+https://github.com/lsst-sims/rubin_nights.git@${RUBIN_NIGHTS_REFERENCE} \
+  lsst-resources
+
+# Get the scheduler version from the EFD and install it.
+# We have to do this after the others, because we want
+# the version of obs_version_at_time supplied by the
+# version of schedview we specify.
+# Go ahead and install any missing dependencies as well.
+RUBIN_SCHEDULER_REFERENCE=v$(obs_version_at_time rubin_scheduler)
+echo "Using rubin_scheduler $RUBIN_SCHEDULER_REFERENCE"
+pip install --ignore-installed --no-deps --target=${PACKAGE_DIR} git+https://github.com/lsst/rubin_scheduler.git@${RUBIN_SCHEDULER_REFERENCE}
+
+# Get the scheduler configuration script
+# It lives in ts_ocs_config
+TS_CONFIG_OCS_REPO="https://github.com/lsst-ts/ts_config_ocs"
+TS_CONFIG_OCS_REFERENCE=$(obs_version_at_time ts_config_ocs)
+echo "Using ts_config_ocs ${TS_CONFIG_OCS_REFERENCE}"
+curl --location --output ts_config_ocs.zip ${TS_CONFIG_OCS_REPO}/archive/${TS_CONFIG_OCS_REFERENCE}.zip
+unzip ts_config_ocs.zip
+mv $(find . -maxdepth 1 -type d -name ts_config_ocs\*) ts_config_ocs
+
+SCHEDULER_CONFIG_SCRIPT="ts_config_ocs/Scheduler/feature_scheduler/maintel/fbs_config_sv_survey.py"
+
+export SIM_ARCHIVE_LOG_FILE=${WORK_DIR}/sim_archive_log.txt
+export PRENIGHT_LOG_FILE=${WORK_DIR}/prenight_log.txt
+export DAYOBS="$(date -u +'%Y%m%d')"
+export ARCHIVE="s3://rubin:rubin-scheduler-prenight/opsim/"
+
+echo "Fetching completed visits"
+date --iso=s
+fetch_sv_visits ${DAYOBS} completed_visits.db ~/.usdf_access_token
+
+echo "Creating scheduler pickle"
+date --iso=s
+make_sv_scheduler scheduler.p --opsim completed_visits.db --config-script ${SCHEDULER_CONFIG_SCRIPT}
+
+echo "Creating model observatory"
+date --iso=s
+make_model_observatory observatory.p
+
+echo "Creating band scheduler"
+date --iso=s
+make_band_scheduler band_scheduler.p
+
+echo "Running nominal SV simulation"
+OPSIMRUN="prenight_nominal_$(date --iso=s)"
+LABEL="Nominal start and overhead, ideal conditions, run at $(date --iso=s)"
+date --iso=s
+run_sv_sim scheduler.p observatory.p "" ${DAYOBS} 3 "${OPSIMRUN}" \
+  --keep_rewards --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+  --delay 0 --anom_overhead_scale 0 \
+  --tags ideal nominal
+
+
+for DELAY in 10 60 ; do
+  echo "Running SV simulation delayed ${DELAY}"
+  OPSIMRUN="prenight_delay${DELAY}_$(date --iso=s)"
+  LABEL="Start time delayed by ${DELAY} minutes, nominal slew and visit overhead, ideal conditions, run at $(date --iso=s)"
+  date --iso=s
+  run_sv_sim scheduler.p observatory.p "" ${DAYOBS} 3 "${OPSIMRUN}" \
+    --keep_rewards --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+    --delay ${DELAY} --anom_overhead_scale 0 \
+    --tags ideal delay_${DELAY}
+done
+
+ANOM_SCALE="0.1"
+for ANOM_SEED in 101 102 ; do
+  echo "Running SV simulation with anomalous overhead seed ${ANOM_SEED}"
+  OPSIMRUN="prenight_anom${ANOM_SEED}_$(date --iso=s)"
+  LABEL="Anomalous overhead (${ANOM_SEED}, ${ANOM_SCALE}), nominal start, ideal conditions, run at $(date --iso=s)"
+  date --iso=s
+  run_sv_sim scheduler.p observatory.p "" ${DAYOBS} 3 "${OPSIMRUN}" \
+    --keep_rewards --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+    --delay 0 --anom_overhead_scale ${ANOM_SCALE} --anom_overhead_seed ${ANOM_SEED} \
+    --tags ideal anomalous_overhead
+done

rubin_sim-2.2.5.dev1/docs/prenight.rst

@@ -0,0 +1,117 @@
+.. py:currentmodule:: rubin_sim.data
+
+.. _prenight:
+
+============================================================
+Running pre-night simulations and adding them to the archive
+============================================================
+
+Introduction
+============
+
+Prenight simulation tools generate simulations of a few nights of observing, and add them to an archive.
+These simulations can then be seen by `schedview`'s reporting tools, and used to generate pre-night brifing reports.
+Normally, these simulation are run by submitting the `batch/run_prenight_sims.sh` script as a batch job, either by hand or using a cron job.
+For more fine-grained control, the simulations and be run and added to the archive using lower-level tools,
+
+Running a standard set of pre-night simulations
+===============================================
+
+The standard set of pre-night simulatios can be run by calling the `batch/run_prenight_sims.sh` shell (for SV) or `batch/run_auxtel_prenight_sims.sh` (for auxtel) scripts.
+
+If `RUBIN_SIM_DIR` is the `rubin_sim` root director, it can be called thus::
+
+    ${RUBIN_SIM_DIR}/batch/run_prenight_sims.sh
+
+or thus::
+
+    ${RUBIN_SIM_DIR}/batch/run_auxtel_prenight_sims.sh auxtel
+
+or they can be submitted as a batch job to slurm.
+At the USDF, there is an installation of `rubin_sim` at `/sdf/data/rubin/shared/scheduler/packages/rubin_sim` such that the commands become::
+
+    /sdf/data/rubin/shared/scheduler/packages/rubin_sim/batch/run_auxtel_prenight_sims.sh
+    sdf/data/rubin/shared/scheduler/packages/rubin_sim/batch/run_prenight_sims.sh
+
+
+These batch jobs will record their output in:
+
+* `/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.out` and
+* `/sdf/data/rubin/shared/scheduler/prenight/sbatch/run_prenight_sims_%A_%a.err`
+
+The working files can be found in `/sdf/data/rubin/shared/scheduler/prenight/work/run_prenight_sims/%Y-%m-%dT%H%M%`.
+
+Automated runs of prenight simulations
+======================================
+
+Batch jobs are submitted automatically each morning following the `sbatch` commands shown above.
+The `crontab` entries are::
+
+    15 6 * * * /opt/slurm/slurm-curr/bin/sbatch /sdf/data/rubin/shared/scheduler/packages/rubin_sim/batch/run_auxtel_prenight_sims.sh 2>&1 >> /sdf/data/rubin/shared/scheduler/prenight/daily/daily_auxtel_cron.out
+    30 6 * * * /opt/slurm/slurm-curr/bin/sbatch /sdf/data/rubin/shared/scheduler/packages/rubin_sim/batch/run_prenight_sims.sh 2>&1 >> /sdf/data/rubin/shared/scheduler/prenight/daily/daily_simonyi_cron.out
+
+
+Custom runs of prenight simulations
+===================================
+
+Much of the `run_prenight_sims.sh` script is dedicated to figuring out what environment to use and configuring it.
+If these defaults are not desired, a user can configure an environment to their liking, and run the simulation with the following steps.
+This environment must have the following installed:
+
+* `rubin_scheduler` (`github.com/lsst/rubin_sim`)
+* `schedview`  (`github.com/lsst/schedview`)
+* `ts_fbs_utils` (`github.com/lsst-ts/ts_fbs_utils.git`)
+* `sims_sv_survey` (`github.com/lsst-sims/sims_sv_survey`)
+* `rubin_nights` (`github.com/lsst-sims/rubin_night`)
+* `lsst_resources` (`github.com/lsst/resources`)
+
+First, retrieve the set of completed visits at the start of the nights to be simulated.
+For example::
+
+    DAYOBS="20250819"
+    COMPLETED_OPSIM_DB="completed_visits.db"
+    TOKEN_FILE="~/.usdf_access_token"
+    fetch_sv_visits ${DAYOBS} ${COMPLETED_OPSIM_DB} ${TOKEN_FILE}
+
+Second, create a pickle of the scheduler you want to run::
+
+    SCHEDULER_CONFIG_SCRIPT="ts_config_ocs/Scheduler/feature_scheduler/maintel/fbs_config_sv_survey.py"
+    SCHEDULER_PICKLE="scheduler.p"
+    COMPLETED_OPSIM_DB="completed_visits.db"
+    make_sv_scheduler ${SCHEDULER_PICKLE} --opsim ${COMPLETED_OPSIM_DB} --config-script ${SCHEDULER_CONFIG_SCRIPT}
+
+Third, create a model observatory pickle::
+
+    make_model_observatory observatory.p
+
+Fourch, create an band scheduler pickle::
+
+    make_band_scheduler band_scheduler.p
+
+Finally, run the sim (and add it to the archive)::
+
+    OPSIMRUN="prenight_nominal_$(date --iso=s)"
+    LABEL="Nominal start and overhead, ideal conditions, run at $(date --iso=s)"
+    NUM_NIGHTS=3
+    ARCHIVE="s3://rubin:rubin-scheduler-prenight/opsim/"
+    DELAY=0
+    ANOM_SCALE=0
+    ANOM_SEED=1
+    run_sv_sim \
+        ${SCHEDULER_PICKLE} \
+        observatory.p \
+        "" \
+        ${DAYOBS} \
+        ${NUM_NIGHTS} \
+        ${OPSIMRUN} \
+        --keep-rewards \
+        --no-downtime \
+        --label ${LABEL} \
+        --archive ${ARCHIVE} \
+        --capture-env \
+        --delay ${DELAY} \
+        --anom-overhead-scale ${ANOM_SCALE} \
+        --anom-overhead-seed ${ANOM_SEED} \
+        --tags mytag1 mytag2 mytag3
+
+See the output of `run_sv_sim --help` for the meanings of the options.

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/docs/user-guide.rst

@@ -23,4 +23,6 @@ User Guide
 
     Simulation archive <archive>
 
+    Prenight simulations <prenight>
+
     Skybrightness <skybrightness>

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/optional-requirements.txt

@@ -1,3 +1,4 @@
+conda
 openorb
 openorb-data-de405
 george

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "numpy",
     "pandas",
     "pyarrow",
-    "rubin-scheduler>=3.0",
+    "rubin-scheduler>=3.8",
     "scipy",
     "shapely",
     "skyfield>=1.52",

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/requirements.txt

@@ -1,7 +1,6 @@
 astropy-base
 astroplan
 colorcet
-conda
 cycler
 gitpython
 healpy
@@ -12,7 +11,7 @@ numexpr
 pandas
 pyarrow
 pytables
-rubin-scheduler >=3.0
+rubin-scheduler >=3.8
 scipy
 setuptools_scm
 setuptools_scm_git_archive

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/rubin_sim/data/rs_download_data.py

@@ -57,9 +57,9 @@ def data_dict() -> dict:
         "movingObjects": "movingObjects_oct_2021.tgz",
         "orbits": "orbits_2022_3_1.tgz",
         "orbits_precompute": "orbits_precompute_2023_05_23.tgz",
-        "sim_baseline": "sim_baseline_2025_03_03.tgz",
+        "sim_baseline": "sim_baseline_2025_09_02.tgz",
         "skybrightness": "skybrightness_2023_09_11.tgz",
-        "throughputs": "throughputs_2023_09_22.tgz",
+        "throughputs": "throughputs_2025_08_25.tgz",
         "tests": "tests_2024_04_23.tgz",
     }
     return file_dict

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/rubin_sim/maf/batches/col_map_dict.py

@@ -6,7 +6,44 @@ def col_map_dict(dict_name=None):
         dict_name = "FBS"
     dict_name = dict_name.lower()
 
-    if dict_name == "fbs" or dict_name == "opsimfbs":
+    if dict_name == "fbs":
+        col_map = {}
+        col_map["ra"] = "fieldRA"
+        col_map["dec"] = "fieldDec"
+        col_map["raDecDeg"] = True
+        col_map["mjd"] = "observationStartMJD"
+        col_map["exptime"] = "visitExposureTime"
+        col_map["visittime"] = "visitTime"
+        col_map["alt"] = "altitude"
+        col_map["az"] = "azimuth"
+        col_map["lst"] = "observationStartLST"
+        col_map["filter"] = "band"
+        col_map["band"] = "band"
+        col_map["fiveSigmaDepth"] = "fiveSigmaDepth"
+        col_map["night"] = "night"
+        col_map["slewtime"] = "slewTime"
+        col_map["slewdist"] = "slewDistance"
+        col_map["seeingEff"] = "seeingFwhmEff"
+        col_map["seeingGeom"] = "seeingFwhmGeom"
+        col_map["skyBrightness"] = "skyBrightness"
+        col_map["moonDistance"] = "moonDistance"
+        col_map["slewactivities"] = {}
+        col_map["metadataList"] = [
+            "airmass",
+            "normairmass",
+            "seeingEff",
+            "skyBrightness",
+            "fiveSigmaDepth",
+            "HA",
+            "moonDistance",
+            "solarElong",
+            "saturation_mag",
+        ]
+        col_map["metadataAngleList"] = ["rotSkyPos"]
+        col_map["scheduler_note"] = "scheduler_note"
+        col_map["scheduler_note_root"] = "scheduler_note_root"
+
+    elif dict_name == "fbs_sim" or dict_name == "opsimfbs":
         col_map = {}
         col_map["ra"] = "fieldRA"
         col_map["dec"] = "fieldDec"

{rubin_sim-2.2.3 → rubin_sim-2.2.5.dev1}/rubin_sim/maf/batches/common.py

@@ -29,7 +29,7 @@ def combine_info_labels(info1, info2):
     return info
 
 
-def filter_list(all=True, extra_sql=None, extra_info_label=None):
+def filter_list(all=True, extra_sql=None, extra_info_label=None, band_col="band"):
     """Return a list of filters, plot colors and orders.
 
     Parameters
@@ -41,6 +41,8 @@ def filter_list(all=True, extra_sql=None, extra_info_label=None):
         Additional sql constraint to add to constraints returned per filter.
     extra_info_label : `str`, optional
         Substitute info_label to add to info_label strings composed per band.
+    band_col : `str`, optional
+        The column name to use for the band (or filter).
 
     Returns
     -------
@@ -51,9 +53,9 @@ def filter_list(all=True, extra_sql=None, extra_info_label=None):
     info_labels : `dict` {`str`: `str}
     """
     if all:
-        filterlist = ("all", "u", "g", "r", "i", "z", "y")
+        bandlist = ("all", "u", "g", "r", "i", "z", "y")
     else:
-        filterlist = ("u", "g", "r", "i", "z", "y")
+        bandlist = ("u", "g", "r", "i", "z", "y")
     colors = {"u": "cyan", "g": "g", "r": "orange", "i": "r", "z": "m", "y": "b"}
     orders = {"u": 1, "g": 2, "r": 3, "i": 4, "z": 5, "y": 6}
     if all:
@@ -68,20 +70,20 @@ def filter_list(all=True, extra_sql=None, extra_info_label=None):
             md = "%s " % extra_sql
     else:
         md = "%s " % extra_info_label
-    for f in filterlist:
-        if f == "all":
-            sqls[f] = ""
-            info_labels[f] = md + "all bands"
+    for b in bandlist:
+        if b == "all":
+            sqls[b] = ""
+            info_labels[b] = md + "all bands"
         else:
-            sqls[f] = "filter = '%s'" % f
-            info_labels[f] = md + "%s band" % f
+            sqls[b] = f"{band_col} = '{b}'"
+            info_labels[b] = md + f"{b} band"
     if extra_sql is not None and len(extra_sql) > 0:
         for s in sqls:
             if s == "all":
                 sqls[s] = extra_sql
             else:
-                sqls[s] = "(%s) and (%s)" % (extra_sql, sqls[s])
-    return filterlist, colors, orders, sqls, info_labels
+                sqls[s] = f"({extra_sql}) and ({sqls[s]})"
+    return bandlist, colors, orders, sqls, info_labels
 
 
 def standard_summary(with_count=True):