rubin-sim 2.2.5.dev6__tar.gz → 2.4.0__tar.gz

{rubin_sim-2.2.5.dev6/rubin_sim.egg-info → rubin_sim-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubin-sim
-Version: 2.2.5.dev6
+Version: 2.4.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.dev6 → rubin_sim-2.4.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.dev6"
-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.dev6 → rubin_sim-2.4.0}/batch/run_prenight_sims.sh

@@ -8,7 +8,7 @@
 #SBATCH --ntasks=1                      # Number of tasks run in parallel
 #SBATCH --cpus-per-task=1               # Number of CPUs per task
 #SBATCH --mem=8G                       # Requested memory
-#SBATCH --time=1:00:00                 # Wall time (hh:mm:ss)
+#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.dev6"
-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.dev6 → rubin_sim-2.4.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.dev6 → rubin_sim-2.4.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.dev6 → rubin_sim-2.4.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.dev6 → rubin_sim-2.4.0}/rubin_sim/maf/slicers/base_spatial_slicer.py

@@ -56,6 +56,8 @@ class BaseSpatialSlicer(BaseSlicer):
         Equivalent to the radius of the FOV, in degrees.
     use_camera : `bool`, optional
         Flag to indicate whether to use the LSST camera footprint or not.
+    camera_radius : `float`, optional
+        max_radius for the LsstCameraFootprint (degrees).
     camera_footprint_file : `str`, optional
         Name of the camera footprint map to use.
         Can be None, which will use the default file.
@@ -72,6 +74,7 @@ class BaseSpatialSlicer(BaseSlicer):
         leafsize=100,
         radius=2.45,
         use_camera=True,
+        camera_radius=1.94,
         camera_footprint_file=None,
     ):
         super().__init__(verbose=verbose, badval=badval)
@@ -81,6 +84,7 @@ class BaseSpatialSlicer(BaseSlicer):
         self.rotSkyPosColName = rot_sky_pos_col_name
         self.columns_needed = [lon_col, lat_col, rot_sky_pos_col_name]
         self.use_camera = use_camera
+        self.camera_radius = camera_radius
         self.camera_footprint_file = camera_footprint_file
         self.radius = radius
         self.leafsize = leafsize
@@ -182,7 +186,7 @@ class BaseSpatialSlicer(BaseSlicer):
     def _setupLSSTCamera(self):
         """If we want to include the camera chip gaps, etc."""
         self.camera = simsUtils.LsstCameraFootprint(
-            units="radians", footprint_file=self.camera_footprint_file
+            units="radians", footprint_file=self.camera_footprint_file, max_radius=self.camera_radius
         )
 
     def _build_tree(self, sim_dataRa, sim_dataDec, leafsize=100):

{rubin_sim-2.2.5.dev6 → rubin_sim-2.4.0}/rubin_sim/maf/slicers/healpix_slicer.py

@@ -72,6 +72,8 @@ class HealpixSlicer(BaseSpatialSlicer):
         Equivalent to the radius of the FOV. Degrees.
     use_camera : `bool`, optional
         Flag to indicate whether to use the LSST camera footprint or not.
+    camera_radius : `float`, optional
+        max_radius for the LsstCameraFootprint (degrees).
     camera_footprint_file : `str`, optional
         Name of the camera footprint map to use.
         Can be None, which will use the default footprint map.
@@ -96,6 +98,7 @@ class HealpixSlicer(BaseSpatialSlicer):
         leafsize=100,
         radius=2.45,
         use_camera=True,
+        camera_radius=1.94,
         camera_footprint_file=None,
         rot_sky_pos_col_name="rotSkyPos",
         badval=np.nan,
@@ -108,6 +111,7 @@ class HealpixSlicer(BaseSpatialSlicer):
             radius=radius,
             leafsize=leafsize,
             use_camera=use_camera,
+            camera_radius=camera_radius,
             camera_footprint_file=camera_footprint_file,
             rot_sky_pos_col_name=rot_sky_pos_col_name,
             lat_lon_deg=lat_lon_deg,

{rubin_sim-2.2.5.dev6 → rubin_sim-2.4.0}/rubin_sim/maf/slicers/healpix_subset_slicer.py

@@ -24,7 +24,7 @@ def make_circle_subset_slicer(ra_cen, dec_cen, radius=3.0, nside=512, use_cache=
     dec_cen : `float`
         Dec of the center of the slicer (degrees).
     radius : `float`, optional
-        Radius of the circular slicer shape (degrees).
+        Radius of the circular slicer extent (degrees).
     nside : `int`, optional
         Nside resolution of the healpix subset slicer.
     use_cache : `bool`, optional
@@ -137,6 +137,8 @@ class HealpixSubsetSlicer(HealpixSlicer):
     use_camera : `bool`, optional
         Flag to indicate whether to use the LSST camera footprint or not.
         Default False.
+    camera_radius : `float`, optional
+        max_radius for the LsstCameraFootprint (degrees).
     camera_footprint_file : `str`, optional
         Name of the camera footprint map to use. Can be None, which will
         use the default.
@@ -160,6 +162,7 @@ class HealpixSubsetSlicer(HealpixSlicer):
         leafsize=100,
         radius=2.45,
         use_camera=True,
+        camera_radius=1.94,
         camera_footprint_file=None,
         rot_sky_pos_col_name="rotSkyPos",
     ):
@@ -173,6 +176,7 @@ class HealpixSubsetSlicer(HealpixSlicer):
             radius=radius,
             leafsize=leafsize,
             use_cache=use_cache,
+            camera_radius=camera_radius,
             use_camera=use_camera,
             rot_sky_pos_col_name=rot_sky_pos_col_name,
             camera_footprint_file=camera_footprint_file,

{rubin_sim-2.2.5.dev6 → rubin_sim-2.4.0}/rubin_sim/maf/slicers/user_points_slicer.py

@@ -45,6 +45,8 @@ class UserPointsSlicer(BaseSpatialSlicer):
     use_camera : `bool`, optional
         Flag to indicate whether to use the LSST camera footprint or not.
         Default True.
+    camera_radius : `float`, optional
+        max_radius for the LsstCameraFootprint (degrees).
     camera_footprint_file : `str`, optional
         Name of the camera footprint map to use.
         Can be None, which will use the default.
@@ -67,6 +69,7 @@ class UserPointsSlicer(BaseSpatialSlicer):
         leafsize=100,
         radius=2.45,
         use_camera=True,
+        camera_radius=1.94,
         camera_footprint_file=None,
         rot_sky_pos_col_name="rotSkyPos",
     ):
@@ -79,6 +82,7 @@ class UserPointsSlicer(BaseSpatialSlicer):
             radius=radius,
             leafsize=leafsize,
             use_camera=use_camera,
+            camera_radius=camera_radius,
             camera_footprint_file=camera_footprint_file,
             rot_sky_pos_col_name=rot_sky_pos_col_name,
         )

{rubin_sim-2.2.5.dev6 → rubin_sim-2.4.0/rubin_sim.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rubin-sim
-Version: 2.2.5.dev6
+Version: 2.4.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.dev6 → rubin_sim-2.4.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.2.5.dev6 → rubin_sim-2.4.0}/tests/maf/test_healpixslicer.py

@@ -301,6 +301,93 @@ class TestHealpixChipGap(unittest.TestCase):
                     self.assertIn(self.dv["testdata"][indx], self.dv["testdata"][didxs])
 
 
+class TestHealpixCameraRadius(unittest.TestCase):
+    # Check that setting the camera radius to a smaller value
+    # reduces the number of points matched (that we are using
+    # LsstCameraFootprint correctly)
+
+    def setUp(self):
+        self.nside = 8
+        self.radius = 2.041
+        self.testslicer = HealpixSlicer(
+            nside=self.nside,
+            verbose=False,
+            lon_col="ra",
+            lat_col="dec",
+            lat_lon_deg=False,
+            radius=self.radius,
+            use_camera=True,
+        )
+        self.camera_radius = 0.5
+        self.testsmallslicer = HealpixSlicer(
+            nside=self.nside,
+            verbose=False,
+            lon_col="ra",
+            lat_col="dec",
+            lat_lon_deg=False,
+            radius=self.radius,
+            use_camera=True,
+            camera_radius=self.camera_radius,
+        )
+        nvalues = 100
+        self.dv = make_data_values(
+            size=nvalues * hp.nside2npix(self.nside),
+            minval=0.0,
+            maxval=1.0,
+            ramin=0,
+            ramax=2 * np.pi,
+            decmin=-np.pi,
+            decmax=0,
+            random=55,
+        )
+        # Replace ra/dec to make them close to healpix points
+        hpix = np.arange(0, hp.nside2npix(self.nside))
+        ra, dec = hp.pix2ang(nside=self.nside, ipix=hpix, lonlat=True)
+        rng = np.random.RandomState(1147)
+        rr = rng.rand(nvalues) * 1.5
+        ra = (ra[:, np.newaxis] + rr).reshape(len(ra) * len(rr))
+        dec = (dec[:, np.newaxis] + rr).reshape(len(dec) * len(rr))
+        self.dv["ra"] = np.radians(ra)
+        self.dv["dec"] = np.radians(dec)
+
+    def tearDown(self):
+        del self.testslicer
+        self.testslicer = None
+        del self.testsmallslicer
+        self.testsmallslicer = None
+
+    def test_slicing(self):
+        """Test slicing returns (most) data points which are
+        within 'radius' of bin point or camera_radius for small slicer"""
+        # Test that slicing fails before setup_slicer
+        self.assertRaises(NotImplementedError, self.testslicer._slice_sim_data, 0)
+        # Set up and test actual slicing.
+        self.testslicer.setup_slicer(self.dv)
+        self.testsmallslicer.setup_slicer(self.dv)
+        for s, ss in zip(self.testslicer, self.testsmallslicer):
+            ra = s["slice_point"]["ra"]
+            dec = s["slice_point"]["dec"]
+            # Find the points of 'dv' which are within self.radius of
+            # this slice_point
+            distances = calc_dist_vincenty(ra, dec, self.dv["ra"], self.dv["dec"])
+            didxs = np.where(distances <= np.radians(self.radius))
+            # find the indexes of dv which the slicer says are in the
+            # camera footprint
+            sidxs = s["idxs"]
+            self.assertLessEqual(len(sidxs), len(didxs[0]))
+            if len(sidxs) > 0:
+                for indx in sidxs:
+                    self.assertIn(self.dv["testdata"][indx], self.dv["testdata"][didxs])
+            # find the indexes of dv which the slicer says are in the
+            # camera footprint
+            sidxs = ss["idxs"]
+            self.assertLessEqual(len(sidxs), len(didxs[0]))
+            if len(sidxs) > 0:
+                for indx in sidxs:
+                    self.assertIn(self.dv["testdata"][indx], self.dv["testdata"][didxs])
+            self.assertLess(len(ss["idxs"]), len(s["idxs"]))
+
+
 class TestHealpixSlicerPlotting(unittest.TestCase):
     def setUp(self):
         rng = np.random.RandomState(713244122)

rubin_sim-2.4.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()