Add --traceid option to plot_pair subparser

Author: claudiodsf

requake/config/parse_arguments.py

@@ -183,10 +183,19 @@ def parse_arguments(progname='requake'):
         type=float, default=None,
         help='maximum cross-correlation coefficient (default: %(default)s)'
     )
+    # --- traceid
+    #     a parent parser for the "traceid" option,
+    #     used by several subparsers
+    traceid = argparse.ArgumentParser(add_help=False)
+    traceid.add_argument(
+        '-t', '--traceid', type=str, default=None,
+        help='use this traceid instead of the one set in the config file'
+    )
     # ---
     # --- plot_pair
     plot_pair = subparser.add_parser(
         'plot_pair',
+        parents=[traceid],
         help='plot traces for a given event pair'
     )
     plot_pair.add_argument('evid1')
@@ -286,14 +295,6 @@ def parse_arguments(progname='requake'):
              'expressed in years. Also note that this option is ignored if '
              'the -c/--colorby option is set to "family_number".'
     )
-    # --- traceid
-    #     a parent parser for the "traceid" option,
-    #     used by several subparsers
-    traceid = argparse.ArgumentParser(add_help=False)
-    traceid.add_argument(
-        '-t', '--traceid', type=str, default=None,
-        help='use this traceid instead of the default one for the family'
-    )
     # ---
     # --- print_families
     subparser.add_parser(

requake/waveforms/station_metadata.py

@@ -233,7 +233,7 @@ def _fetch_coordinates(net, sta, loc, chan, orig_time):
 
 def get_traceid_coords(orig_time=None):
     """
-    Get coordinates for the trace_ids specified in config file.
+    Get coordinates for the trace_ids specified in config file or from args.
 
     :param orig_time: origin time
     :type orig_time: obspy.UTCDateTime
@@ -247,7 +247,10 @@ def get_traceid_coords(orig_time=None):
     if config.inventory is None:
         _download_metadata()
     traceid_coords = {}
-    for trace_id in config.catalog_trace_id:
+    traceid_list = config.catalog_trace_id
+    if config.args.traceid is not None:
+        traceid_list.append(config.args.traceid)
+    for trace_id in traceid_list:
         net, sta, loc, chan = trace_id.split('.')
         net = net or '@@'
         coords = _fetch_coordinates(net, sta, loc, chan, orig_time)

requake/waveforms/waveforms.py

@@ -242,8 +242,10 @@ def get_event_waveform(ev):
     orig_time = ev.orig_time
     mag = ev.mag
     mag_type = ev.mag_type
-    traceid = ev.trace_id if config.args.traceid is None\
+    traceid = (
+        ev.trace_id if config.args.traceid is None
         else config.args.traceid
+    )
     try:
         traceid_coords = get_traceid_coords(orig_time)
     except MetadataMismatchError as err:
@@ -254,7 +256,15 @@ def get_event_waveform(ev):
             'Skipping event.\n'
             f'Error message: {msg}'
         ) from err
-    coords = traceid_coords[traceid]
+    try:
+        coords = traceid_coords[traceid]
+    except KeyError as err:
+        msg = str(err).replace('\n', ' ')
+        raise NoWaveformError(
+            f'No metadata for trace_id {traceid} '
+            'in the metadata file. Skipping event.\n'
+            f'Error message: {msg}'
+        ) from err
     trace_lat = coords['latitude']
     trace_lon = coords['longitude']
     try: