Minor formatting changes (Isort / Variable-renames)

Author: timstaley

setup.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
-from setuptools import find_packages, setup
-
 import versioneer
+from setuptools import find_packages, setup
 
 install_requires = [
     'astropy',

src/fastimgproto/fixtures/profiling.py

@@ -1,6 +1,7 @@
-from fastimgproto.sourcefind.image import SourceFindImage
 from memory_profiler import profile
 
+from fastimgproto.sourcefind.image import SourceFindImage
+
 
 @profile
 def memprof_sourcefindimage(data, detection_n_sigma, analysis_n_sigma):

src/fastimgproto/scripts/reduce.py

@@ -4,17 +4,22 @@
 from __future__ import print_function
 
 import json
+import logging
 
 import astropy.units as u
 import click
 import numpy as np
+from tqdm import tqdm as Tqdm
 
 import fastimgproto.imager as imager
+import fastimgproto.visibility as visibility
 from fastimgproto.gridder.conv_funcs import GaussianSinc
 from fastimgproto.sourcefind.image import SourceFindImage
 
 from .config import ConfigKeys, default_config_path
 
+logger = logging.getLogger()
+
 
 # @click.argument(
 #     'output_img', type=click.File(mode='wb'))

src/fastimgproto/visibility.py

@@ -39,7 +39,7 @@ def m_cosine(ra, dec, ra0, dec0):
             )
 
 
-def visibilities_for_point_source(dist_uvw, l, m, flux):
+def visibilities_for_point_source(uvw_baselines, l, m, flux):
     """
     Simulate visibilities for point source.
 
@@ -52,7 +52,7 @@ def visibilities_for_point_source(dist_uvw, l, m, flux):
     (uvw.lmn)
 
     Args:
-        dist_uvw (numpy.array): Array of 3-vectors representing
+        uvw_baselines (numpy.array): Array of 3-vectors representing
             baselines in UVW space. Implicit units are
             (dimensionless) multiples of wavelength, lambda.
             [numpy shape: (n_uvw, 3), dtype=np.float_]
@@ -75,7 +75,7 @@ def visibilities_for_point_source(dist_uvw, l, m, flux):
     # src - centre:
     src_offset = -np.array([l, m, src_n - 1])
 
-    return flux * src_n * np.exp(-2j * np.pi * np.dot(dist_uvw, src_offset))
+    return flux * src_n * np.exp(-2j * np.pi * np.dot(uvw_baselines, src_offset))
 
 
 def visibilities_for_source_list(pointing_centre, source_list, uvw):
@@ -130,5 +130,5 @@ def add_gaussian_noise(noise_level, vis, seed=None):
     """
     sigma = noise_level.to(u.Jansky).value
     rstate = np.random.RandomState(seed)
-    noise = rstate.normal(loc=0, scale=sigma, size=(len(vis),2))
-    return vis + (noise[:,0] + 1j*noise[:,1])
+    noise = rstate.normal(loc=0, scale=sigma, size=(len(vis), 2))
+    return vis + (noise[:, 0] + 1j * noise[:, 1])

tests/test_scripts/test_extract_lsm.py

@@ -1,12 +1,9 @@
 from __future__ import print_function
 
 import csv
-import json
 
-import numpy as np
 from click.testing import CliRunner
 
-from fastimgproto.fixtures.data import simple_vis_npz_filepath
 from fastimgproto.scripts.extract_lsm import cli as extract_lsm_cli
 from fastimgproto.skymodel.extraction import SumssSrc
 

tests/test_scripts/test_imager.py

@@ -1,5 +1,3 @@
-import json
-
 import numpy as np
 from click.testing import CliRunner
 

tests/test_scripts/test_simulate_data.py

@@ -1,5 +1,3 @@
-import json
-
 import numpy as np
 from click.testing import CliRunner