Merge pull request #88 from simonsobs/koopman/set-scan-params

Add `acu.set_scan_params` and rely on set params during `seq.scan`
simonsobs · Oct 23, 2023 · 4b54283 · 4b54283
2 parents 812b01e + 010e13a
commit 4b54283
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/sorunlib/acu.py b/src/sorunlib/acu.py
@@ -33,3 +33,20 @@ def set_boresight(target):
         check_response(resp)
     else:
         raise RuntimeError(f"Platform type {platform} does not support boresight motion")
+
+
+def set_scan_params(az_speed, az_accel, reset=False):
+    """Update the default scan parameters, used during :func:`sorunlib.seq.scan`.
+
+    Args:
+        az_speed (float, optional): The azimuth scan speed.
+        az_accel (float, optional): The (average) azimuth acceleration at
+            turn-around.
+        reset (bool, optional): If True, reset all params to default values
+            before applying any updates passed explicitly here.
+
+    """
+    resp = run.CLIENTS['acu'].set_scan_params(az_speed=az_speed,
+                                              az_accel=az_accel,
+                                              reset=reset)
+    check_response(resp)
diff --git a/src/sorunlib/seq.py b/src/sorunlib/seq.py
@@ -31,10 +31,10 @@ def scan(description, stop_time, width, az_drift=0, tag=None, subtype=None):
         el = resp.session['data']['StatusDetailed']['Elevation current position']
 
         # Start telescope motion
+        # az_speed and az_accel assumed from ACU defaults
+        # Can be modified by acu.set_scan_params()
         resp = run.CLIENTS['acu'].generate_scan.start(az_endpoint1=az,
                                                       az_endpoint2=az + width,
-                                                      az_speed=2,
-                                                      az_accel=2.0,
                                                       el_endpoint1=el,
                                                       el_endpoint2=el,
                                                       el_speed=0,

diff --git a/tests/test_acu.py b/tests/test_acu.py
@@ -66,3 +66,13 @@ def test_move_to_failed():
     acu.run.CLIENTS['acu'].go_to.side_effect = [mocked_response]
     with pytest.raises(RuntimeError):
         acu.move_to(180, 90)
+
+
+@patch('sorunlib.create_clients', mocked_clients)
+def test_set_scan_params():
+    acu.run.initialize(test_mode=True)
+    acu.set_scan_params(az_speed=2, az_accel=2, reset=True)
+    acu.run.CLIENTS['acu'].set_scan_params.assert_called_with(
+        az_speed=2,
+        az_accel=2,
+        reset=True)