Re-order args so that positional input still works

Author: liamtoney

lts_array/classes/lts_data_class.py

@@ -17,7 +17,7 @@ def __init__(self, window_length, window_overlap, alpha):
         self.window_overlap = window_overlap
         self.alpha = alpha
 
-    def build_data_arrays(self, st, latlist, lonlist, rij=None, remove_elements=None):
+    def build_data_arrays(self, st, latlist, lonlist, remove_elements=None, rij=None):
         """ Collect basic data from stream file. Project lat/lon into r_ij coordinates.
 
         Alternatively, if ``rij`` is provided, ``latlist`` and ``lonlist`` are not used
@@ -27,11 +27,11 @@ def build_data_arrays(self, st, latlist, lonlist, rij=None, remove_elements=None
             st (stream): An obspy stream object.
             latlist (list): A list of latitude points.
             lonlist (list): A list of longitude points.
+            remove_elements (list): A list of elements to remove before processing. Python numbering is used, so "[0]" removes the first element.
             rij (array or None): A NumPy array with the first row corresponding to
                 cartesian "X" - coordinates and the second row corresponding to
                 cartesian "Y" - coordinates, in units of km. If this is provided then
                 ``latlist`` and ``lonlist`` are ignored.
-            remove_elements (list): A list of elements to remove before processing. Python numbering is used, so "[0]" removes the first element.
         """
         # Check that all traces have the same length
         if len(set([len(tr) for tr in st])) != 1:

lts_array/ltsva.py

@@ -6,7 +6,7 @@
 warnings.simplefilter(action='ignore', category=FutureWarning)
 
 
-def ltsva(st, lat_list, lon_list, window_length, window_overlap, alpha=1.0, rij=None, plot_array_coordinates=False, remove_elements=None):
+def ltsva(st, lat_list, lon_list, window_length, window_overlap, alpha=1.0, plot_array_coordinates=False, remove_elements=None, rij=None):
     r""" Process infrasound or seismic array data with least trimmed squares (LTS).
 
     Args:
@@ -17,12 +17,12 @@ def ltsva(st, lat_list, lon_list, window_length, window_overlap, alpha=1.0, rij=
         window_overlap (float): Window overlap in the range (0.0 - 1.0).
         alpha (float): Fraction of data for LTS subsetting [0.5 - 1.0].
             Choose 1.0 for ordinary least squares (default).
+        plot_array_coordinates (bool): Plot array coordinates? Defaults to False.
+        remove_elements (list): (Optional) Remove element number(s) from ``st``, ``lat_list``, and ``lon_list`` before processing. Here numbering refers to the Python index (e.g. [0] = remove 1st element in stream).
         rij (array or None): A NumPy array with the first row corresponding to cartesian
             "X" - coordinates and the second row corresponding to cartesian "Y" -
             coordinates, in units of km. If this is provided then ``lat_list`` and
             ``lon_list`` are ignored.
-        plot_array_coordinates (bool): Plot array coordinates? Defaults to False.
-        remove_elements (list): (Optional) Remove element number(s) from ``st``, ``lat_list``, and ``lon_list`` before processing. Here numbering refers to the Python index (e.g. [0] = remove 1st element in stream).
 
     Returns:
         (tuple):