gmprocess 2.1.2__tar.gz → 2.2.0__tar.gz

{gmprocess-2.1.2 → gmprocess-2.2.0}/.gitignore

@@ -9,6 +9,7 @@ build
 .coverage.*
 coverage.xml
 htmlcov
+.pymon
 **/gmprocess.egg-info/
 .pytest_cache
 *.so

{gmprocess-2.1.2 → gmprocess-2.2.0}/.gitlab-ci.yml

@@ -23,6 +23,12 @@ default:
   variables:
     ENVIRONMENT: staging
 
+.parallel:
+  parallel:
+    matrix:
+      - PYVER: [3.10-build, 3.11-build, 3.12-build]
+        DIST: [linux]
+
 stages:
   - test
   - build
@@ -47,6 +53,8 @@ run tests and coverage:
     - pytest -x --cov=src/gmprocess/ --cov-report xml:coverage.xml --cov-report term --junitxml junit.xml
     - coverage xml
   stage: test
+#  parallel: !reference [.parallel,parallel]
+
 
 run upload pypi:
   rules:
@@ -67,6 +75,11 @@ run upload pypi:
   stage: build
 
 pages:
+  image: code.usgs.gov:5001/devops/images/usgs/python:3.12-build
+  before_script:
+    - python --version
+    - export PATH="/home/usgs-user/.local/bin:$PATH"
+    - apt-get install tree
   artifacts:
     paths:
       # The folder that contains the files to be exposed at the Page URL

{gmprocess-2.1.2 → gmprocess-2.2.0}/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## main
 
+## 2.2.0 / 2024-12-23
+- Enhancements
+  - Add the PRISM/Jones et al. (doi: 10.1785/0220160200) adaptive baseline correction step.
+  - Add support for SV and SD metrics (for cosmos writer V3)
+  - Add support for V2 (processed acc, vel, disp) and V3 COSMOS writer
+  - Add number of threads configuration of FDSN clients to more reliably retrieve data from FDSN servers that may restrict the number of simultaneous downloads.
+  - Add QA check comparing the combined stage gains to the overall instrument sensitivity.
+  - Add QA step to check that the data type of miniseed raw data are integers.
+  - Add options for downloading origin/strec/rupture/waveform data individually to the download subcommand.
+  - StationTrace methods:
+    - Override the Trace taper method so that the provenance is set when this activity is performed.
+    - Ditto for detrend.
+    - Ditto for trim.
+    - Add a zero_pad method as a helper for zero padding.
+  - Add zero pad processing step.
+  - Add progress bar while creating diagnostic plots.
+- Bug fixes
+  - Ensure that the FFT is taken for the length record as is used for normalizing the SNR.
+- Other
+  - When trying to read the config file, allow for yaml read error to be raised rather than returning None. 
+  - Increase tolerance for misaligned traces to be resampled.
 
 ## 2.1.2 / 2024-11-14
 - Enhancements

{gmprocess-2.1.2 → gmprocess-2.2.0}/CONTRIBUTING.md

@@ -82,12 +82,12 @@ Common reasons to rebase include:
    ```
 3. Update `CHANGELOG.md` to include the changes for this version. The goal is for the changelog to be kept up to date with each merge request, so this step should largely consist of creating a new section for this release and moving content into it from "main". 
 4. Commit changes to the `v1.2.1.rc0` branch.
-5. Merge the release candidate back into main. 
+5. Push the branch to your origin.
    ```
    git push origin v1.2.1.rc0
    ```
-   Then create a merge request in to upstream main.
-6. Create an annotated tag **from main** and push the tag upstream
+6. Create a merge request in to upstream main, merge it, and rebase locally.
+7. Create an annotated tag **from main** and push the tag upstream
    ```
    git tag -a v1.2.1 -m "Version 1.2.1"
    git push upstream v1.2.1
@@ -96,8 +96,8 @@ Common reasons to rebase include:
    - *Note that we cannot have a hyphen in the tag name.* 
    - Also, if we end the tag name with "dev" then it will be build and uploaded to pypi as a pre-release version, which means that it will never be pip installed unless the user specifies the exact version of the pre-release.
    - Maintainence note: the PYPI tokens are maintained in gitlab for the ESI group, under Settings then CI/CD, then Variables. These tokens are associated with the "pager_cicd" pypi service account.  
-7. Create release from tag in gitlab. Give it a release title like `v1.2.1`.
-8. Copy/paste the relevant part of the changelog into the "describe this release" section.
+8. Create release from tag in gitlab. Give it a release title like `v1.2.1`.
+9. Copy/paste the relevant part of the changelog into the "describe this release" section.
 
 
 ## Build Documentation

gmprocess-2.2.0/DISCLAIMER.md

@@ -0,0 +1,9 @@
+This software is preliminary or provisional and is subject to revision.
+It is being provided to meet the need for timely best science.
+The software has not received final approval by the U.S. Geological Survey (USGS).
+No warranty, expressed or implied, is made by the USGS or the U.S. Government
+as to the functionality of the software and related material
+nor shall the fact of release constitute any such warranty.
+The software is provided on the condition that neither the USGS nor the U.S. Government
+shall be held liable for any damages resulting from the authorized or unauthorized
+use of the software.

{gmprocess-2.1.2 → gmprocess-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gmprocess
-Version: 2.1.2
+Version: 2.2.0
 Summary: USGS Automated Ground Motion Processing Software
 Author-email: Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>, Brad Aagaard <baagaard@usgs.gov>, Bruce Worden <cbworden@contractor.usgs.gov>, John Rekoske <jrekoske@ucsd.edu>, Heather Hunsinger <hhunsinger@usgs.gov>, Gabe Ferragut <gferragut@usgs.gov>
 License: License
@@ -68,6 +68,7 @@ Requires-Dist: obspy>=1.4.1
 Requires-Dist: openpyxl>=3.0.8
 Requires-Dist: openquake.engine>=3.18
 Requires-Dist: pandas>=1.0
+Requires-Dist: Pint>0.24.3
 Requires-Dist: ps2ff>=1.5.2
 Requires-Dist: pyasdf>=0.7
 Requires-Dist: pydantic>=2.0
@@ -77,6 +78,7 @@ Requires-Dist: schema>=0.7
 Requires-Dist: scipy>=1.7
 Requires-Dist: setuptools-scm>=6.3.2
 Requires-Dist: statsmodels>=0.12.2
+Requires-Dist: tqdm>4.67
 Requires-Dist: usgs-strec>=2.3.2
 Requires-Dist: xlrd>=2.0
 Provides-Extra: dev

{gmprocess-2.1.2 → gmprocess-2.2.0}/code.json

@@ -1,4 +1,45 @@
 [
+    {
+        "name": "groundmotion-processing",
+        "description": "Read and process ground motion waveform data",
+        "version": "v2.2.0",
+        "status": "Production",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/groundmotion-processing.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/groundmotion-processing",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/groundmotion-processing/-/archive/v2.2.0/groundmotion-processing-v2.2.0.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/groundmotion-processing/-/raw/v2.2.0/DISCLAIMER.md",
+        "permissions": {
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/groundmotion-processing/-/raw/v2.2.0/LICENSE.md"
+                }
+            ],
+            "usageType": "openSource",
+            "exemptionText": null
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "impact",
+            "strong motion",
+            "amplitudes",
+            "ground motion",
+            "usg-artificial-intelligence"
+        ],
+        "contact": {
+            "name": "Eric Thompson",
+            "email": "emthompson@usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2024-12-23"
+        }
+    },
     {
         "name": "groundmotion-processing",
         "description": "Read and process ground motion waveform data",

{gmprocess-2.1.2 → gmprocess-2.2.0}/pyproject.toml

@@ -34,6 +34,7 @@ dependencies = [
     "openpyxl>=3.0.8",
     "openquake.engine>=3.18",
     "pandas>=1.0",
+    "Pint>0.24.3",
     "ps2ff>=1.5.2",
     "pyasdf>=0.7",
     "pydantic>=2.0",
@@ -43,6 +44,7 @@ dependencies = [
     "scipy>=1.7",
     "setuptools-scm>=6.3.2",
     "statsmodels>=0.12.2",
+    "tqdm>4.67",
     "usgs-strec>=2.3.2",
     "xlrd>=2.0",
 ]
@@ -88,7 +90,6 @@ gminfo = "gmprocess.bin.gminfo:cli"
 gmrecords = "gmprocess.bin.gmrecords:main"
 gmworkspace = "gmprocess.bin.gmworkspace:main"
 gmprocess_config = "gmprocess.bin.gmprocess_config:main"
-list_metrics = "gmprocess.bin.list_metrics:main"
 cwa_gather = "gmprocess.bin.cwa_gather:cli"
 fix_inventory = "gmprocess.bin.fix_inventory:main"
 fetch_orfeus = "gmprocess.bin.fetch_orfeus:cli"

{gmprocess-2.1.2 → gmprocess-2.2.0}/setup_env.sh

@@ -94,7 +94,7 @@ conda activate $VENV
 
 # Do mac-specific conda installs
 if [ "$unamestr" == 'FreeBSD' ] || [ "$unamestr" == 'Darwin' ]; then
-    # This is motivated by the mysterios pyproj/rasterio error and incorrect results
+    # This is motivated by the mysterious pyproj/rasterio error and incorrect results
     # that only happen on ARM macs. 
     # https://github.com/conda-forge/pyproj-feedstock/issues/156
     conda install -c conda-forge -y libgdal-netcdf

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/bin/bundle_datarelease.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 """Utility script for bundling workspace files for archiving a data release as a special project at CESMD."""
 
-GMPROCESS_ASDF_URL = "https://gmprocess.readthedocs.io/en/latest/contents/manual/workspace.html"
 
 import pathlib
 import shutil
@@ -11,7 +10,12 @@ import io
 import h5py
 import obspy
 
-class HtmlIndex():
+GMPROCESS_ASDF_URL = (
+    "https://gmprocess.readthedocs.io/en/latest/contents/manual/workspace.html"
+)
+
+
+class HtmlIndex:
 
     def __init__(self, project_name):
         self.project_name = project_name
@@ -66,11 +70,11 @@ class HtmlIndex():
         lines = (
             """<p>Earthquake are ordered by origin time.</p>""",
             """<table style = "width: 30%">""",
-        	"""\t<tr>""",
-		    """\t\t<th style = "width: 20%">Filename</th>""",
-		    """\t\t<th style = "width: 12.5%">Event ID</th>""",
-		    """\t\t<th style = "width: 12.5%">Filesize</th>""",
-	        """\t</tr>""",
+            """\t<tr>""",
+            """\t\t<th style = "width: 20%">Filename</th>""",
+            """\t\t<th style = "width: 12.5%">Event ID</th>""",
+            """\t\t<th style = "width: 12.5%">Filesize</th>""",
+            """\t</tr>""",
         )
         for eq_id, file_size in event_info:
             lines += (
@@ -84,8 +88,8 @@ class HtmlIndex():
             self.fout.write(line + "\n")
 
 
-class DataReleaseApp():
-    
+class DataReleaseApp:
+
     def main(self, project_name: str, project_title: str, data_dir: pathlib.Path):
         self.project_name = project_name
         self.project_title = project_title
@@ -136,9 +140,9 @@ class DataReleaseApp():
         filename = self.data_dir / event_id / "workspace.h5"
         nbytes = os.path.getsize(filename)
         if nbytes >= 2**30:
-            size = f"{nbytes / 2**30:.2f} GB" 
+            size = f"{nbytes / 2**30:.2f} GB"
         elif nbytes >= 2**20:
-            size = f"{nbytes / 2**20:.2f} MB" 
+            size = f"{nbytes / 2**20:.2f} MB"
         else:
             size = f"{nbytes // 2**10:.2f} KB"
         return size
@@ -150,10 +154,26 @@ def cli():
 
     import argparse
 
-    parser = argparse.ArgumentParser(description=DESCRIPTION, formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("--project", action="store", dest="project", required=True, help="CESMD project identifier")
-    parser.add_argument("--title", action="store", dest="title", required=True, help="Title of project")
-    parser.add_argument("--data-dir", action="store", dest="data_dir", required=True, help="Data directory containing events.")
+    parser = argparse.ArgumentParser(
+        description=DESCRIPTION, formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+    parser.add_argument(
+        "--project",
+        action="store",
+        dest="project",
+        required=True,
+        help="CESMD project identifier",
+    )
+    parser.add_argument(
+        "--title", action="store", dest="title", required=True, help="Title of project"
+    )
+    parser.add_argument(
+        "--data-dir",
+        action="store",
+        dest="data_dir",
+        required=True,
+        help="Data directory containing events.",
+    )
     args = parser.parse_args()
 
     app = DataReleaseApp()
@@ -162,8 +182,8 @@ def cli():
         "project_title": args.title,
         "data_dir": pathlib.Path(args.data_dir).expanduser(),
     }
-    import pdb; pdb.set_trace()
     app.main(**kwds)
 
+
 if __name__ == "__main__":
     cli()

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/core/scalar_event.py

@@ -241,6 +241,7 @@ class ScalarEvent(Event):
             "magnitude": self.magnitude,
             "magnitude_type": self.magnitude_type,
         }
+        logging.info(f"Creating event file: {filename}")
         with open(filename, "w", encoding="utf-8") as f:
             json.dump(data, f)
 
@@ -348,5 +349,6 @@ def write_geojson(data, event_dir):
             Event directory.
     """
     filename = event_dir / constants.EVENT_FILE
+    logging.info(f"Creating event file: {filename}")
     with open(filename, "w", encoding="utf-8") as fout:
         json.dump(data, fout)

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/core/stationstream.py

@@ -39,7 +39,7 @@ UNUSED_STANDARD_PARAMS = [
     "source_format",
 ]
 
-TIME_TOL = 1e-6
+TIME_TOL = 1e-5
 
 
 class StationStream(Stream):

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/core/stationtrace.py

@@ -388,6 +388,117 @@ class StationTrace(Trace):
         )
         return self
 
+    def zero_pad(self, length):
+        """Zero pad trace and add entry to provenance.
+
+        Zero pads are added at the beginning and end of the trace, EACH of which has
+        duration of `length` (in sec).
+
+        Args:
+            length (float):
+                The length (in sec) to padd with zeros before and after the trace.
+        """
+        start_time = self.stats.starttime - length
+        end_time = self.stats.endtime + length
+        self.trim(starttime=start_time, endtime=end_time, pad=True, fill_value=0.0)
+
+        self.set_provenance(
+            "pad",
+            {
+                "fill_value": 0.0,
+                "new_start_time": start_time,
+                "new_end_time": end_time,
+            },
+        )
+        return self
+
+    def taper(self, max_percentage, type="hann", max_length=None, side="both"):
+        """Taper trace and add entry to provenance.
+
+        This just overrides the ObsPy Trace method to append to the provenance for
+        tracking this operation.
+
+        Args:
+            max_percentage (float):
+                 Decimal percentage of taper at one end (ranging from 0. to 0.5).
+            type (str):
+                Type of taper to use for detrending.
+            max_length (float):
+                Length of taper at one end in seconds.
+            side (str):
+                Specify if both sides should be tapered (default, “both”) or if only the
+                left half (“left”) or right half (“right”) should be tapered.
+        """
+
+        self.set_provenance(
+            "taper",
+            {
+                "max_percentage": max_percentage,
+                "type": type,
+                "side": side,
+                "max_length": max_length,
+            },
+        )
+        return super().taper(
+            max_percentage=max_percentage,
+            type=type,
+            side=side,
+            max_length=max_length,
+        )
+
+    def detrend(self, type="simple"):
+        """Detrend trace and add entry to provenance.
+
+        This just overrides the ObsPy Trace method to append to the provenance for
+        tracking this operation.
+
+        Args:
+            type (str):
+                 Method to use for detrending.
+        """
+
+        self.set_provenance(
+            "detrend",
+            {
+                "detrending_method": type,
+            },
+        )
+        return super().detrend(type=type)
+
+    def trim(
+        self,
+        starttime=None,
+        endtime=None,
+        pad=False,
+        nearest_sample=True,
+        fill_value=None,
+    ):
+        """Trim trace and add entry to provenance.
+
+        This just overrides the ObsPy Trace method to append to the provenance for
+        tracking this operation.
+
+        Args:
+            starttime (UTCDateTime):
+                Start time.
+            endtime (UTCDateTime):
+                End time.
+            pad (bool):
+                Trim at time points outside the time frame of the original trace?
+            nearest_sample (bool):
+                See obspy docs.
+            fill_value (int, float):
+                Fill value for gaps.
+        """
+        self.set_provenance(
+            "cut",
+            {
+                "new_start_time": starttime,
+                "new_end_time": endtime,
+            },
+        )
+        return super().trim(starttime, endtime, pad, nearest_sample, fill_value)
+
     def integrate(
         self,
         frequency=True,
@@ -422,27 +533,10 @@ class StationTrace(Trace):
         """
 
         if demean:
-            self.data -= np.mean(self.data)
-            self.set_provenance(
-                "detrend",
-                {
-                    "input_units": self.stats.standard.units,
-                    "output_units": self.stats.standard.units,
-                },
-            )
+            self.detrend(type="demean")
 
         if taper:
             self.taper(max_percentage=taper_width, type=taper_type, side=taper_side)
-            self.set_provenance(
-                "taper",
-                {
-                    "max_percentage": taper_width,
-                    "type": taper_type,
-                    "side": taper_side,
-                    "input_units": self.stats.standard.units,
-                    "output_units": self.stats.standard.units,
-                },
-            )
 
         if frequency:
             # integrating in frequency domain

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/data/config_production.yml

@@ -263,6 +263,7 @@ fetchers:
                 - 74.7
                 - -35.5
                 - 60.4
+                threads: 1
                 url: http://service.scedc.caltech.edu
             - TEXNET:
                 bounds:
@@ -586,9 +587,9 @@ integration:
     # Assumption for the first value returned in the resulting trace.
     initial: 0.0
     # Remove the mean of the data prior to integration.
-    demean: True
+    demean: False
     # Taper the data prior to integration.
-    taper: True
+    taper: False
     taper_width: 0.05
     taper_type: hann
     taper_side: both

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/io/asdf/core.py

@@ -78,7 +78,7 @@ def write_asdf(filename, streams, event, label=None):
     """
     workspace = StreamWorkspace(filename)
     workspace.add_config()
-    if not event.id in workspace.get_event_ids():
+    if event.id not in workspace.get_event_ids():
         workspace.add_event(event)
     workspace.add_streams(event, streams, label=label, gmprocess_version=VERSION)
     workspace.close()

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/io/asdf/flatfile.py

@@ -74,9 +74,7 @@ class Flatfile(object):
         """
         if hasattr(self.workspace, "config"):
             config = self.workspace.config
-            default_config_file = (
-                constants.DATA_DIR / constants.CONFIG_FILE_PRODUCTION
-            )
+            default_config_file = constants.DATA_DIR / constants.CONFIG_FILE_PRODUCTION
             with open(default_config_file, "r", encoding="utf-8") as f:
                 yaml = YAML()
                 yaml.preserve_quotes = True
@@ -87,9 +85,7 @@ class Flatfile(object):
         any_trace_failures = config["check_stream"]["any_trace_failures"]
         use_array = not config["read"]["use_streamcollection"]
 
-        wmc = WaveformMetricCollection.from_workspace(
-            self.workspace, self.label
-        )
+        wmc = WaveformMetricCollection.from_workspace(self.workspace, self.label)
         smc = StationMetricCollection.from_workspace(self.workspace)
         for wml, stream_meta, station_metrics in zip(
             wmc.waveform_metrics, wmc.stream_metadata, smc.station_metrics
@@ -98,9 +94,7 @@ class Flatfile(object):
                 continue
 
             self._station_metrics = station_metrics
-            passed_traces = [
-                tr_met for tr_met in stream_meta if tr_met["passed"]
-            ]
+            passed_traces = [tr_met for tr_met in stream_meta if tr_met["passed"]]
 
             n_passed = len(passed_traces)
             for tr in passed_traces:
@@ -286,9 +280,7 @@ class Flatfile(object):
                 imt_cols = [x for x in imt_cols if x not in fas_cols]
             imt_cols.sort(key=_natural_keys)
 
-            non_imt_cols = [
-                col for col in table.columns if col not in self.imtlist
-            ]
+            non_imt_cols = [col for col in table.columns if col not in self.imtlist]
             table = table[non_imt_cols + imt_cols]
             self.imc_tables[key] = table
             readme_dict = {}
@@ -298,17 +290,19 @@ class Flatfile(object):
                 else:
                     imt = col.upper()
                     if imt.startswith("SA"):
-                        readme_dict["SA(X)"] = flat_const.FLATFILE_IMT_COLUMNS[
-                            "SA(X)"
-                        ]
+                        readme_dict["SA(X)"] = flat_const.FLATFILE_IMT_COLUMNS["SA(X)"]
+                    elif imt.startswith("SV"):
+                        readme_dict["SV(X)"] = flat_const.FLATFILE_IMT_COLUMNS["SV(X)"]
+                    elif imt.startswith("SD"):
+                        readme_dict["SD(X)"] = flat_const.FLATFILE_IMT_COLUMNS["SD(X)"]
                     elif imt.startswith("FAS"):
                         readme_dict["FAS(X)"] = flat_const.FLATFILE_IMT_COLUMNS[
                             "FAS(X)"
                         ]
                     elif imt.startswith("DURATION"):
-                        readme_dict["DURATIONp-q"] = (
-                            flat_const.FLATFILE_IMT_COLUMNS["DURATIONp-q"]
-                        )
+                        readme_dict["DURATIONp-q"] = flat_const.FLATFILE_IMT_COLUMNS[
+                            "DURATIONp-q"
+                        ]
                     else:
                         readme_dict[imt] = flat_const.FLATFILE_IMT_COLUMNS[imt]
             df_readme = pd.DataFrame.from_dict(readme_dict, orient="index")
@@ -355,9 +349,7 @@ class Flatfile(object):
                         fit_dict["StationLongitude"] = coords.longitude
                         fit_dict["StationElevation"] = coords.elevation
                         if trace.has_parameter("corner_frequencies"):
-                            freq_dict = trace.get_parameter(
-                                "corner_frequencies"
-                            )
+                            freq_dict = trace.get_parameter("corner_frequencies")
                             fit_dict["fmin"] = freq_dict["highpass"]
                             fit_dict["fmax"] = freq_dict["lowpass"]
                         fit_table.append(fit_dict)
@@ -370,9 +362,7 @@ class Flatfile(object):
         # Ensure that the DataFrame columns are ordered correctly
         fit_df = fit_df[flat_const.FIT_SPECTRA_COLUMNS.keys()]
 
-        readme = pd.DataFrame.from_dict(
-            flat_const.FIT_SPECTRA_COLUMNS, orient="index"
-        )
+        readme = pd.DataFrame.from_dict(flat_const.FIT_SPECTRA_COLUMNS, orient="index")
         readme.reset_index(level=0, inplace=True)
         readme.columns = ["Column header", "Description"]
 
@@ -472,10 +462,7 @@ def _natural_keys(text):
     Helper function for sorting IMT list. This is needed because using the
     plain .sort() will put SA(10.0) before SA(2.0), for example.
     """
-    return [
-        _atof(c)
-        for c in re.split(r"[+-]?([0-9]+(?:[.][0-9]*)?|[.][0-9]+)", text)
-    ]
+    return [_atof(c) for c in re.split(r"[+-]?([0-9]+(?:[.][0-9]*)?|[.][0-9]+)", text)]
 
 
 def _atof(text):

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/io/asdf/flatfile_constants.py

@@ -72,6 +72,8 @@ FLATFILE_IMT_COLUMNS = {
     "PGA": f"Peak ground acceleration ({constants.UNITS['pga']})",
     "PGV": f"Peak ground velocity ({constants.UNITS['pgv']})",
     "SA(X)": f"Pseudo-spectral acceleration ({constants.UNITS['sa']}) at X seconds",
+    "SV(X)": f"Sspectral velocity ({constants.UNITS['sv']}) at X seconds",
+    "SD(X)": f"Spectral displacmeent ({constants.UNITS['sd']}) at X seconds",
     "FAS(X)": (
         f"Fourier amplitude spectrum value ({constants.UNITS['fas']}) at X seconds"
     ),

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/io/asdf/rupture.py

@@ -1,4 +1,5 @@
 """Module for adding rupture to ASDF file."""
+
 import json
 
 from esi_utils_rupture.point_rupture import PointRupture
@@ -71,7 +72,7 @@ class Rupture(object):
                 try:
                     coordinate = coordinate[0]
                     coordinate = find_point_coordinate(coordinate)
-                except:
+                except BaseException:
                     raise Exception(
                         "Could not identify a list of [x, y, z] for point rupture coordinate in rupture.json"
                     )

{gmprocess-2.1.2 → gmprocess-2.2.0}/src/gmprocess/io/asdf/waveform_metrics_xml.py

@@ -160,6 +160,10 @@ def etag2type(etag):
     etag = etag.lower()
     if etag.startswith("sa"):
         etag_type = "sa"
+    elif etag.startswith("sv"):
+        etag_type = "sv"
+    elif etag.startswith("sd"):
+        etag_type = "sd"
     elif etag.startswith("fas"):
         etag_type = "fas"
     elif etag.startswith("duration"):