rubin-sim 2.2.5.dev5__tar.gz → 2.3.0__tar.gz

{rubin_sim-2.2.5.dev5/rubin_sim.egg-info → rubin_sim-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubin-sim
-Version: 2.2.5.dev5
+Version: 2.3.0
 Summary: Scheduler, survey strategy analysis, and other simulation tools for Rubin Observatory.
 License: GPL
 Project-URL: documentation, https://rubin-sim.lsst.io

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0}/batch/run_auxtel_prenight_sims.sh

@@ -50,8 +50,8 @@ export PATH=${PACKAGE_DIR}/bin:${PATH}
 # 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.dev5"
-SCHEDVIEW_REFERENCE="v0.19.0.dev1"
+RUBIN_SIM_REFERENCE="v2.3.0"
+SCHEDVIEW_REFERENCE="v0.19.0"
 
 pip install --no-deps --target=${PACKAGE_DIR} \
   git+https://github.com/lsst/rubin_sim.git@${RUBIN_SIM_REFERENCE} \

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0}/batch/run_prenight_sims.sh

@@ -7,8 +7,8 @@
 #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)
+#SBATCH --mem=8G                       # Requested memory
+#SBATCH --time=1:30:00                 # Wall time (hh:mm:ss)
 
 echo "******** START of run_prenight_sims.sh **********"
 
@@ -50,10 +50,10 @@ export PATH=${PACKAGE_DIR}/bin:${PATH}
 # 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.dev5"
-SCHEDVIEW_REFERENCE="v0.19.0.dev1"
-SIMS_SV_SURVEY_REFERENCE="v0.1.0.dev2"
-RUBIN_NIGHTS_REFERENCE="v0.3.0"
+RUBIN_SIM_REFERENCE="v2.3.0"
+SCHEDVIEW_REFERENCE="v0.19.0"
+SIMS_SV_SURVEY_REFERENCE="v0.1.1"
+RUBIN_NIGHTS_REFERENCE="v0.4.0"
 
 pip install --no-deps --target=${PACKAGE_DIR} \
   git+https://github.com/lsst/rubin_sim.git@${RUBIN_SIM_REFERENCE} \
@@ -109,7 +109,7 @@ 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}" \
-  --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+  --keep_rewards --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
   --delay 0 --anom_overhead_scale 0 \
   --tags ideal nominal
 
@@ -120,7 +120,7 @@ for DELAY in 10 60 ; do
   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}" \
-    --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+    --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
     --delay ${DELAY} --anom_overhead_scale 0 \
     --tags ideal delay_${DELAY}
 done
@@ -132,7 +132,7 @@ for ANOM_SEED in 101 102 ; do
   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}" \
-    --no-downtime --label "${LABEL}" --archive ${ARCHIVE} --capture_env \
+    --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.dev5 → rubin_sim-2.3.0}/rubin_sim/data/rs_download_data.py

@@ -54,7 +54,7 @@ def data_dict() -> dict:
     file_dict = {
         "maf": "maf_2024_06_13.tgz",
         "maps": "maps_2022_2_28.tgz",
-        "movingObjects": "movingObjects_oct_2021.tgz",
+        "movingObjects": "movingObjects_2025_07_15.tgz",
         "orbits": "orbits_2022_3_1.tgz",
         "orbits_precompute": "orbits_precompute_2023_05_23.tgz",
         "sim_baseline": "sim_baseline_2025_09_02.tgz",

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0}/rubin_sim/maf/batches/col_map_dict.py

@@ -43,6 +43,42 @@ def col_map_dict(dict_name=None):
         col_map["scheduler_note"] = "scheduler_note"
         col_map["scheduler_note_root"] = "scheduler_note_root"
 
+    elif dict_name == "consdb":
+        col_map = {}
+        col_map["ra"] = "s_ra"
+        col_map["dec"] = "s_dec"
+        col_map["raDecDeg"] = True
+        col_map["mjd"] = "obs_start_mjd"
+        col_map["exptime"] = "exp_time"
+        col_map["visittime"] = "dark_time"
+        col_map["alt"] = "altitude"
+        col_map["az"] = "azimuth"
+        col_map["filter"] = "band"
+        col_map["band"] = "band"
+        col_map["fiveSigmaDepth"] = "stats_mag_lim_median"
+        col_map["night"] = "day_obs"
+        col_map["slewtime"] = "slew_time"
+        col_map["slewdist"] = "slew_distance"
+        col_map["seeingEff"] = "fwhm_eff"
+        col_map["seeingGeom"] = "fwhm_geom"
+        col_map["skyBrightness"] = "sky_bg_median_mag"
+        col_map["moonDistance"] = "moon_distance"
+        col_map["slewactivities"] = {}
+        col_map["metadataList"] = [
+            "airmass",
+            "normairmass",
+            "fwhm_eff",
+            "sky_bg_median_mag",
+            "stats_mag_lim_median",
+            "HA",
+            "moon_distance",
+            "solarElong",
+            "saturation_mag",
+        ]
+        col_map["metadataAngleList"] = ["sky_rotation"]
+        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"

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0}/rubin_sim/maf/metric_bundles/metric_bundle.py

@@ -254,6 +254,7 @@ class MetricBundle:
             info_label = metadata
         if info_label is None:
             self.info_label = self.constraint.replace("=", "").replace("filter", "").replace("'", "")
+            self.info_label = self.info_label.replace("band", "")
             self.info_label = self.info_label.replace('"', "").replace("  ", " ")
             self.info_label = self.info_label.strip(" ")
         else:
@@ -278,7 +279,7 @@ class MetricBundle:
 
     def _find_req_cols(self):
         """Find the columns needed by the metrics, slicers, and stackers.
-        If there are any additional stackers required, instatiate them
+        If there are any additional stackers required, instantiate them
         and add them to the self.stackers list.
         (default stackers have to be instantiated to determine
         what additional columns are needed from database).

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0/rubin_sim.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubin-sim
-Version: 2.2.5.dev5
+Version: 2.3.0
 Summary: Scheduler, survey strategy analysis, and other simulation tools for Rubin Observatory.
 License: GPL
 Project-URL: documentation, https://rubin-sim.lsst.io

{rubin_sim-2.2.5.dev5 → rubin_sim-2.3.0}/rubin_sim.egg-info/SOURCES.txt

@@ -379,6 +379,7 @@ tests/moving_objects/test_chebyshevutils.py
 tests/moving_objects/test_chebyvalues.py
 tests/moving_objects/test_ephemerides.py
 tests/moving_objects/test_orbits.py
+tests/moving_objects/test_sed_data.py
 tests/phot_utils/test_approximatebandpasses.py
 tests/phot_utils/test_photometricparameters.py
 tests/phot_utils/test_photometry.py

rubin_sim-2.3.0/tests/moving_objects/test_sed_data.py

@@ -0,0 +1,61 @@
+import os
+import unittest
+
+from rubin_scheduler.data import get_data_dir
+
+import rubin_sim.phot_utils as phot_utils
+
+
+class SedDataUnitTest(unittest.TestCase):
+
+    def setUp(self) -> None:
+        # Read the lsst bandpasses
+        lsst = {}
+        lsst_filterlist = "ugrizy"
+        for b in lsst_filterlist:
+            lsst[b] = phot_utils.Bandpass()
+            lsst[b].read_throughput(os.path.join(get_data_dir(), "throughputs", "baseline", f"total_{b}.dat"))
+        self.lsst = lsst
+
+    def test_sun(self) -> None:
+        sun = phot_utils.Sed()
+        sun.read_sed_flambda(os.path.join(get_data_dir(), "movingObjects", "kurucz_sun.gz"))
+        expected_mags = {"u": -25.3, "g": -26.5, "r": -27.0, "i": -27.0, "z": -27.1, "y": -27.1}
+        for b in "ugrizy":
+            mag = sun.calc_mag(self.lsst[b])
+            self.assertTrue(abs(mag - expected_mags[b]) < 0.2)
+
+    def test_seds(self):
+        # We have some sample asteroid spectra in rubin_sim_data_dir -
+        # However, those are 'observed' spectra
+        # (already includes a sample solar spectra)
+        ast_templates = [
+            k.replace(".dat.gz", "")
+            for k in os.listdir(os.path.join(get_data_dir(), "movingObjects"))
+            if "kurucz" not in k and "harris" not in k
+        ]
+        # Read the sso seds from disk (using rubin_sim.photUtils.Sed)
+        sso = {}
+        for k in ast_templates:
+            sso[k] = phot_utils.Sed()
+            sso[k].read_sed_flambda(os.path.join(get_data_dir(), "movingObjects", f"{k}.dat.gz"))
+
+        # Calculate the colors for each type:
+        # referenc e bandpass first
+        refband_name = "r"
+        refband = self.lsst[refband_name]
+        # Calculate the reference bandpass magnitudes
+        refmags = {}
+        for k in sso:
+            refmags[k] = sso[k].calc_mag(refband)
+
+        # And now the colors
+        colors = {}
+        for k in sso:
+            colors[k] = {}
+            for f in "ugrizy":
+                colors[k][f"lsst_{f}"] = sso[k].calc_mag(self.lsst[f]) - refmags[k]
+
+
+if __name__ == "__main__":
+    unittest.main()