diff --git a/acstools/findsat_mrt.py b/acstools/findsat_mrt.py index 902e0f2..43a3d43 100644 --- a/acstools/findsat_mrt.py +++ b/acstools/findsat_mrt.py @@ -1104,7 +1104,7 @@ def save_output(self, close_plot=True): # an inconsequential warning so we suppress it here. with warnings.catch_warnings(): warnings.filterwarnings('ignore', - message='Attribute `version` of') + message='Attribute `version` of.*') self.source_list.write(cat_filename, overwrite=True) else: # create an empty catalog and write that. It helps to have this diff --git a/acstools/utils_findsat_mrt.py b/acstools/utils_findsat_mrt.py index 9731984..cdaa87a 100644 --- a/acstools/utils_findsat_mrt.py +++ b/acstools/utils_findsat_mrt.py @@ -108,7 +108,9 @@ def merge_tables(tbls, theta_sep=10, rho_sep=10): drho = np.abs(t['ycentroid'] - s['ycentroid']) sel = (dtheta < theta_sep) & (drho < rho_sep) keep[sel] = False - src = vstack([src, t[keep]]) + # Silence MergeConflictWarning for "date" metadata because + # the tables were created with different timestamps. The last entry is kept. + src = vstack([src, t[keep]], metadata_conflicts="silent") return src