add utils data

lsst · Nov 2, 2023 · e191362 · e191362
1 parent e40a7ea
commit e191362
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/rubin_scheduler/data/scheduler_download_data.py b/rubin_scheduler/data/scheduler_download_data.py
@@ -32,6 +32,7 @@ def data_dict():
         "scheduler": "scheduler_2023_10_16.tgz",
         "site_models": "site_models_2023_10_02.tgz",
         "skybrightness_pre": "skybrightness_pre_2023_10_17.tgz",
+        "utils": "utils_2023_11_02.tgz",
     }
     return file_dict
 

diff --git a/rubin_scheduler/utils/camera_footprint.py b/rubin_scheduler/utils/camera_footprint.py
@@ -35,7 +35,7 @@ class LsstCameraFootprint:
 
     def __init__(self, units="degrees", footprint_file=None):
         if footprint_file is None:
-            footprint_file = os.path.join(get_data_dir(), "maf", "fov_map.npz")
+            footprint_file = os.path.join(get_data_dir(), "utils", "fov_map.npz")
         _temp = np.load(footprint_file)
         # Units refers to the incoming ra/dec values in the _call__ method
         # Internally, radians are used to calculate the footprint

diff --git a/tests/utils/test_camerafootprint.py b/tests/utils/test_camerafootprint.py
@@ -1,9 +1,7 @@
-import os
 import unittest
 
 import numpy as np
 
-from rubin_scheduler.data import get_data_dir
 from rubin_scheduler.utils import LsstCameraFootprint
 
 
@@ -18,7 +16,6 @@ def setUp(self):
     def test_camera(self):
         camera = LsstCameraFootprint(
             units="degrees",
-            footprint_file=os.path.join(get_data_dir(), "tests", "fov_map.npz"),
         )
         idx_obs = camera(self.obj_ra, self.obj_dec, self.obs_ra, self.obs_dec, self.obs_rot_sky_pos)
         # The first of these objects should be in the middle of the FOV, while the second is outside

diff --git a/tests/utils/test_trixel.py b/tests/utils/test_trixel.py
@@ -562,7 +562,7 @@ def test_against_fatboy(self):
         """
         dtype = np.dtype([("htmid", int), ("ra", float), ("dec", float)])
         data = np.genfromtxt(
-            os.path.join(get_data_dir(), "tests", "testData", "htmid_test_data.txt"),
+            os.path.join(get_data_dir(), "utils", "htmid_test_data.txt"),
             dtype=dtype,
         )
         self.assertGreater(len(data), 20)