streamlined handling of grab arguments

HiPERCAM · May 26, 2021 · 4d5ae4e · 4d5ae4e
1 parent 203f272
commit 4d5ae4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/hipercam/scripts/makedark.py b/hipercam/scripts/makedark.py
@@ -169,15 +169,10 @@ def makedark(args=None):
 
         print("\nCalling 'grab' ...")
 
-        args = [None, "prompt", source, "yes"]
+        args = [None, "prompt", source, "yes", resource]
 
         if server_or_local:
-            args += [
-                resource, str(first), str(last),
-                str(twait), str(tmax)
-            ]
-        else:
-            args += [flist]
+            args += [str(first), str(last), str(twait), str(tmax)]
 
         args += [
             "no",

diff --git a/hipercam/scripts/makeflat.py b/hipercam/scripts/makeflat.py
@@ -288,16 +288,9 @@ def makeflat(args=None):
 
         print("\nCalling 'grab' ...")
 
-        args = [None, "prompt", source, "yes"]
-
+        args = [None, "prompt", source, "yes", resource]
         if server_or_local:
-            args += [
-                resource, str(first), str(last),
-                str(twait), str(tmax)
-            ]
-        else:
-            args += [flist]
-
+            args += [str(first), str(last),str(twait), str(tmax)]
         args += [
             "no",
             "none" if bias is None else bias,

diff --git a/hipercam/scripts/makefringe.py b/hipercam/scripts/makefringe.py
@@ -152,7 +152,7 @@ def makefringe(args=None):
         cl.register("dark", Cline.LOCAL, Cline.PROMPT)
         cl.register("flat", Cline.LOCAL, Cline.PROMPT)
         cl.register("fpair", Cline.LOCAL, Cline.PROMPT)
-        cl.register("nhalf", Cline.LOCAL, Cline.HIDE)
+        cl.register("nhalf", Cline.LOCAL, Cline.PROMPT)
         cl.register("ccd", Cline.LOCAL, Cline.PROMPT)
         cl.register("fwhm", Cline.LOCAL, Cline.PROMPT)
         cl.register("clobber", Cline.LOCAL, Cline.HIDE)
@@ -256,14 +256,9 @@ def makefringe(args=None):
 
         print("\nCalling 'grab' ...")
 
-        args = [None, "prompt", source, "yes"]
+        args = [None, "prompt", source, "yes", resource]
         if server_or_local:
-            args += [
-                resource, str(first), str(last),
-                str(twait), str(tmax)
-            ]
-        else:
-            args += [flist]
+            args += [str(first), str(last), str(twait), str(tmax)]
         args += [
             "no",
             "none" if bias is None else bias,