Merge pull request #87 from simonsobs/koopman/stream-subtype

Accept subtype tag in `smurf.stream` and `seq.scan`
simonsobs · Oct 23, 2023 · 812b01e · 812b01e
2 parents fce66ec + 5caad2a
commit 812b01e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/sorunlib/seq.py b/src/sorunlib/seq.py
@@ -5,7 +5,7 @@
 OP_TIMEOUT = 60
 
 
-def scan(description, stop_time, width, az_drift=0, tag=None):
+def scan(description, stop_time, width, az_drift=0, tag=None, subtype=None):
     """Run a constant elevation scan, collecting detector data.
 
     Args:
@@ -18,10 +18,11 @@ def scan(description, stop_time, width, az_drift=0, tag=None):
             accordingly.
         tag (str, optional): Tag or comma-separated listed of tags to attach to
             the operation. Passed through to the smurf stream command.
+        subtype (str, optional): Operation subtype used to tag the stream.
 
     """
     # Enable SMuRF streams
-    run.smurf.stream('on', tag=tag)
+    run.smurf.stream('on', subtype=subtype, tag=tag)
 
     try:
         # Grab current telescope position

diff --git a/src/sorunlib/smurf.py b/src/sorunlib/smurf.py
@@ -122,18 +122,19 @@ def take_noise(tag=None):
         check_response(resp)
 
 
-def stream(state, tag=None):
+def stream(state, tag=None, subtype=None):
     """Stream data on all SMuRF Controllers.
 
     Args:
         state (str): Streaming state, either 'on' or 'off'.
         tag (str, optional): Tag or comma-separated listed of tags to attach to
             the operation.
+        subtype (str, optional): Operation subtype used to tag the stream.
 
     """
     if state.lower() == 'on':
         for smurf in run.CLIENTS['smurf']:
-            smurf.stream.start(tag=tag)
+            smurf.stream.start(subtype=subtype, tag=tag)
 
     else:
         for smurf in run.CLIENTS['smurf']: