requake 0.4__tar.gz → 0.5__tar.gz

{requake-0.4 → requake-0.5}/CHANGELOG.md

@@ -1,6 +1,22 @@
-# Requake - Repeating earthquakes search and analysis
+# Requake Changelog
 
-(c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
+Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
+
+## v0.5 - 2024-04-23
+
+- New config options: `station_metadata_path` and `waveform_data_path` to
+  read station metadata and waveform data from files. Supports any metadata
+  format supported by ObsPy and SDS (SeisComp Data Structure) waveform
+  archives.
+- Filter catalog files on reading using the criteria in the config file
+- Improved time axes in `plot_timespans` and `plot_slip` for short time
+  intervals
+- `print_families`: autoset duration units based on the average duration
+- `plot_timespans`: default sorting changed to `family_number`
+
+## v0.4.1 - 2024-03-11
+
+- Bugfix: `requake` executable was not installed
 
 ## v0.4 - 2024-03-11
 

{requake-0.4 → requake-0.5}/PKG-INFO

@@ -1,11 +1,14 @@
 Metadata-Version: 2.1
 Name: requake
-Version: 0.4
+Version: 0.5
 Summary: Repeating earthquakes search and analysis
-Home-page: http://www.ipgp.fr/~satriano
+Home-page: https://requake.seismicsource.org
 Author: Claudio Satriano
 Author-email: satriano@ipgp.fr
 License: GNU General Public License v3 or later (GPLv3+)
+Project-URL: Homepage, https://requake.seismicsource.org
+Project-URL: Source, https://github.com/SeismicSource/requake
+Project-URL: Documentation, https://requake.readthedocs.io
 Platform: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
@@ -30,6 +33,8 @@ Requires-Dist: argcomplete
 Requires-Dist: tqdm
 Requires-Dist: tabulate
 
+<img src="imgs/Requake_logo.svg" width="400">
+
 # Requake
 
 Repeating earthquakes search and analysis.
@@ -37,6 +42,8 @@ Repeating earthquakes search and analysis.
 [![changelog-badge]][changelog-link]
 [![PyPI-badge]][PyPI-link]
 [![license-badge]][license-link]
+[![docs-badge]][docs-link]
+[![DOI-badge]][DOI-link]
 
 Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
 
@@ -47,8 +54,8 @@ Requake is a command line tool to search and analyse repeating earthquakes.
 It can either scan an existing earthquake catalog to search for similar events,
 or perform template matching on a continuous waveform stream.
 
-Catalogs and waveforms are downloaded using standard
-[FDSN web services](https://www.fdsn.org/webservices/).
+Catalogs and waveforms can be read from local files or downloaded using
+standard [FDSN web services](https://www.fdsn.org/webservices/).
 
 Requake is written in Python and uses [ObsPy](https://obspy.org) as backend.
 
@@ -181,10 +188,35 @@ parallelization will be implemented.
 
 - `requake build_families` is fast™.
 
+## How to Cite
+
+If you used Requake for a scientific paper, please cite it as:
+
+> Satriano, C. (2024). Requake: Repeating earthquakes search and analysis (X.Y).
+> [doi: 10.5281/ZENODO.10832204]
+
+Please replace `X.Y` with the Requake version number you used.
+
+You can also cite the following abstract presented at the
+2016 AGU Fall Meeting:
+
+> Satriano, C., Doucet, A. & Bouin, M.-P. (2021).
+> Probing the creep rate along the Lesser Antilles Subduction Zone through repeating earthquakes.
+> In AGU Fall Meeting Abstracts
+> (Vol. 2021, pp. T25A-0167), [bibcode: 2021AGUFM.T25A0167S]
+
 <!-- Badges and project links -->
 [PyPI-badge]: http://img.shields.io/pypi/v/requake.svg
 [PyPI-link]: https://pypi.python.org/pypi/requake
 [license-badge]: https://img.shields.io/badge/license-GPLv3-green
 [license-link]: https://www.gnu.org/licenses/gpl-3.0.html
+[docs-badge]: https://readthedocs.org/projects/requake/badge/?version=latest
+[docs-link]: https://requake.readthedocs.io/en/latest/?badge=latest
 [changelog-badge]: https://img.shields.io/badge/Changelog-136CB6.svg
 [changelog-link]: https://github.com/SeismicSource/requake/blob/main/CHANGELOG.md
+[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832204.svg
+[DOI-link]: https://doi.org/10.5281/zenodo.10832204
+
+<!-- References -->
+[doi: 10.5281/ZENODO.10832204]: https://doi.org/10.5281/ZENODO.10832204
+[bibcode: 2021AGUFM.T25A0167S]: https://ui.adsabs.harvard.edu/abs/2021AGUFM.T25A0167S

{requake-0.4 → requake-0.5}/README.md

@@ -1,3 +1,5 @@
+<img src="imgs/Requake_logo.svg" width="400">
+
 # Requake
 
 Repeating earthquakes search and analysis.
@@ -5,6 +7,8 @@ Repeating earthquakes search and analysis.
 [![changelog-badge]][changelog-link]
 [![PyPI-badge]][PyPI-link]
 [![license-badge]][license-link]
+[![docs-badge]][docs-link]
+[![DOI-badge]][DOI-link]
 
 Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
 
@@ -15,8 +19,8 @@ Requake is a command line tool to search and analyse repeating earthquakes.
 It can either scan an existing earthquake catalog to search for similar events,
 or perform template matching on a continuous waveform stream.
 
-Catalogs and waveforms are downloaded using standard
-[FDSN web services](https://www.fdsn.org/webservices/).
+Catalogs and waveforms can be read from local files or downloaded using
+standard [FDSN web services](https://www.fdsn.org/webservices/).
 
 Requake is written in Python and uses [ObsPy](https://obspy.org) as backend.
 
@@ -149,10 +153,35 @@ parallelization will be implemented.
 
 - `requake build_families` is fast™.
 
+## How to Cite
+
+If you used Requake for a scientific paper, please cite it as:
+
+> Satriano, C. (2024). Requake: Repeating earthquakes search and analysis (X.Y).
+> [doi: 10.5281/ZENODO.10832204]
+
+Please replace `X.Y` with the Requake version number you used.
+
+You can also cite the following abstract presented at the
+2016 AGU Fall Meeting:
+
+> Satriano, C., Doucet, A. & Bouin, M.-P. (2021).
+> Probing the creep rate along the Lesser Antilles Subduction Zone through repeating earthquakes.
+> In AGU Fall Meeting Abstracts
+> (Vol. 2021, pp. T25A-0167), [bibcode: 2021AGUFM.T25A0167S]
+
 <!-- Badges and project links -->
 [PyPI-badge]: http://img.shields.io/pypi/v/requake.svg
 [PyPI-link]: https://pypi.python.org/pypi/requake
 [license-badge]: https://img.shields.io/badge/license-GPLv3-green
 [license-link]: https://www.gnu.org/licenses/gpl-3.0.html
+[docs-badge]: https://readthedocs.org/projects/requake/badge/?version=latest
+[docs-link]: https://requake.readthedocs.io/en/latest/?badge=latest
 [changelog-badge]: https://img.shields.io/badge/Changelog-136CB6.svg
-[changelog-link]: https://github.com/SeismicSource/requake/blob/main/CHANGELOG.md
+[changelog-link]: https://github.com/SeismicSource/requake/blob/main/CHANGELOG.md
+[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832204.svg
+[DOI-link]: https://doi.org/10.5281/zenodo.10832204
+
+<!-- References -->
+[doi: 10.5281/ZENODO.10832204]: https://doi.org/10.5281/ZENODO.10832204
+[bibcode: 2021AGUFM.T25A0167S]: https://ui.adsabs.harvard.edu/abs/2021AGUFM.T25A0167S

{requake-0.4 → requake-0.5}/requake/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-03-11T14:52:50+0100",
+ "date": "2024-04-23T09:52:34+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "d3df3ac972a345394d7a1b05dee98495ec8e3f2f",
- "version": "0.4"
+ "full-revisionid": "5223a069ca428a69bba654b59dc8bc7b8860cbdd",
+ "version": "0.5"
 }
 '''  # END VERSION_JSON
 

{requake-0.4 → requake-0.5}/requake/catalog/catalog.py

@@ -182,6 +182,72 @@ class RequakeCatalog(list):
                 fp.write(ev.fdsn_text() + '\n')
 
 
+    def filter(
+            self, starttime=None, endtime=None,
+            minlatitude=None, maxlatitude=None,
+            minlongitude=None, maxlongitude=None,
+            mindepth=None, maxdepth=None,
+            minmagnitude=None, maxmagnitude=None):
+        """
+        Filter the catalog, based on the specified criteria.
+
+        Returns a new catalog.
+
+        :param starttime: start time
+        :type starttime: obspy.UTCDateTime
+        :param endtime: end time
+        :type endtime: obspy.UTCDateTime
+        :param minlatitude: minimum latitude
+        :type minlatitude: float
+        :param maxlatitude: maximum latitude
+        :type maxlatitude: float
+        :param minlongitude: minimum longitude
+        :type minlongitude: float
+        :param maxlongitude: maximum longitude
+        :type maxlongitude: float
+        :param mindepth: minimum depth (in km)
+        :type mindepth: float
+        :param maxdepth: maximum depth (in km)
+        :type maxdepth: float
+        :param minmagnitude: minimum magnitude
+        :type minmagnitude: float
+        :param maxmagnitude: maximum magnitude
+        :type maxmagnitude: float
+
+        :return: a new catalog
+        :rtype: RequakeCatalog
+        """
+        outcat = RequakeCatalog()
+        for ev in self:
+            if ev.orig_time is not None:
+                if starttime is not None and ev.orig_time < starttime:
+                    continue
+                if endtime is not None and ev.orig_time > endtime:
+                    continue
+            if ev.lat is not None:
+                if minlatitude is not None and ev.lat < minlatitude:
+                    continue
+                if maxlatitude is not None and ev.lat > maxlatitude:
+                    continue
+            if ev.lon is not None:
+                if minlongitude is not None and ev.lon < minlongitude:
+                    continue
+                if maxlongitude is not None and ev.lon > maxlongitude:
+                    continue
+            if ev.depth is not None:
+                if mindepth is not None and ev.depth < mindepth:
+                    continue
+                if maxdepth is not None and ev.depth > maxdepth:
+                    continue
+            if ev.mag is not None:
+                if minmagnitude is not None and ev.mag < minmagnitude:
+                    continue
+                if maxmagnitude is not None and ev.mag > maxmagnitude:
+                    continue
+            outcat.append(ev)
+        return outcat
+
+
 def read_stored_catalog(config):
     """
     Read the catalog stored in the output directory.

{requake-0.4 → requake-0.5}/requake/catalog/read_catalog.py

@@ -9,6 +9,7 @@ Read an event catalog from web services or from a file.
     GNU General Public License v3.0 or later
     (https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 """
+import os
 import logging
 import contextlib
 from ..catalog.catalog import RequakeCatalog
@@ -34,8 +35,14 @@ def _read_catalog_from_file(config):
     :raises ValueError: if the file format is not supported
     """
     catalog_file = config.args.catalog_file
+    # return ValueError if the file is empty
+    if os.stat(catalog_file).st_size == 0:
+        raise ValueError('Empty file')
+    # return ValueError if the file is a directory
+    if os.path.isdir(catalog_file):
+        raise ValueError('Is a directory')
     # try to read the catalog as a QuakeML file
-    with contextlib.suppress(TypeError):
+    with contextlib.suppress(TypeError, IndexError, ValueError):
         return read_catalog_from_quakeml(catalog_file)
     # try to read the catalog as a FDSN text file
     with contextlib.suppress(ValueError):
@@ -47,6 +54,45 @@ def _read_catalog_from_file(config):
     return read_catalog_from_csv(catalog_file)
 
 
+def _filter_catalog(catalog, config):
+    """
+    Filter an event catalog, based on the criteria specified
+    in the configuration.
+
+    :param catalog: Event catalog.
+    :type catalog: requake.catalog.RequakeCatalog
+    :param config: Configuration object.
+    :type config: requake.rq_setup.RequakeConfig
+    :return: Filtered event catalog.
+    :rtype: requake.catalog.RequakeCatalog
+    """
+    lon_min = config.catalog_lon_min
+    lon_max = config.catalog_lon_max
+    lat_min = config.catalog_lat_min
+    lat_max = config.catalog_lat_max
+    depth_min = config.catalog_depth_min
+    depth_max = config.catalog_depth_max
+    mag_min = config.catalog_mag_min
+    mag_max = config.catalog_mag_max
+    outcat = catalog
+    for start_time, end_time in zip(config.catalog_start_times,
+                                    config.catalog_end_times):
+        outcat = outcat.filter(
+            starttime=start_time, endtime=end_time,
+            minlatitude=lat_min, maxlatitude=lat_max,
+            minlongitude=lon_min, maxlongitude=lon_max,
+            mindepth=depth_min, maxdepth=depth_max,
+            minmagnitude=mag_min, maxmagnitude=mag_max
+        )
+    nevents_in = len(catalog)
+    nevents_out = len(outcat)
+    logger.info(
+        'Catalog filtered based on configuration file: '
+        f'{nevents_out} events out of {nevents_in}'
+    )
+    return outcat
+
+
 def read_catalog(config):
     """
     Read an event catalog from web services or from a file.
@@ -59,34 +105,42 @@ def read_catalog(config):
     :rtype: requake.catalog.RequakeCatalog
     """
     catalog = RequakeCatalog()
-    out_cat_file = config.scan_catalog_file
+    output_cat_file = config.scan_catalog_file
     nevs_read = 0
     if config.args.append:
         with contextlib.suppress(FileNotFoundError):
             catalog = RequakeCatalog()
-            catalog.read(out_cat_file)
+            catalog.read(output_cat_file)
             nevs_read = len(catalog)
-            logger.info(f'{nevs_read} events read from "{out_cat_file}"')
+            logger.info(f'{nevs_read} events read from "{output_cat_file}"')
     logger.info('Reading catalog...')
-    in_cat_file = config.args.catalog_file
-    if in_cat_file is not None:
+    input_cat_file = config.args.catalog_file
+    if input_cat_file is not None:
         try:
             catalog += _read_catalog_from_file(config)
+            # Filter catalog based on configuration
+            catalog = _filter_catalog(catalog, config)
         except FileNotFoundError:
-            logger.error(f'File "{in_cat_file}" not found')
+            logger.error(f'File "{input_cat_file}" not found')
             rq_exit(1)
         except ValueError as m:
-            logger.error(f'Error reading catalog file "{in_cat_file}": {m}')
+            logger.error(f'Error reading catalog file "{input_cat_file}": {m}')
             rq_exit(1)
     else:
         catalog += read_catalog_from_fdsnws(config)
     if not catalog:
         logger.error('No event read')
         rq_exit(1)
+    # Deduplicate catalog
+    len_before = len(catalog)
     catalog.deduplicate()
+    len_after = len(catalog)
+    nevs_dedup = len_before - len_after
+    if nevs_dedup > 0:
+        logger.info(f'{nevs_dedup} duplicate events removed')
     # Sort catalog in increasing time order
     catalog.sort()
     # Write catalog to output file
-    catalog.write(out_cat_file)
+    catalog.write(output_cat_file)
     nevs_written = len(catalog) - nevs_read
-    logger.info(f'{nevs_written} events written to "{out_cat_file}"')
+    logger.info(f'{nevs_written} events written to "{output_cat_file}"')

{requake-0.4 → requake-0.5}/requake/catalog/read_catalog_from_csv.py

@@ -183,7 +183,17 @@ def read_catalog_from_csv(filename):
                     year=year, month=month, day=day,
                     hour=hour, minute=minute, second=0) + seconds
             else:
-                orig_time = UTCDateTime(row[fields['orig_time']])
+                try:
+                    orig_time = UTCDateTime(row[fields['orig_time']])
+                except ValueError:
+                    # one last try: check if the time is in the format
+                    # YYYYMMDD.hhmmss.
+                    # Replace the dot with a space, pad with zeros
+                    # and try again
+                    orig_time = UTCDateTime(
+                        row[fields['orig_time']]
+                        .replace('.', ' ').ljust(15, '0')
+                    )
             row[None] = None
             ev = RequakeEvent()
             ev.orig_time = orig_time

{requake-0.4 → requake-0.5}/requake/config/configspec.conf

@@ -4,9 +4,19 @@
 ## FDSN station webservice URL to retrieve station metadata.
 ## Use a full URL or a ObsPy shortcut (e.g., IRIS, RESIF, GEOFON, ...)
 fdsn_station_url = string(default=http://example.com)
+## Alternatively, you can provide the path to a local file with station
+## metadata in any format supported by ObsPy (note that some formats may not
+## contain station coordinates, which are required for the scan,
+## see https://docs.obspy.org/packages/obspy.core.inventory.html).
+## If both fdsn_station_url and stationxml_file are provided, the
+## local file will be used.
+station_metadata_path = string(default=None)
 ## FDSN dataselect webservice URL to retrieve waveforms.
 ## Use a full URL or a ObsPy shortcut (e.g., IRIS, RESIF, GEOFON, ...)
 fdsn_dataselect_url = string(default=http://example.com)
+## Alternatively, you can provide the path to a local SDS waveform archive
+## (see https://docs.obspy.org/packages/autogen/obspy.clients.filesystem.sds.html)
+waveform_data_path = string(default=None)
 
 #### Catalog-based scan
 ### The following parameters are for a catalog-based scan:

{requake-0.4 → requake-0.5}/requake/config/parse_arguments.py

@@ -132,7 +132,7 @@ def parse_arguments(progname='requake'):
         '-l', '--longerthan', type=str, default=0, metavar='DURATION',
         help='only use families lasting longer than this value. '
              'You can specify DURATION in days (e.g., 100d) '
-             'or in years (e.g., 2.5y).'
+             'or in years (e.g., 2.5y)'
     )
     # ---
     # --- minevents
@@ -141,7 +141,7 @@ def parse_arguments(progname='requake'):
     minevents = argparse.ArgumentParser(add_help=False)
     minevents.add_argument(
         '-m', '--minevents', type=int, default=0, metavar='NEVENTS',
-        help='only use families with at least NEVENTS events.'
+        help='only use families with at least NEVENTS events'
     )
     # ---
     # --- familynumbers
@@ -153,7 +153,7 @@ def parse_arguments(progname='requake'):
         help='family numbers to use. It can be a single number, '
              'a comma-separated list (ex.: 1,4,8), '
              'a hyphen-separated number range (ex.: 2-12), or "all" '
-             '(default: "all"). '
+             '(default: %(default)s)'
     )
     # ---
     # --- traceid
@@ -162,7 +162,7 @@ def parse_arguments(progname='requake'):
     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.'
+        help='use this traceid instead of the default one for the family'
     )
     # ---
     # --- print_families
@@ -173,8 +173,8 @@ def parse_arguments(progname='requake'):
     )
     printfamilies.add_argument(
         '-f', '--format', type=str, default='simple',
-        help='format for the output table.'
-             'Choose between "simple", "markdown" and "csv"'
+        choices=['simple', 'markdown', 'csv'],
+        help='format for the output table (default: %(default)s)'
     )
     # ---
     # --- plot_families
@@ -185,11 +185,11 @@ def parse_arguments(progname='requake'):
     )
     plotfamilies.add_argument(
         '-s', '--starttime', type=float, default=None,
-        help='start time, in seconds relative to trace start, for the plot.'
+        help='start time, in seconds relative to trace start, for the plot'
     )
     plotfamilies.add_argument(
         '-e', '--endtime', type=float, default=None,
-        help='end time, in seconds relative to trace start, for the plot.'
+        help='end time, in seconds relative to trace start, for the plot'
     )
     # ---
     # --- plot_timespans
@@ -199,15 +199,12 @@ def parse_arguments(progname='requake'):
         help='plot family timespans'
     )
     timespans.add_argument(
-        '-s', '--sortby', type=str, default=None,
+        '-s', '--sortby', type=str, default='family_number',
         choices=[
             'time', 'latitude', 'longitude', 'depth', 'distance_from',
             'family_number'
         ],
-        help='quantity to sort families by on y-axis. '
-             'Possible values are: time, latitude, longitude, depth, '
-             'distance_from, family_number. If not specified, the config '
-             'value "sort_families_by" will be used.'
+        help='quantity to sort families by on y-axis (default: %(default)s)'
     )
     # ---
     # --- plot_slip
@@ -229,19 +226,17 @@ def parse_arguments(progname='requake'):
             'stamen_terrain', 'satellite', 'street', 'hillshade',
             'hillshade_dark', 'ocean'
         ],
-        help='style of map to plot. Possible values are: '
-             'stamen_terrain, satellite, street, hillshade, hillshade_dark, '
-             'ocean'
+        help='style of map to plot (default: %(default)s)'
     )
     mapfamilies.add_argument(
         '-k', '--apikey', type=str, default=None,
-        help='API key for Stamen Terrain map tiles (default: None). '
+        help='API key for Stamen Terrain map tiles (default: %(default)s). '
              'You can get a free API key at https://stadiamaps.com/'
     )
     mapfamilies.add_argument(
         '-z', '--zoom', type=int, default=None,
         help='zoom level for the map tiles (default: None). Note that '
-             'certain map tiles might not be available at all zoom levels.'
+             'certain map tiles might not be available at all zoom levels'
     )
     # ---
     # --- flag_family
@@ -254,7 +249,7 @@ def parse_arguments(progname='requake'):
     flagfamily.add_argument(
         'is_valid',
         help='"true" (or "t") to flag family as valid, '
-             '"false" (or "f") to flag family as not valid.'
+             '"false" (or "f") to flag family as not valid'
     )
     # ---
     # --- build_templates

{requake-0.4 → requake-0.5}/requake/config/rq_setup.py

@@ -17,7 +17,10 @@ import logging
 import signal
 import tqdm
 from obspy import UTCDateTime
-from obspy.clients.fdsn import Client
+from obspy import read_inventory
+from obspy.clients.filesystem.sds import Client as SDSClient
+from obspy.clients.fdsn import Client as FDSNClient
+from obspy.clients.fdsn.header import FDSNNoServiceException
 from .._version import get_versions
 from .config import Config
 from .utils import (
@@ -104,14 +107,51 @@ def _setup_logging(config, progname, action_name):
     logger.debug(' '.join(sys.argv))
 
 
-def _connect_fdsn_station_dataselect(config):
-    """Connect to FDSN station and dataselect services."""
-    config.fdsn_station_client = Client(config.fdsn_station_url)
-    logger.info(f'Connected to FDSN station server: {config.fdsn_station_url}')
-    config.fdsn_dataselect_client = Client(config.fdsn_dataselect_url)
+def _connect_station_dataselect(config):
+    """
+    Connect to station and dataselect services.
+
+    Those can be either FDSN web services or local files.
+    """
+    if config.station_metadata_path is not None:
+        config.inventory = read_inventory(config.station_metadata_path)
+        config.station_client = None
+        logger.info(
+            'Reading station metadata from local file: '
+            f'{config.station_metadata_path}'
+        )
+    else:
+        config.station_client = FDSNClient(config.fdsn_station_url)
+        logger.info(
+            f'Connected to FDSN station server: {config.fdsn_station_url}'
+        )
+    if config.waveform_data_path is not None:
+        _connect_sds(config)
+    else:
+        config.dataselect_client = FDSNClient(config.fdsn_dataselect_url)
+        logger.info(
+            'Connected to FDSN dataselect server: '
+            f'{config.fdsn_dataselect_url}'
+        )
+
+
+def _connect_sds(config):
+    """
+    Connect to a local SeisComP Data Structure (SDS) archive.
+    """
+    _client = SDSClient(config.waveform_data_path)
+    all_nslc = _client.get_all_nslc()
+    if not all_nslc:
+        raise FileNotFoundError(
+            f'No SDS archive found in {config.waveform_data_path}'
+        )
+    config.dataselect_client = _client
     logger.info(
-        f'Connected to FDSN dataselect server: {config.fdsn_dataselect_url}'
+        'Reading waveform data from local SDS archive: '
+        f'{config.waveform_data_path}'
     )
+    all_nslc_str = '\n'.join('.'.join(nslc) for nslc in all_nslc)
+    logger.info(f'Found the following NSLC codes:\n{all_nslc_str}')
 
 
 def _parse_catalog_options(config):
@@ -140,7 +180,7 @@ def _connect_fdsn_catalog(config):
     """Connect to FDSN catalog services."""
     config.catalog_fdsn_event_clients = []
     for url in config.catalog_fdsn_event_urls:
-        config.catalog_fdsn_event_clients.append(Client(url))
+        config.catalog_fdsn_event_clients.append(FDSNClient(url))
         logger.info(f'Connected to FDSN event server: {url}')
 
 
@@ -205,10 +245,10 @@ def configure(args):
     )
     try:
         if args.action in actions_needing_fdsn_station_dataselect:
-            _connect_fdsn_station_dataselect(config)
+            _connect_station_dataselect(config)
         if args.action == 'read_catalog' and not args.catalog_file:
             _connect_fdsn_catalog(config)
-    except Exception as m:
+    except (FileNotFoundError, ValueError, FDSNNoServiceException) as m:
         logger.error(m)
         rq_exit(1)
     # Template times must be UTCDateTime objects

{requake-0.4 → requake-0.5}/requake/config/utils.py

@@ -12,6 +12,8 @@ Utility functions for Requake.
 import os
 import sys
 import locale
+import traceback
+from .. import __version__
 from .configobj import ConfigObj
 from .configobj.validate import Validator
 locale.setlocale(locale.LC_ALL, '')
@@ -129,3 +131,41 @@ def validate_config(config_obj):
         sys.exit(1)
     if not test:
         err_exit('No configuration value present!')
+
+
+def manage_uncaught_exception(exception):
+    """
+    Manage an uncaught exception.
+
+    :param exception: Exception object.
+    :type exception: Exception
+    """
+    sys.stderr.write("""
+# BEGIN TRACEBACK #############################################################
+""")
+    sys.stderr.write('\n')
+    traceback.print_exc()
+    sys.stderr.write("""
+# END TRACEBACK ###############################################################
+""")
+    sys.stderr.write("""
+
+Congratulations, you've found a bug in Requake! 🐞
+
+Please report it on https://github.com/SeismicSource/requake/issues
+or by email to satriano@ipgp.fr.
+
+Include the following information in your report:
+
+""")
+    sys.stderr.write(f'  Requake version: {__version__}\n')
+    sys.stderr.write(f'  Python version: {sys.version}\n')
+    sys.stderr.write(f'  Platform: {sys.platform}\n')
+    sys.stderr.write(f'  Command line: {" ".join(sys.argv)}\n')
+    sys.stderr.write(f'  Error message: {str(exception)}\n')
+    sys.stderr.write('\n')
+    sys.stderr.write(
+        'Also, please copy and paste the traceback above in your '
+        'report.\n\n')
+    sys.stderr.write('Thank you for your help!\n\n')
+    sys.exit(1)