@@ -7,6 +7,7 @@
     'astropy',
     'attrs',
     'click',
+    'drive-casa>=0.7.6',
     'pandas',
     'pytest',
     'six',
@@ -31,6 +32,7 @@
             fastimg_extract_lsm=fastimgproto.scripts.extract_lsm:cli
             fastimg_simpipe=fastimgproto.scripts.simpipe:cli
             fastimg_simple_imager=fastimgproto.scripts.simple_imager:cli
+            fastimg_simulate_vis_with_casa=fastimgproto.scripts.simulate_vis_with_casa:cli
             fastimg_sourcefind=fastimgproto.scripts.sourcefind:cli
         ''',
 )
@@ -1,13 +1,19 @@
 from __future__ import print_function
+
 import os
+import shutil
+
+import astropy.units as u
 import drivecasa
 import drivecasa.commands.simulation as sim
-from drivecasa.utils import ensure_dir
-import astropy.units as u
+import drivecasa.commands.subroutines
 from astropy.time import Time
+from drivecasa.utils import ensure_dir
 from fastimgproto.pipeline.data import vla_c_antennalist_path
 
-def simulate_vis_with_casa(pointing_centre, source_list, output_dir):
+
+def simulate_vis_with_casa(pointing_centre, source_list, vis_path,
+                           overwrite=True, echo=False):
     """
     Use casapy to simulate a visibility measurementset with noise.
 
@@ -16,28 +22,41 @@ def simulate_vis_with_casa(pointing_centre, source_list, output_dir):
     Args:
         pointing_centre (:class:`astropy.coordinates.SkyCoord`)
         source_list: list of :class:`fastimgproto.skymodel.helpers.SkySource`
-        output_dir (str): Output directory which will contain `vis.ms`
+        vis_path (str): Path to visibilities generated.
+        echo (bool): Echo the CASA output to terminal during processing.
 
     Returns (str): Full path to `vis.ms`.
     """
 
-    ensure_dir(output_dir)
 
-    commands_logfile = os.path.join(output_dir, "./casa-visibilities_for_point_source-commands.log")
-    component_list_path = os.path.join(output_dir, './sources.cl')
-    output_visibility = os.path.abspath(os.path.join(output_dir, './vis.ms'))
+    vis_abspath = os.path.abspath(vis_path)
+    commands_logfile = vis_abspath + "_casa_commands.log"
+    casa_logfile = vis_abspath + "_casa_log.log"
+    component_list_path = vis_abspath + "_sources.cl"
 
+    for outdir in vis_abspath, component_list_path:
+        if os.path.isdir(outdir):
+            if overwrite:
+                shutil.rmtree(outdir)
+            else:
+                raise IOError("{} already present and overwrite==False.".format(
+                    outdir
+                ))
     if os.path.isfile(commands_logfile):
-        os.unlink(commands_logfile)
-    casa = drivecasa.Casapy(commands_logfile=commands_logfile)
+        os.remove(commands_logfile)
+    ensure_dir(os.path.dirname(vis_abspath))
+
+    casa = drivecasa.Casapy(commands_logfile=commands_logfile,
+                            casa_logfile=casa_logfile,
+                            echo_to_stdout=echo)
     script = []
+    # Add subroutine definition, for manual reproduction with CASA:
+    script.append(drivecasa.drivecasa.commands.subroutines.def_load_antennalist)
 
+    # Define some observation parameters...
     # For VLA reference numbers, see:
     # https://science.nrao.edu/facilities/vla/docs/manuals/oss/performance/fov
     # https://science.nrao.edu/facilities/vla/docs/manuals/oss/performance/resolution
-
-
-    # Define some observation parameters:
     obs_central_frequency = 3. * u.GHz
     obs_frequency_bandwidth = 0.125 * u.GHz
     primary_beam_fwhm = (45. * u.GHz / obs_central_frequency) * u.arcmin
@@ -49,7 +68,7 @@ def simulate_vis_with_casa(pointing_centre, source_list, output_dir):
         out_path=component_list_path)
 
     # Open the visibility file
-    sim.open_sim(script, output_visibility)
+    sim.open_sim(script, vis_abspath)
 
     # Configure the virtual telescope
     # sim.setpb(script,
@@ -81,5 +100,5 @@ def simulate_vis_with_casa(pointing_centre, source_list, output_dir):
     sim.corrupt(script)
     sim.close_sim(script)
 
-    casa.run_script(script)
-    return output_visibility
+    casa_output = casa.run_script(script)
+    return casa_output
@@ -6,7 +6,6 @@
 import fastimgproto.casa.io as casa_io
 import fastimgproto.casa.reduction as casa_reduce
 import fastimgproto.casa.simulation as casa_sim
-import fastimgproto.pipeline.image as pyimage
 import fastimgproto.visibility as visibility
 import logging
 import os
@@ -55,7 +54,7 @@ def main(method):
     vis_path = casa_sim.simulate_vis_with_casa(pointing_centre,
                                                source_list,
                                                # source_list_w_transient,
-                                               output_dir=output_dir)
+                                               vis_path=output_dir)
     uvw = casa_io.get_uvw_in_lambda(vis_path)
     stokes_i = casa_io.get_stokes_i_vis(vis_path)
 
 
@@ -0,0 +1,46 @@
+"""
+Simulated pipeline run
+"""
+import click
+import astropy.units as u
+import fastimgproto.casa.simulation as casa_sim
+import logging
+import os
+from astropy.coordinates import Angle, SkyCoord
+from fastimgproto.skymodel.helpers import SkyRegion, SkySource
+from fastimgproto.pipeline.skymodel import (get_spiral_source_test_pattern)
+
+
+@click.command()
+@click.argument('outpath', type=click.Path(exists=False))
+def cli(outpath):
+    logging.basicConfig(level=logging.DEBUG)
+    pointing_centre = SkyCoord(180 * u.deg, 8 * u.deg)
+    field_of_view = SkyRegion(pointing_centre,
+                              radius=Angle(1 * u.deg))
+
+    image_size = 1024 * u.pixel
+    cell_size = 3 * u.arcsecond
+
+    # source_list = get_lsm(field_of_view)
+    # source_list = get_spiral_source_test_pattern(field_of_view)
+    extra_src_position = SkyCoord(ra=pointing_centre.ra + 0.01 * u.deg,
+                                  dec=pointing_centre.dec + 0.01 * u.deg, )
+    extra_src = SkySource(position=extra_src_position,
+                          flux=0.4 * u.Jy)
+    source_list = [SkySource(position=pointing_centre, flux=1 * u.Jy),
+                   extra_src,
+                   ]
+
+    transient_posn = SkyCoord(
+        ra=field_of_view.centre.ra - 0.05 * u.deg,
+        dec=field_of_view.centre.dec - 0.05 * u.deg)
+    transient = SkySource(position=transient_posn, flux=0.5 * u.Jy)
+
+    # source_list_w_transient = source_list + [transient]
+
+    casa_sim.simulate_vis_with_casa(pointing_centre,
+                                    source_list,
+                                    # source_list_w_transient,
+                                    vis_path=outpath,
+                                    echo=True)