simplify call to collection_loop

Author: adelepoulle

src/py_eddy_tracker/property_functions.py

@@ -361,19 +361,11 @@ def _fit_circle_path(self):
 BasePath._fit_circle_path = _fit_circle_path
 
 
-def collection_loop(contours, grd, rtime, a_list_obj, c_list_obj,
+def collection_loop(contours, grd, rtime, eddy,
                     x_i=None, c_s_xi=None):
     """
     Loop over each collection of contours
     """
-    if a_list_obj is not None and c_list_obj is not None:
-        raise Exception('Only one of this two parameters '
-                        '(a_list_obj, c_list_obj) must be defined')
-    if a_list_obj is not None:
-        eddy = a_list_obj
-    if c_list_obj is not None:
-        eddy = c_list_obj
-
     if eddy.diagnostic_type not in ['Q', 'SLA']:
         raise Exception('Unknown Diagnostic : %s' % eddy.diagnostic_type)
 

src/scripts/EddyIdentification

@@ -294,12 +294,10 @@ if __name__ == '__main__':
         # Now we loop over the CS collection
         if 'SLA' in DIAGNOSTIC_TYPE:
             logging.info("Anticyclonic research")
-            A_EDDY = collection_loop(CONTOURS, SLA_GRD, grd_int_date,
-                                     a_list_obj=A_EDDY, c_list_obj=None)
+            A_EDDY = collection_loop(CONTOURS, SLA_GRD, grd_int_date, A_EDDY)
             # Note that C_CS is reverse order
             logging.info("Cyclonic research")
-            C_EDDY = collection_loop(CONTOURS, SLA_GRD, grd_int_date,
-                                     a_list_obj=None, c_list_obj=C_EDDY)
+            C_EDDY = collection_loop(CONTOURS, SLA_GRD, grd_int_date, C_EDDY)
 
         # clear the current axis
         CONT_AX.cla()