Accelerated MotionModel that has passed all the testing functions!

flystar/analysis.py

@@ -1,17 +1,11 @@
 import numpy as np
 import pylab as plt
-from flystar import starlists
-from flystar import startables
-from flystar import align
-from flystar import match
-from flystar import transforms
+from . import starlists, match
 from astropy import table
 from astropy.table import Table, Column
 from astropy.coordinates import SkyCoord
 from astropy import units as u
 from astropy.wcs import WCS
-from astroquery.gaia import Gaia
-from astroquery.mast import Observations, Catalogs
 import pdb, copy
 import math
 from scipy.stats import f
@@ -42,14 +36,15 @@ def query_gaia(ra, dec, search_radius=30.0, table_name='gaiadr3'):
     table_name : string
         Options are 'gaiadr2' or 'gaiaedr3'
     """
+    from astroquery.gaia import Gaia
     target_coords = SkyCoord(ra, dec, unit=(u.hourangle, u.deg), frame='icrs')
     ra = target_coords.ra.degree
     dec = target_coords.dec.degree
 
     search_radius *= u.arcsec
 
     Gaia.ROW_LIMIT = 50000
-    gaia_job = Gaia.cone_search_async(target_coords, search_radius, table_name = table_name + '.gaia_source')
+    gaia_job = Gaia.cone_search_async(target_coords, radius=search_radius, table_name=table_name + '.gaia_source')
     gaia = gaia_job.get_results()
 
     #Change new 'SOURCE_ID' column header back to lowercase 'source_id' so all subsequent functions still work:

flystar/examples.py

@@ -1,11 +1,5 @@
-from flystar import transforms
-from flystar import match
-from flystar import align
-from flystar import starlists
-from flystar import plots
 import numpy as np
-import copy
-import pdb
+from . import transforms, match, align, starlists, plots
 
 
 def align_example(labelFile, reference, transModel=transforms.four_paramNW, order=1, N_loop=2,
@@ -83,7 +77,7 @@ def align_example(labelFile, reference, transModel=transforms.four_paramNW, orde
 
         trans, N_trans = align.find_transform(label[idx_label],
                                               label_trans[idx_label],
-                                              starlist_mat[idx_starlist],
+                                              starlist[idx_starlist],
                                               transModel=transModel,
                                               order=order, weights=weights)
 

flystar/match.py

@@ -1,14 +1,10 @@
 import numpy as np
-from flystar import starlists, transforms, startables, align
+from . import starlists, transforms, startables
 from collections import Counter
 from scipy.spatial import cKDTree as KDT
-from astropy.table import Column, Table
+from astropy.table import Column
 import itertools
 import copy
-import scipy.signal
-from scipy.spatial import distance
-import math
-import pdb
 
 
 def miracle_match_briteN(xin1, yin1, min1, xin2, yin2, min2, Nbrite,
@@ -526,6 +522,7 @@ def generic_match(sl1, sl2, init_mode='triangle',
         Startable of the two matched catalogs
 
     """
+    from . import align
 
     #  Check the input StarLists and transform them into astropy Tables
     if not isinstance(sl1, starlists.StarList):