Merge pull request #601 from eqcorrscan/issue_598

Always get new catalog from detections #598

eqcorrscan/core/match_filter/family.py

@@ -45,16 +45,13 @@ def __init__(self, template, detections=None, catalog=None):
         if isinstance(detections, Detection):
             detections = [detections]
         self.detections = detections or []
-        self.__catalog = get_catalog(self.detections)
         if catalog:
             Logger.warning("Setting catalog directly is no-longer supported, "
                            "now generated from detections.")
 
     @property
     def catalog(self):
-        if len(self.__catalog) != len(self.detections):
-            self.__catalog = get_catalog(self.detections)
-        return self.__catalog
+        return get_catalog(self.detections)
 
     @catalog.setter
     def catalog(self, catalog):
@@ -151,13 +148,11 @@ def __iadd__(self, other):
         if isinstance(other, Family):
             if other.template == self.template:
                 self.detections.extend(other.detections)
-                self.__catalog.events.extend(get_catalog(other.detections))
             else:
                 raise NotImplementedError('Templates do not match')
         elif isinstance(other, Detection) and other.template_name \
                 == self.template.name:
             self.detections.append(other)
-            self.__catalog.events.extend(get_catalog([other]))
         elif isinstance(other, Detection):
             raise NotImplementedError('Templates do not match')
         else: