Fix for --traceid argument not being recognized

This commit also imrpoves handling of uncorrect trace_id formats

Author: claudiodsf

requake/families/families.py

@@ -22,7 +22,7 @@
 from ..catalog import RequakeEvent
 from ..waveforms import (
     load_inventory, get_event_waveform, align_traces, build_template,
-    NoWaveformError
+    NoWaveformError, MetadataMismatchError
 )
 logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
 
@@ -339,8 +339,13 @@ def get_family_aligned_waveforms_and_template(family):
     :type family: Family
     :return: An obspy stream containing the aligned waveforms and the template.
     :rtype: obspy.Stream
+
+    :raises: NoWaveformError: if no waveforms are found
     """
-    st = get_family_waveforms(family)
+    try:
+        st = get_family_waveforms(family)
+    except (NoWaveformError, MetadataMismatchError) as msg:
+        raise NoWaveformError(msg) from msg
     align_traces(st)
     build_template(st, family)
     return st

requake/waveforms/station_metadata.py

@@ -122,6 +122,9 @@ def _download_metadata():
     Download metadata for the trace_ids specified in config file.
 
     The metadata is stored in the config object.
+
+    :raises MetadataMismatchError: if the metadata does not match
+        the expected format
     """
     logger.info('Downloading station metadata...')
     inv = Inventory()
@@ -133,7 +136,13 @@ def _download_metadata():
     else:
         trace_ids = config.catalog_trace_id
     for trace_id in trace_ids:
-        net, sta, loc, chan = trace_id.split('.')
+        try:
+            net, sta, loc, chan = trace_id.split('.')
+        except ValueError as err:
+            raise MetadataMismatchError(
+                f'Invalid trace_id: {trace_id}. Must be in the format '
+                'NET.STA.LOC.CHAN'
+            ) from err
         try:
             inv += cl.get_stations(
                 network=net, station=sta, location=loc, channel=chan,
@@ -218,9 +227,11 @@ def get_traceid_coords(orig_time=None):
     """
     load_inventory()
     traceid_coords = {}
-    traceid_list = config.catalog_trace_id
-    if config.args.traceid is not None:
-        traceid_list.append(config.args.traceid)
+    traceid_list = (
+        config.catalog_trace_id
+        if config.args.traceid is None
+        else [config.args.traceid, ]
+    )
     for trace_id in traceid_list:
         try:
             net, sta, loc, chan = trace_id.split('.')

requake/waveforms/waveform_pair.py

@@ -16,7 +16,7 @@
 from obspy.taup import TauPyModel
 from ..config import config
 from .waveforms import get_event_waveform, NoWaveformError
-from .station_metadata import get_traceid_coords
+from .station_metadata import get_traceid_coords, MetadataMismatchError
 logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
 
 
@@ -62,7 +62,15 @@ def _get_trace_id(self, ev):
             self.trace_id_attempts[ev.evid].append(trace_id)
             return trace_id
         ev_lat, ev_lon, orig_time = ev.lat, ev.lon, ev.orig_time
-        traceid_coords = get_traceid_coords(orig_time)
+        try:
+            traceid_coords = get_traceid_coords(orig_time)
+        except MetadataMismatchError as err:
+            logger.error(
+                f'No metadata available for event {ev.evid} at {orig_time}.'
+            )
+            raise NoWaveformError(
+                f'No valid trace_id available for event {ev.evid}'
+            ) from err
         # Compute distances
         distances = {}
         for trace_id, coords in traceid_coords.items():