move phasecentre coordinate parsing to within WSclean wrapper

Author: joshoewahp

dstools/cli/create_model.py

@@ -39,7 +39,10 @@
     "--config",
     type=click.Choice(CONFIGS),
     default="6km",
-    help="Array configuration, used to calculate image and pixel sizes if unspecified. ASKAP is equivalent to 6km.",
+    help=(
+        "Array configuration, used to calculate image and pixel sizes if unspecified. "
+        "ASKAP is equivalent to 6km."
+    ),
 )
 @click.option(
     "-N",
@@ -163,7 +166,10 @@
     type=str,
     nargs=2,
     default=None,
-    help="Coordinates of imaging phasecentre (provide as separate values, e.g. -p <RA> <DEC>).",
+    help=(
+        "Coordinates of imaging phasecentre. "
+        "Provide as separate values (e.g. -p <RA> <DEC>) in decimal degrees or sexagesimal."
+    ),
 )
 @click.option(
     "--name",

dstools/cli/extract_ds.py

@@ -33,14 +33,20 @@
     type=str,
     nargs=2,
     default=None,
-    help="Coordinates of phasecentre at which to extract DS (provide as separate values, e.g. -p <RA> <DEC>).",
+    help=(
+        "Coordinates of phasecentre at which to extract DS "
+        "(provide as separate values, e.g. -p <RA> <DEC>)."
+    ),
 )
 @click.option(
     "-P",
     "--primary-beam",
     type=Path,
     default=None,
-    help="Path to primary beam image with which to correct flux scale. Must also provide phasecentre.",
+    help=(
+        "Path to primary beam image with which to correct flux scale. "
+        " Must also provide phasecentre. Provide non-existent path to compute PB separately."
+    ),
 )
 @click.option(
     "-F",

dstools/imaging.py

@@ -17,6 +17,7 @@
 from dstools.logger import parse_stdout_stderr
 from dstools.mask import beam_shape_erode, minimum_absolute_clip
 from dstools.ms import MeasurementSet
+from dstools.utils import parse_coordinates
 
 logger = logging.getLogger(__name__)
 
@@ -253,7 +254,8 @@ def _phasecentre_args(self):
         if self.phasecentre is None:
             return ""
 
-        ra, dec = self.phasecentre
+        ra, dec = parse_coordinates(self.phasecentre).to_string("hmsdms").split()
+
         return f"-shift {ra} {dec}"
 
     @property

tests/test_imaging.py

@@ -118,18 +118,30 @@ def test_wsclean_run_command_args(mocker, ms_path):
     assert "-parallel-deconvolution 100" in cmd
 
 
+@pytest.mark.parametrize(
+    "phasecentre",
+    [
+        (281.2719, -63.9632),
+        ("281.2719", "-63.9632"),
+        ("18:45:05.256", "-63:57:47.520"),
+        ("18h45m05.256s", "-63d57m47.520s"),
+    ],
+)
+def test_wsclean_coordinate_parsing(phasecentre, mocker, ms_path):
     mocker.patch("subprocess.Popen")
     mocker.patch("dstools.imaging.parse_stdout_stderr")
 
     wsclean = WSClean(
         imsize=500,
         cellsize="0.66asec",
+        phasecentre=phasecentre,
     )
 
     # Abstract version of MS object, only needs access to path attribute
     mock_ms = mocker.Mock(path=ms_path)
     cmd = wsclean.run(mock_ms, name="test")
 
+    assert "-shift 18h45m05.256s -63d57m47.52s" in cmd
 
 
 def test_wsclean_run_command_multiscale(mocker, ms_path):