Merge pull request #78 from lsst/u/yoachim/longer-readout

increase read time to 2.4s
lsst · Aug 1, 2024 · 8cbed76 · 8cbed76
2 parents 08b1603 + 50da7b6
commit 8cbed76
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/rubin_scheduler/scheduler/model_observatory/kinem_model.py b/rubin_scheduler/scheduler/model_observatory/kinem_model.py
@@ -95,7 +95,7 @@ def mount_filters(self, filter_list):
 
     def setup_camera(
         self,
-        readtime=2.0,
+        readtime=2.4,
         shuttertime=1.0,
         filter_changetime=120.0,
         fov=3.5,

diff --git a/rubin_scheduler/scheduler/surveys/surveys.py b/rubin_scheduler/scheduler/surveys/surveys.py
@@ -159,7 +159,7 @@ def __init__(
         filtername2="g",
         slew_approx=7.5,
         filter_change_approx=140.0,
-        read_approx=2.0,
+        read_approx=2.4,
         exptime=30.0,
         nexp=2,
         nexp_dict=None,

diff --git a/rubin_scheduler/scheduler/surveys/too_surveys.py b/rubin_scheduler/scheduler/surveys/too_surveys.py
@@ -100,7 +100,7 @@ def __init__(
         filtername2=None,
         slew_approx=7.5,
         filter_change_approx=140.0,
-        read_approx=2.0,
+        read_approx=2.4,
         exptime=30.0,
         nexp=2,
         ideal_pair_time=22.0,

diff --git a/tests/scheduler/test_utils.py b/tests/scheduler/test_utils.py
@@ -114,18 +114,13 @@ def test_altaz_limit(self):
         )
 
         az = np.degrees(observations["az"])
-        forbidden = np.where((az > 90) & (az < 270))[0]
+
         # Let a few pairs try to complete since by default we don't
         # use an agressive shadow_minutes
-        n_forbidden = np.size(
-            [
-                obs
-                for obs in observations[forbidden]["scheduler_note"]
-                if (("pair_33" not in obs) | (", b" not in obs))
-            ]
-        )
+        pad = 2
+        forbidden = np.where((az > 90 + pad) & (az < 270 - pad))[0]
 
-        assert n_forbidden == 0
+        assert forbidden.size == 0
 
         km = KinemModel(mjd0=mjd_start)
         km.setup_telescope(alt_limits=[[40.0, 70.0]])