From d19beafc17b4ba45d0a50c36fcfce4fdf1992f4d Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 13:15:48 -0700
Subject: [PATCH 01/11] updated lib

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7d70e87f..44f176a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ micronautVersion = 3.2.3
 micronautRxVersion = 2.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
-nshmpLibVersion = 1.4.8
+nshmpLibVersion = 1.4.14
 nshmpUtilsJavaVersion = 0.4.0
 openApiVersion = 4.0.0
 shadowVersion = 7.1.2
-- 
GitLab


From a2360bc369a009c96462f901bec2af90f8ccc962 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 13:34:46 -0700
Subject: [PATCH 02/11] switched to enum identifier for test results

---
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 1a886f34..5e0a3216 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -101,7 +101,7 @@ class NshmTests {
 
     // run single model
     NshmModel nshmModel =
-        NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2018"));
 
     NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
     nshmModel.exec.shutdown();
-- 
GitLab


From 633c49d7b5eeadb416cc371dad4a656688903aac Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 13:35:23 -0700
Subject: [PATCH 03/11] updated test result keys to imt enum

---
 .../resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json   |  8 ++++----
 .../resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json   |  8 ++++----
 src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json |  8 ++++----
 src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json |  8 ++++----
 src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json |  8 ++++----
 .../resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json   | 10 +++++-----
 .../resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json   | 10 +++++-----
 src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json | 10 +++++-----
 src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json | 10 +++++-----
 src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json  | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json | 10 +++++-----
 .../resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json  | 10 +++++-----
 .../resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json   | 10 +++++-----
 .../resources/e2e/nshm-conus-2018/NEW_YORK_NY.json     | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2018/RENO_NV.json    | 10 +++++-----
 .../e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json         | 10 +++++-----
 .../e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json          | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json  | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json | 10 +++++-----
 .../resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json  | 10 +++++-----
 .../resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json   | 10 +++++-----
 .../resources/e2e/nshm-conus-2023/NEW_YORK_NY.json     | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2023/RENO_NV.json    | 10 +++++-----
 .../e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json         | 10 +++++-----
 .../e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json          | 10 +++++-----
 src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json | 10 +++++-----
 src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json   | 10 +++++-----
 .../resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json    | 10 +++++-----
 .../resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json | 10 +++++-----
 31 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
index 886951be..5ab02cbd 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       7.2501279465804674E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
index 2aa60b55..596c48db 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       3.762744898891126E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
index 4132d017..6445e445 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       3.0346597226294626E-10
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
index 51c37bc2..71a8362b 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       5.993776825224994E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
index 250d6bc0..3a56a718 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -137,4 +137,4 @@
       5.44663885326246E-9
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
index e214bc04..d9addf3b 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.013028621585243E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.1051926173257162E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.9396669346552432E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
index 30ba94f0..37fa914a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.380256208276404E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.7289401638074338E-11
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.0436138874114594E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
index 4a44296b..2bc3cbf8 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.240103338446744E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.082286883282842E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.63015145137678E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
index 9d31e574..75407a2a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.559925657574019E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.6126001839969183E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.070985240786104E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
index 47892fa5..819f3047 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.504792547924437E-7
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.964851901415382E-6
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.367787680902291E-5
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
index 6cd46fdf..b713b473 100644
--- a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.503383766857791E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.0385526508492285E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.2462940285422412E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       9.342364439170646E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
index c9f8abcc..1c2f1aa9 100644
--- a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.0633132855584107E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.1469632224157163E-13
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.549954903295298E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.265638077580196E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
index ec0f3335..0ca4ff14 100644
--- a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.5384348649550975E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.1414950535737366E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.3576513888748992E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
index cbfaef76..638bda0f 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       3.2819885795529324E-6
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.603564897905062E-8
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       7.632592705118938E-5
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.1269789534198826E-4
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
index e16e65b3..aa3feff2 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       9.713305930824852E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.5324451927867105E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.967278678289316E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.4238886738032342E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
index a3d21f9e..9dfb5d5e 100644
--- a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       8.240992980384035E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       4.063222371389606E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.3625843088903307E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
index d4c53478..99e7a3ea 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.214779787490519E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.36531590202622E-14
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.2680106464068334E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.7011160805776843E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
index 1ef0c588..9e4d5bdc 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       5.0449196459382226E-12
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.574987545635484E-12
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.1332666265240459E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
index a84b8b13..5fdef9a9 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.354050123798512E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       8.135310824349085E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.68125464781831E-10
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.7281340794708457E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index fe0a6ab2..3060b720 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.742272834535854E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.028579358099718E-11
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       3.963193550050804E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.3647467423869639E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index ad6fc716..e7202e7b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.5802146447004877E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       9.381018392075353E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.060200630189975E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.1124228394497636E-8
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index 5b374db8..8fee0814 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       5.2588487621771735E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.1737259531833734E-14
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       5.830091651054837E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       5.041371572081886E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index c7e62896..a9d80102 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       6.721429379688255E-6
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       2.7985578953711946E-7
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       8.845979888500936E-5
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.083218280210284E-4
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index b4f11335..6809afc0 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.2393461421128455E-9
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       1.0719894546654211E-10
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       6.313004310982963E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       3.6913561822247894E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index 6bcef884..f4820e25 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.0054998350751101E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       1.7885452404470933E-10
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.01123348460218E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index 5b0ad4f6..bd2bc1d9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       1.3362154203028717E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.266803290550335E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.386951424389801E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 96cf3274..f5e68379 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.275203391051003E-11
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       0.0
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.588602412382955E-11
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       2.2239402021916294E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 3de9d732..67bc5eb9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       2.2378453810730706E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       4.389238001777538E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       9.671006675588189E-8
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       4.100982884701552E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
index 9390be33..d6ebbb57 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.7166583187373387E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       3.427414499140028E-10
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.0121735347546392E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       5.139667971021216E-6
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
index 755d3992..eb99e2dc 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       8.894088492362763E-10
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       8.040835683421514E-12
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       5.03174786246266E-9
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       1.0763757443621396E-7
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
index bbc56014..d5764459 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
@@ -1,5 +1,5 @@
 {
-  "1.00 Second Spectral Acceleration": {
+  "SA1P0": {
     "xs": [
       -5.991464547107982,
       -5.585999438999818,
@@ -45,7 +45,7 @@
       4.4135240737735364E-8
     ]
   },
-  "5.00 Second Spectral Acceleration": {
+  "SA5P0": {
     "xs": [
       -6.908755779315721,
       -6.502290170873972,
@@ -91,7 +91,7 @@
       7.198489307670766E-9
     ]
   },
-  "Peak Ground Acceleration": {
+  "PGA": {
     "xs": [
       -6.061887011404528,
       -5.654992310486769,
@@ -137,7 +137,7 @@
       2.3097496341714198E-7
     ]
   },
-  "0.20 Second Spectral Acceleration": {
+  "SA0P2": {
     "xs": [
       -5.704782974989785,
       -5.30031936921871,
@@ -183,4 +183,4 @@
       6.280186508295586E-6
     ]
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From 0cf2f567f682b1d991ff9e52d49c28d1109ffa8b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 14:13:58 -0700
Subject: [PATCH 04/11] reordered test results

---
 .../e2e/nshm-alaska-2007/ANCHORAGE_AK.json    | 92 +++++++++----------
 .../e2e/nshm-alaska-2007/FAIRBANKS_AK.json    | 92 +++++++++----------
 .../e2e/nshm-alaska-2007/JUNEAU_AK.json       | 92 +++++++++----------
 .../e2e/nshm-alaska-2007/KODIAK_AK.json       | 92 +++++++++----------
 .../e2e/nshm-alaska-2007/VALDEZ_AK.json       | 92 +++++++++----------
 5 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
index 5ab02cbd..dce642d0 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -1,50 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      1.2264112924120234,
-      1.0130512209664995,
-      0.7922530404574435,
-      0.5845793026436414,
-      0.40948452443114636,
-      0.2701877564144387,
-      0.17153207603363751,
-      0.10302708940800644,
-      0.05859440515291784,
-      0.030795114630204887,
-      0.014682892533395813,
-      0.006335021583353106,
-      0.002520765819334627,
-      9.186393104929187E-4,
-      2.783076458862005E-4,
-      6.191426810623913E-5,
-      7.185728855298651E-6,
-      4.5801849257632056E-8,
-      4.150306342389818E-11,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       8.209138694463464E-7,
       7.2501279465804674E-9
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.2264112924120234,
+      1.0130512209664995,
+      0.7922530404574435,
+      0.5845793026436414,
+      0.40948452443114636,
+      0.2701877564144387,
+      0.17153207603363751,
+      0.10302708940800644,
+      0.05859440515291784,
+      0.030795114630204887,
+      0.014682892533395813,
+      0.006335021583353106,
+      0.002520765819334627,
+      9.186393104929187E-4,
+      2.783076458862005E-4,
+      6.191426810623913E-5,
+      7.185728855298651E-6,
+      4.5801849257632056E-8,
+      4.150306342389818E-11,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
index 596c48db..52225a6f 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -1,50 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.3579707181853255,
-      0.2876987126769738,
-      0.2161973568686493,
-      0.15154369220846364,
-      0.1000432007569064,
-      0.06178566373277879,
-      0.03666603494724606,
-      0.020552165118987144,
-      0.010941529185374504,
-      0.005426831311015517,
-      0.0024683139938808936,
-      0.0010104231156229232,
-      3.6483773608183754E-4,
-      1.1160888079220879E-4,
-      2.7953221062312066E-5,
-      5.271529944160336E-6,
-      5.907387765772356E-7,
-      2.8051670944348496E-8,
-      3.2640527676385684E-10,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       3.4044289504614473E-7,
       3.762744898891126E-9
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.3579707181853255,
+      0.2876987126769738,
+      0.2161973568686493,
+      0.15154369220846364,
+      0.1000432007569064,
+      0.06178566373277879,
+      0.03666603494724606,
+      0.020552165118987144,
+      0.010941529185374504,
+      0.005426831311015517,
+      0.0024683139938808936,
+      0.0010104231156229232,
+      3.6483773608183754E-4,
+      1.1160888079220879E-4,
+      2.7953221062312066E-5,
+      5.271529944160336E-6,
+      5.907387765772356E-7,
+      2.8051670944348496E-8,
+      3.2640527676385684E-10,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
index 6445e445..fcb5daed 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -1,50 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.16511811331797466,
-      0.13341073384176416,
-      0.10385618456014634,
-      0.07902188859550191,
-      0.060018273294110976,
-      0.04528787827937676,
-      0.03363944818919821,
-      0.023361198780357813,
-      0.014729158649896958,
-      0.008263769244431687,
-      0.004070643006385593,
-      0.0016897632184527708,
-      5.577598349609066E-4,
-      1.3686390458969688E-4,
-      2.1816420596039634E-5,
-      2.2352701196940556E-6,
-      1.797907745395782E-7,
-      3.505992629167848E-9,
-      2.6574564716418673E-11,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       2.7618125380620528E-8,
       3.0346597226294626E-10
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.16511811331797466,
+      0.13341073384176416,
+      0.10385618456014634,
+      0.07902188859550191,
+      0.060018273294110976,
+      0.04528787827937676,
+      0.03363944818919821,
+      0.023361198780357813,
+      0.014729158649896958,
+      0.008263769244431687,
+      0.004070643006385593,
+      0.0016897632184527708,
+      5.577598349609066E-4,
+      1.3686390458969688E-4,
+      2.1816420596039634E-5,
+      2.2352701196940556E-6,
+      1.797907745395782E-7,
+      3.505992629167848E-9,
+      2.6574564716418673E-11,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
index 71a8362b..e7f40369 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -1,50 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      1.025532000785376,
-      0.8431494646534106,
-      0.6539381720622285,
-      0.47760914477051053,
-      0.33153535611135243,
-      0.21782718962885356,
-      0.13909411174965414,
-      0.08566226732937617,
-      0.051713628585688676,
-      0.03041336789622197,
-      0.017185615957543664,
-      0.00909095804527792,
-      0.0043637971586372995,
-      0.0018093070914810944,
-      5.897333191354899E-4,
-      1.3387369180688693E-4,
-      1.655933871082143E-5,
-      4.295128471502182E-8,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       7.927603848727249E-7,
       5.993776825224994E-9
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.025532000785376,
+      0.8431494646534106,
+      0.6539381720622285,
+      0.47760914477051053,
+      0.33153535611135243,
+      0.21782718962885356,
+      0.13909411174965414,
+      0.08566226732937617,
+      0.051713628585688676,
+      0.03041336789622197,
+      0.017185615957543664,
+      0.00909095804527792,
+      0.0043637971586372995,
+      0.0018093070914810944,
+      5.897333191354899E-4,
+      1.3387369180688693E-4,
+      1.655933871082143E-5,
+      4.295128471502182E-8,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
index 3a56a718..d5f7272f 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -1,50 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.8059935642199796,
-      0.6628025988279755,
-      0.5130848761444204,
-      0.37334379917625177,
-      0.2574618130649236,
-      0.1668802689507941,
-      0.1038507671950509,
-      0.06115368099871682,
-      0.03452531094845143,
-      0.018603578147822663,
-      0.00956051741874846,
-      0.004689990484845557,
-      0.0022235404552280497,
-      0.0010111417491271402,
-      4.0201835791559096E-4,
-      1.2046253935740112E-4,
-      2.2072704517587235E-5,
-      1.5276946097946847E-6,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -136,5 +90,51 @@
       7.556890746184725E-7,
       5.44663885326246E-9
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.8059935642199796,
+      0.6628025988279755,
+      0.5130848761444204,
+      0.37334379917625177,
+      0.2574618130649236,
+      0.1668802689507941,
+      0.1038507671950509,
+      0.06115368099871682,
+      0.03452531094845143,
+      0.018603578147822663,
+      0.00956051741874846,
+      0.004689990484845557,
+      0.0022235404552280497,
+      0.0010111417491271402,
+      4.0201835791559096E-4,
+      1.2046253935740112E-4,
+      2.2072704517587235E-5,
+      1.5276946097946847E-6,
+      0.0,
+      0.0
+    ]
   }
 }
-- 
GitLab


From df9145faba42e7f6434935f36927a93ad3278068 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 14:20:19 -0700
Subject: [PATCH 05/11] reordered hawaii 2021 results

---
 .../e2e/nshm-hawaii-2021/HILO_HI.json         | 184 +++++++++---------
 .../e2e/nshm-hawaii-2021/HONOLULU_HI.json     | 184 +++++++++---------
 .../e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json  | 184 +++++++++---------
 3 files changed, 276 insertions(+), 276 deletions(-)

diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
index d6ebbb57..233ce920 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      1.1394279599298858,
-      0.909645925740205,
-      0.6810439562313704,
-      0.48213438998284386,
-      0.3270662494936988,
-      0.2122733790095776,
-      0.13579352589768764,
-      0.08466990088453301,
-      0.051479667241025914,
-      0.029592215233161495,
-      0.015605186053687877,
-      0.007369438722986227,
-      0.003079134500128523,
-      0.001133816052813239,
-      3.683841726832002E-4,
-      1.077152977087167E-4,
-      2.7590429340726252E-5,
-      6.106383784135073E-6,
-      9.141545957726994E-7,
-      4.7166583187373387E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.24225805041057027,
-      0.1626494298061276,
-      0.11286823232748024,
-      0.08019936527365806,
-      0.057001082377164766,
-      0.03977231046422921,
-      0.026270923994779784,
-      0.0159300182060438,
-      0.008586807484419113,
-      0.0040091692633346795,
-      0.0016237229130359047,
-      5.831580842583807E-4,
-      1.9354910833413707E-4,
-      6.446411351755592E-5,
-      2.0541404464536928E-5,
-      5.89324452995356E-6,
-      1.3026715401568408E-6,
-      2.061368668443604E-7,
-      2.2313612928494355E-8,
-      3.427414499140028E-10
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.1018961899754435E-5,
       5.139667971021216E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.1394279599298858,
+      0.909645925740205,
+      0.6810439562313704,
+      0.48213438998284386,
+      0.3270662494936988,
+      0.2122733790095776,
+      0.13579352589768764,
+      0.08466990088453301,
+      0.051479667241025914,
+      0.029592215233161495,
+      0.015605186053687877,
+      0.007369438722986227,
+      0.003079134500128523,
+      0.001133816052813239,
+      3.683841726832002E-4,
+      1.077152977087167E-4,
+      2.7590429340726252E-5,
+      6.106383784135073E-6,
+      9.141545957726994E-7,
+      4.7166583187373387E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.24225805041057027,
+      0.1626494298061276,
+      0.11286823232748024,
+      0.08019936527365806,
+      0.057001082377164766,
+      0.03977231046422921,
+      0.026270923994779784,
+      0.0159300182060438,
+      0.008586807484419113,
+      0.0040091692633346795,
+      0.0016237229130359047,
+      5.831580842583807E-4,
+      1.9354910833413707E-4,
+      6.446411351755592E-5,
+      2.0541404464536928E-5,
+      5.89324452995356E-6,
+      1.3026715401568408E-6,
+      2.061368668443604E-7,
+      2.2313612928494355E-8,
+      3.427414499140028E-10
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
index eb99e2dc..80b5e34b 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.1096176362431887,
-      0.07712267985209978,
-      0.05236216472551225,
-      0.03410083982464373,
-      0.02132788570031522,
-      0.012597455865731777,
-      0.007195466062794852,
-      0.0039020156778838797,
-      0.0020347763827356416,
-      0.0010104978512827576,
-      4.744665345271375E-4,
-      2.0784677016393615E-4,
-      8.354936782969439E-5,
-      3.0262362405560818E-5,
-      9.700628718654082E-6,
-      2.73388661760168E-6,
-      6.418080520161568E-7,
-      1.2432205810419981E-7,
-      1.6644800833465068E-8,
-      8.894088492362763E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.023279814179665247,
-      0.015258454706800595,
-      0.009636588671134795,
-      0.0058636185962218715,
-      0.0034303179683354557,
-      0.0019508911864085043,
-      0.0010720245656982627,
-      5.727230032611106E-4,
-      2.940392779991596E-4,
-      1.4181349785670868E-4,
-      6.333513533663933E-5,
-      2.5779423268780836E-5,
-      9.34540879758316E-6,
-      3.0570885601346303E-6,
-      8.448187381597024E-7,
-      2.0283376419955368E-7,
-      3.799045552673217E-8,
-      5.257992980887434E-9,
-      4.696318067912854E-10,
-      8.040835683421514E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       6.851474870720804E-7,
       1.0763757443621396E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.1096176362431887,
+      0.07712267985209978,
+      0.05236216472551225,
+      0.03410083982464373,
+      0.02132788570031522,
+      0.012597455865731777,
+      0.007195466062794852,
+      0.0039020156778838797,
+      0.0020347763827356416,
+      0.0010104978512827576,
+      4.744665345271375E-4,
+      2.0784677016393615E-4,
+      8.354936782969439E-5,
+      3.0262362405560818E-5,
+      9.700628718654082E-6,
+      2.73388661760168E-6,
+      6.418080520161568E-7,
+      1.2432205810419981E-7,
+      1.6644800833465068E-8,
+      8.894088492362763E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.023279814179665247,
+      0.015258454706800595,
+      0.009636588671134795,
+      0.0058636185962218715,
+      0.0034303179683354557,
+      0.0019508911864085043,
+      0.0010720245656982627,
+      5.727230032611106E-4,
+      2.940392779991596E-4,
+      1.4181349785670868E-4,
+      6.333513533663933E-5,
+      2.5779423268780836E-5,
+      9.34540879758316E-6,
+      3.0570885601346303E-6,
+      8.448187381597024E-7,
+      2.0283376419955368E-7,
+      3.799045552673217E-8,
+      5.257992980887434E-9,
+      4.696318067912854E-10,
+      8.040835683421514E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
index d5764459..cc2da680 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.9310649618626424,
-      0.7152683525622628,
-      0.5254960437436178,
-      0.37057192881004797,
-      0.25360306935928917,
-      0.1673342748557868,
-      0.10852163641624823,
-      0.06764805605345484,
-      0.040421250385918366,
-      0.022759302561329985,
-      0.012035453130050871,
-      0.00600136140103962,
-      0.002825403258669261,
-      0.0012397199668725764,
-      4.913127725890904E-4,
-      1.6916652515186739E-4,
-      4.6081848166959275E-5,
-      9.142956045358946E-6,
-      1.067682459238504E-6,
-      4.4135240737735364E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.191466520506286,
-      0.13554779250681923,
-      0.09647775115759329,
-      0.06847614819048337,
-      0.04772578379364717,
-      0.03208679105889853,
-      0.020129540279605,
-      0.011639202185119844,
-      0.0061951399190677625,
-      0.003075883535659292,
-      0.0014771509658122375,
-      7.061929082246017E-4,
-      3.3451441585971104E-4,
-      1.5467986387544445E-4,
-      6.363609376236911E-5,
-      2.247131683032451E-5,
-      6.219516642047414E-6,
-      1.2615492254822047E-6,
-      1.5297532779407637E-7,
-      7.198489307670766E-9
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.1290331752591286E-5,
       6.280186508295586E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.9310649618626424,
+      0.7152683525622628,
+      0.5254960437436178,
+      0.37057192881004797,
+      0.25360306935928917,
+      0.1673342748557868,
+      0.10852163641624823,
+      0.06764805605345484,
+      0.040421250385918366,
+      0.022759302561329985,
+      0.012035453130050871,
+      0.00600136140103962,
+      0.002825403258669261,
+      0.0012397199668725764,
+      4.913127725890904E-4,
+      1.6916652515186739E-4,
+      4.6081848166959275E-5,
+      9.142956045358946E-6,
+      1.067682459238504E-6,
+      4.4135240737735364E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.191466520506286,
+      0.13554779250681923,
+      0.09647775115759329,
+      0.06847614819048337,
+      0.04772578379364717,
+      0.03208679105889853,
+      0.020129540279605,
+      0.011639202185119844,
+      0.0061951399190677625,
+      0.003075883535659292,
+      0.0014771509658122375,
+      7.061929082246017E-4,
+      3.3451441585971104E-4,
+      1.5467986387544445E-4,
+      6.363609376236911E-5,
+      2.247131683032451E-5,
+      6.219516642047414E-6,
+      1.2615492254822047E-6,
+      1.5297532779407637E-7,
+      7.198489307670766E-9
+    ]
   }
 }
-- 
GitLab


From 6b143366b9c55d1dcd39141320ecc1b92cb1cdf6 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 14:20:47 -0700
Subject: [PATCH 06/11] reordered conus 2018 results

---
 .../e2e/nshm-conus-2018/BOSTON_MA.json        | 184 +++++++++---------
 .../e2e/nshm-conus-2018/CHICAGO_IL.json       | 184 +++++++++---------
 .../e2e/nshm-conus-2018/LOS_ANGELES_CA.json   | 184 +++++++++---------
 .../e2e/nshm-conus-2018/NEW_MADRID_MO.json    | 184 +++++++++---------
 .../e2e/nshm-conus-2018/NEW_YORK_NY.json      | 184 +++++++++---------
 .../e2e/nshm-conus-2018/RENO_NV.json          | 184 +++++++++---------
 .../nshm-conus-2018/SALT_LAKE_CITY_UT.json    | 184 +++++++++---------
 .../e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json | 184 +++++++++---------
 .../e2e/nshm-conus-2018/SEATTLE_WA.json       | 184 +++++++++---------
 9 files changed, 828 insertions(+), 828 deletions(-)

diff --git a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
index b713b473..b255db04 100644
--- a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.020784550979940135,
-      0.013752036153143977,
-      0.008853912425965714,
-      0.00550450273759354,
-      0.0032956032209899913,
-      0.0018514963923265217,
-      9.931435977960567E-4,
-      4.956595518220795E-4,
-      2.3401548992797765E-4,
-      1.0471944598011257E-4,
-      4.5084212737722834E-5,
-      1.8896301560235415E-5,
-      7.72587468160579E-6,
-      3.039143578552158E-6,
-      1.1170515811344102E-6,
-      3.7451324017266453E-7,
-      1.0752962397804165E-7,
-      2.596070736658151E-8,
-      4.917918081492094E-9,
-      6.503383766857791E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.0038496686700113573,
-      0.0025078664183317773,
-      0.0015597948853785957,
-      9.157017059864714E-4,
-      5.001931310456337E-4,
-      2.547249918503188E-4,
-      1.194486623970574E-4,
-      5.2327359356867026E-5,
-      2.1561183371151274E-5,
-      8.4003477208669E-6,
-      3.1469958181727807E-6,
-      1.142023685405199E-6,
-      3.9303700685767176E-7,
-      1.2947742656347803E-7,
-      3.718668812692663E-8,
-      9.324871744942211E-9,
-      1.8778829487123563E-9,
-      2.846632932077524E-10,
-      2.69747315108036E-11,
-      1.0385526508492285E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.142453599294729E-7,
       9.342364439170646E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.020784550979940135,
+      0.013752036153143977,
+      0.008853912425965714,
+      0.00550450273759354,
+      0.0032956032209899913,
+      0.0018514963923265217,
+      9.931435977960567E-4,
+      4.956595518220795E-4,
+      2.3401548992797765E-4,
+      1.0471944598011257E-4,
+      4.5084212737722834E-5,
+      1.8896301560235415E-5,
+      7.72587468160579E-6,
+      3.039143578552158E-6,
+      1.1170515811344102E-6,
+      3.7451324017266453E-7,
+      1.0752962397804165E-7,
+      2.596070736658151E-8,
+      4.917918081492094E-9,
+      6.503383766857791E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.0038496686700113573,
+      0.0025078664183317773,
+      0.0015597948853785957,
+      9.157017059864714E-4,
+      5.001931310456337E-4,
+      2.547249918503188E-4,
+      1.194486623970574E-4,
+      5.2327359356867026E-5,
+      2.1561183371151274E-5,
+      8.4003477208669E-6,
+      3.1469958181727807E-6,
+      1.142023685405199E-6,
+      3.9303700685767176E-7,
+      1.2947742656347803E-7,
+      3.718668812692663E-8,
+      9.324871744942211E-9,
+      1.8778829487123563E-9,
+      2.846632932077524E-10,
+      2.69747315108036E-11,
+      1.0385526508492285E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
index 1c2f1aa9..9629f27e 100644
--- a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.017675500237871122,
-      0.011804993270225163,
-      0.007916670756587606,
-      0.005349147248044569,
-      0.0036313904277084225,
-      0.002384405538478486,
-      0.0014870231028831253,
-      8.355484214788524E-4,
-      4.1460657776932683E-4,
-      1.7579111278565786E-4,
-      6.24093534270055E-5,
-      1.824083214413613E-5,
-      4.414927964063776E-6,
-      9.994457044956114E-7,
-      2.485513364750664E-7,
-      7.726459746150788E-8,
-      2.1210423184880143E-8,
-      4.860565864414978E-9,
-      8.64105244261508E-10,
-      1.0633132855584107E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.004904504983066267,
-      0.003755611824541405,
-      0.0029006854981177598,
-      0.002197256906365074,
-      0.0015714972511203787,
-      0.0010317853455482514,
-      5.988137176440332E-4,
-      2.999898092710794E-4,
-      1.263608775768721E-4,
-      4.334153727062958E-5,
-      1.1727951025836873E-5,
-      2.383247006424207E-6,
-      3.520926494203767E-7,
-      3.785179659277222E-8,
-      5.963076928168122E-9,
-      1.4910332126633127E-9,
-      3.1417887372376505E-10,
-      5.2511189664780556E-11,
-      5.968234937924545E-12,
-      3.1469632224157163E-13
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.0444941528551558E-7,
       2.265638077580196E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.017675500237871122,
+      0.011804993270225163,
+      0.007916670756587606,
+      0.005349147248044569,
+      0.0036313904277084225,
+      0.002384405538478486,
+      0.0014870231028831253,
+      8.355484214788524E-4,
+      4.1460657776932683E-4,
+      1.7579111278565786E-4,
+      6.24093534270055E-5,
+      1.824083214413613E-5,
+      4.414927964063776E-6,
+      9.994457044956114E-7,
+      2.485513364750664E-7,
+      7.726459746150788E-8,
+      2.1210423184880143E-8,
+      4.860565864414978E-9,
+      8.64105244261508E-10,
+      1.0633132855584107E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.004904504983066267,
+      0.003755611824541405,
+      0.0029006854981177598,
+      0.002197256906365074,
+      0.0015714972511203787,
+      0.0010317853455482514,
+      5.988137176440332E-4,
+      2.999898092710794E-4,
+      1.263608775768721E-4,
+      4.334153727062958E-5,
+      1.1727951025836873E-5,
+      2.383247006424207E-6,
+      3.520926494203767E-7,
+      3.785179659277222E-8,
+      5.963076928168122E-9,
+      1.4910332126633127E-9,
+      3.1417887372376505E-10,
+      5.2511189664780556E-11,
+      5.968234937924545E-12,
+      3.1469632224157163E-13
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
index 0ca4ff14..92d33d96 100644
--- a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.6444967283734224,
-      0.4786476505852358,
-      0.3418978122787615,
-      0.23536712871936552,
-      0.1572845756613975,
-      0.10076562824016512,
-      0.06307025481893916,
-      0.03797804997470734,
-      0.0223137162137564,
-      0.012734581775620556,
-      0.007015495084129503,
-      0.003676691440227366,
-      0.001786887951792699,
-      7.767736549077123E-4,
-      2.9051610420050656E-4,
-      9.026480491656594E-5,
-      2.1057670916542444E-5,
-      3.258978636010242E-6,
-      2.6316028187002163E-7,
-      3.5384348649550975E-9
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.17190851157293338,
-      0.12089405741909341,
-      0.08292418234503335,
-      0.05541876162969711,
-      0.03604252603328373,
-      0.02305917040930336,
-      0.014410278305400367,
-      0.008727857901185023,
-      0.0049764060485146455,
-      0.0025700813872072195,
-      0.0011698516159577923,
-      4.5862786746358016E-4,
-      1.5016391076528804E-4,
-      4.130953934310594E-5,
-      8.900525843800577E-6,
-      1.5452350696020578E-6,
-      1.737638951879189E-7,
-      8.150971945903305E-9,
-      1.3140056152584432E-12,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.9713363600257578E-5,
       2.3576513888748992E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.6444967283734224,
+      0.4786476505852358,
+      0.3418978122787615,
+      0.23536712871936552,
+      0.1572845756613975,
+      0.10076562824016512,
+      0.06307025481893916,
+      0.03797804997470734,
+      0.0223137162137564,
+      0.012734581775620556,
+      0.007015495084129503,
+      0.003676691440227366,
+      0.001786887951792699,
+      7.767736549077123E-4,
+      2.9051610420050656E-4,
+      9.026480491656594E-5,
+      2.1057670916542444E-5,
+      3.258978636010242E-6,
+      2.6316028187002163E-7,
+      3.5384348649550975E-9
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.17190851157293338,
+      0.12089405741909341,
+      0.08292418234503335,
+      0.05541876162969711,
+      0.03604252603328373,
+      0.02305917040930336,
+      0.014410278305400367,
+      0.008727857901185023,
+      0.0049764060485146455,
+      0.0025700813872072195,
+      0.0011698516159577923,
+      4.5862786746358016E-4,
+      1.5016391076528804E-4,
+      4.130953934310594E-5,
+      8.900525843800577E-6,
+      1.5452350696020578E-6,
+      1.737638951879189E-7,
+      8.150971945903305E-9,
+      1.3140056152584432E-12,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
index 638bda0f..0ad50c4f 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.05460474620644812,
-      0.039322200263679656,
-      0.027742521888583595,
-      0.01925648792066325,
-      0.013309032474447957,
-      0.009158100387208452,
-      0.006469954492673557,
-      0.004711825464791655,
-      0.0036144199686035904,
-      0.002923750899350579,
-      0.0024589761818590043,
-      0.002072470767532479,
-      0.0016635058660181765,
-      0.001206920974532014,
-      7.580051949212135E-4,
-      4.0281368863859257E-4,
-      1.7473743872927871E-4,
-      6.143664863718952E-5,
-      1.660370716466393E-5,
-      3.2819885795529324E-6
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.01118335095019382,
-      0.00820850133786319,
-      0.00612599437865595,
-      0.004704029030923133,
-      0.003744509775095578,
-      0.003113425325927083,
-      0.0026896900327019677,
-      0.0023879637030226144,
-      0.0021175441107187517,
-      0.0018011501748482464,
-      0.0014173471729516547,
-      0.001006813017595508,
-      6.301951022408453E-4,
-      3.444781699140508E-4,
-      1.5613960834869736E-4,
-      5.887416288449928E-5,
-      1.748301261392188E-5,
-      3.8576776780498505E-6,
-      5.776336202494064E-7,
-      3.603564897905062E-8
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.211131756404801E-4,
       1.1269789534198826E-4
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.05460474620644812,
+      0.039322200263679656,
+      0.027742521888583595,
+      0.01925648792066325,
+      0.013309032474447957,
+      0.009158100387208452,
+      0.006469954492673557,
+      0.004711825464791655,
+      0.0036144199686035904,
+      0.002923750899350579,
+      0.0024589761818590043,
+      0.002072470767532479,
+      0.0016635058660181765,
+      0.001206920974532014,
+      7.580051949212135E-4,
+      4.0281368863859257E-4,
+      1.7473743872927871E-4,
+      6.143664863718952E-5,
+      1.660370716466393E-5,
+      3.2819885795529324E-6
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.01118335095019382,
+      0.00820850133786319,
+      0.00612599437865595,
+      0.004704029030923133,
+      0.003744509775095578,
+      0.003113425325927083,
+      0.0026896900327019677,
+      0.0023879637030226144,
+      0.0021175441107187517,
+      0.0018011501748482464,
+      0.0014173471729516547,
+      0.001006813017595508,
+      6.301951022408453E-4,
+      3.444781699140508E-4,
+      1.5613960834869736E-4,
+      5.887416288449928E-5,
+      1.748301261392188E-5,
+      3.8576776780498505E-6,
+      5.776336202494064E-7,
+      3.603564897905062E-8
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
index aa3feff2..ecce5d52 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.018666421015364296,
-      0.0122777143821705,
-      0.007819753747405416,
-      0.004783588386662287,
-      0.0028112191687725903,
-      0.0015540453407317345,
-      8.285075887238439E-4,
-      4.1827330817572424E-4,
-      2.0477961806545264E-4,
-      9.76841382864806E-5,
-      4.582979651500823E-5,
-      2.1108151934584487E-5,
-      9.40307880873417E-6,
-      3.952177823009206E-6,
-      1.52393681070903E-6,
-      5.283693302216128E-7,
-      1.5532448868679193E-7,
-      3.807576669004164E-8,
-      7.285190754922316E-9,
-      9.713305930824852E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.0036839290291613563,
-      0.002335050751486981,
-      0.0014025796207374252,
-      7.930112908299477E-4,
-      4.1808903382999866E-4,
-      2.0733134457052304E-4,
-      9.623213274255235E-5,
-      4.279209350393816E-5,
-      1.848842803384079E-5,
-      7.785121676935123E-6,
-      3.20942446688357E-6,
-      1.2788721198896172E-6,
-      4.7640365740538307E-7,
-      1.6510378239619132E-7,
-      4.934185476859843E-8,
-      1.273898355111994E-8,
-      2.620252585057269E-9,
-      4.048583749596045E-10,
-      3.904486628199482E-11,
-      1.5324451927867105E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       6.249719391706649E-7,
       1.4238886738032342E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.018666421015364296,
+      0.0122777143821705,
+      0.007819753747405416,
+      0.004783588386662287,
+      0.0028112191687725903,
+      0.0015540453407317345,
+      8.285075887238439E-4,
+      4.1827330817572424E-4,
+      2.0477961806545264E-4,
+      9.76841382864806E-5,
+      4.582979651500823E-5,
+      2.1108151934584487E-5,
+      9.40307880873417E-6,
+      3.952177823009206E-6,
+      1.52393681070903E-6,
+      5.283693302216128E-7,
+      1.5532448868679193E-7,
+      3.807576669004164E-8,
+      7.285190754922316E-9,
+      9.713305930824852E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.0036839290291613563,
+      0.002335050751486981,
+      0.0014025796207374252,
+      7.930112908299477E-4,
+      4.1808903382999866E-4,
+      2.0733134457052304E-4,
+      9.623213274255235E-5,
+      4.279209350393816E-5,
+      1.848842803384079E-5,
+      7.785121676935123E-6,
+      3.20942446688357E-6,
+      1.2788721198896172E-6,
+      4.7640365740538307E-7,
+      1.6510378239619132E-7,
+      4.934185476859843E-8,
+      1.273898355111994E-8,
+      2.620252585057269E-9,
+      4.048583749596045E-10,
+      3.904486628199482E-11,
+      1.5324451927867105E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
index 9dfb5d5e..5c105110 100644
--- a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5639424382793682,
-      0.41970430872704,
-      0.2996355631700337,
-      0.20436506496344023,
-      0.13386011296908937,
-      0.08340469061324253,
-      0.05072763584783538,
-      0.02970332088645175,
-      0.016962428614047866,
-      0.009368748098138393,
-      0.004942501068704084,
-      0.002420101079214425,
-      0.0010564988095787106,
-      3.945561117465654E-4,
-      1.2048922319737725E-4,
-      2.8266770250121335E-5,
-      4.252380705836178E-6,
-      4.4029329263288646E-7,
-      2.573585831849357E-8,
-      8.240992980384035E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.1619520024002511,
-      0.11197070315750862,
-      0.0746164480867025,
-      0.04806931482649302,
-      0.029904421907731286,
-      0.01809720511043038,
-      0.010526649862628145,
-      0.005849703609065978,
-      0.003024869157973338,
-      0.0013988990917255157,
-      5.607903420664931E-4,
-      1.884917390363045E-4,
-      5.034839107343867E-5,
-      1.0331505761726529E-5,
-      1.5403732253339458E-6,
-      1.766940560506774E-7,
-      9.230578884022922E-9,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.5541957008082325E-6,
       3.3625843088903307E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.5639424382793682,
+      0.41970430872704,
+      0.2996355631700337,
+      0.20436506496344023,
+      0.13386011296908937,
+      0.08340469061324253,
+      0.05072763584783538,
+      0.02970332088645175,
+      0.016962428614047866,
+      0.009368748098138393,
+      0.004942501068704084,
+      0.002420101079214425,
+      0.0010564988095787106,
+      3.945561117465654E-4,
+      1.2048922319737725E-4,
+      2.8266770250121335E-5,
+      4.252380705836178E-6,
+      4.4029329263288646E-7,
+      2.573585831849357E-8,
+      8.240992980384035E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.1619520024002511,
+      0.11197070315750862,
+      0.0746164480867025,
+      0.04806931482649302,
+      0.029904421907731286,
+      0.01809720511043038,
+      0.010526649862628145,
+      0.005849703609065978,
+      0.003024869157973338,
+      0.0013988990917255157,
+      5.607903420664931E-4,
+      1.884917390363045E-4,
+      5.034839107343867E-5,
+      1.0331505761726529E-5,
+      1.5403732253339458E-6,
+      1.766940560506774E-7,
+      9.230578884022922E-9,
+      0.0,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
index 99e7a3ea..2fd8958b 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.10757811162031562,
-      0.07957011355012675,
-      0.05737827016380388,
-      0.04027976431795187,
-      0.0276408517828518,
-      0.018357720422996257,
-      0.012093857135505218,
-      0.007896369062561259,
-      0.005254206301457623,
-      0.003587002037983353,
-      0.0024827837917689175,
-      0.0016732098651853502,
-      0.0010380702649216227,
-      5.606219620093439E-4,
-      2.5202853095702125E-4,
-      9.160154941360827E-5,
-      2.4864160867042876E-5,
-      4.544185142396868E-6,
-      3.732917476243578E-7,
-      4.214779787490519E-9
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.03805908121278129,
-      0.028580222602703518,
-      0.020845823977263308,
-      0.014740037128774407,
-      0.010119958839797551,
-      0.006857311368365846,
-      0.004613646647606711,
-      0.003097068370084498,
-      0.002020602295091759,
-      0.0012191649154324918,
-      6.4862821952059E-4,
-      2.917614881440183E-4,
-      1.0616704525758154E-4,
-      3.09035228115567E-5,
-      6.223105810275529E-6,
-      7.737881323191248E-7,
-      4.828818955173788E-8,
-      5.045450350623247E-10,
-      1.4761223207476851E-12,
-      7.36531590202622E-14
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.8675841989591896E-5,
       2.7011160805776843E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.10757811162031562,
+      0.07957011355012675,
+      0.05737827016380388,
+      0.04027976431795187,
+      0.0276408517828518,
+      0.018357720422996257,
+      0.012093857135505218,
+      0.007896369062561259,
+      0.005254206301457623,
+      0.003587002037983353,
+      0.0024827837917689175,
+      0.0016732098651853502,
+      0.0010380702649216227,
+      5.606219620093439E-4,
+      2.5202853095702125E-4,
+      9.160154941360827E-5,
+      2.4864160867042876E-5,
+      4.544185142396868E-6,
+      3.732917476243578E-7,
+      4.214779787490519E-9
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.03805908121278129,
+      0.028580222602703518,
+      0.020845823977263308,
+      0.014740037128774407,
+      0.010119958839797551,
+      0.006857311368365846,
+      0.004613646647606711,
+      0.003097068370084498,
+      0.002020602295091759,
+      0.0012191649154324918,
+      6.4862821952059E-4,
+      2.917614881440183E-4,
+      1.0616704525758154E-4,
+      3.09035228115567E-5,
+      6.223105810275529E-6,
+      7.737881323191248E-7,
+      4.828818955173788E-8,
+      5.045450350623247E-10,
+      1.4761223207476851E-12,
+      7.36531590202622E-14
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
index 9e4d5bdc..7656323b 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5831008919911462,
-      0.4284199090706749,
-      0.3043299517318651,
-      0.20991504534178368,
-      0.14211631298661964,
-      0.09374868521078619,
-      0.06138384495043732,
-      0.039071093308164724,
-      0.024201671562405724,
-      0.014386438506911667,
-      0.008094350202773508,
-      0.004200420158829751,
-      0.0019393747258170354,
-      7.632975555052491E-4,
-      2.4394047425904366E-4,
-      5.965347779311546E-5,
-      8.782843961552907E-6,
-      4.938620973776963E-7,
-      8.239057057597381E-10,
-      5.0449196459382226E-12
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.15758937503731726,
-      0.11247692685397596,
-      0.07946884297427431,
-      0.05560574371886311,
-      0.03824085383493095,
-      0.02585465059626231,
-      0.017050534628279736,
-      0.011010094459237604,
-      0.006875269673181763,
-      0.004031893488663087,
-      0.002153405881721278,
-      0.0010132607735766973,
-      4.0392561747766895E-4,
-      1.3573151659263734E-4,
-      3.5070265791185964E-5,
-      6.763084787261478E-6,
-      8.40775820950977E-7,
-      4.9940703621115084E-8,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.114149996331726E-6,
       1.1332666265240459E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.5831008919911462,
+      0.4284199090706749,
+      0.3043299517318651,
+      0.20991504534178368,
+      0.14211631298661964,
+      0.09374868521078619,
+      0.06138384495043732,
+      0.039071093308164724,
+      0.024201671562405724,
+      0.014386438506911667,
+      0.008094350202773508,
+      0.004200420158829751,
+      0.0019393747258170354,
+      7.632975555052491E-4,
+      2.4394047425904366E-4,
+      5.965347779311546E-5,
+      8.782843961552907E-6,
+      4.938620973776963E-7,
+      8.239057057597381E-10,
+      5.0449196459382226E-12
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.15758937503731726,
+      0.11247692685397596,
+      0.07946884297427431,
+      0.05560574371886311,
+      0.03824085383493095,
+      0.02585465059626231,
+      0.017050534628279736,
+      0.011010094459237604,
+      0.006875269673181763,
+      0.004031893488663087,
+      0.002153405881721278,
+      0.0010132607735766973,
+      4.0392561747766895E-4,
+      1.3573151659263734E-4,
+      3.5070265791185964E-5,
+      6.763084787261478E-6,
+      8.40775820950977E-7,
+      4.9940703621115084E-8,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
index 5fdef9a9..d0b5e651 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.22241570623093976,
-      0.1829280451577437,
-      0.1448318147490399,
-      0.11014079807928763,
-      0.08073188866721041,
-      0.056523154956151345,
-      0.03845680832081368,
-      0.025122691683551766,
-      0.01589752884256221,
-      0.009661504852378041,
-      0.005579041181458256,
-      0.0030025526411616497,
-      0.0014690971633349753,
-      6.364442444196518E-4,
-      2.3763115583014073E-4,
-      7.483075324811945E-5,
-      1.849159244838621E-5,
-      3.3895460556769015E-6,
-      3.9675850091614954E-7,
-      2.354050123798512E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.08205577100705908,
-      0.061266834717159734,
-      0.04455728997923758,
-      0.03145010836689442,
-      0.021405885334622142,
-      0.014124098414222007,
-      0.009024213385085463,
-      0.0056644003126977704,
-      0.003499891539804657,
-      0.002098701424790068,
-      0.0011956688842710385,
-      6.256461321358485E-4,
-      2.8749119746093553E-4,
-      1.1405401273930701E-4,
-      3.594228048167488E-5,
-      8.754027822126098E-6,
-      1.2809718721036886E-6,
-      5.8477442571272573E-8,
-      3.312385113009849E-10,
-      8.135310824349085E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.561137287903132E-6,
       4.7281340794708457E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.22241570623093976,
+      0.1829280451577437,
+      0.1448318147490399,
+      0.11014079807928763,
+      0.08073188866721041,
+      0.056523154956151345,
+      0.03845680832081368,
+      0.025122691683551766,
+      0.01589752884256221,
+      0.009661504852378041,
+      0.005579041181458256,
+      0.0030025526411616497,
+      0.0014690971633349753,
+      6.364442444196518E-4,
+      2.3763115583014073E-4,
+      7.483075324811945E-5,
+      1.849159244838621E-5,
+      3.3895460556769015E-6,
+      3.9675850091614954E-7,
+      2.354050123798512E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.08205577100705908,
+      0.061266834717159734,
+      0.04455728997923758,
+      0.03145010836689442,
+      0.021405885334622142,
+      0.014124098414222007,
+      0.009024213385085463,
+      0.0056644003126977704,
+      0.003499891539804657,
+      0.002098701424790068,
+      0.0011956688842710385,
+      6.256461321358485E-4,
+      2.8749119746093553E-4,
+      1.1405401273930701E-4,
+      3.594228048167488E-5,
+      8.754027822126098E-6,
+      1.2809718721036886E-6,
+      5.8477442571272573E-8,
+      3.312385113009849E-10,
+      8.135310824349085E-12
+    ]
   }
 }
-- 
GitLab


From d8f3cbd64dab0da9fee8ba25cf61e2f942becfd8 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 14:21:15 -0700
Subject: [PATCH 07/11] reordered alaska 2023 results

---
 .../e2e/nshm-alaska-2023/ANCHORAGE_AK.json    | 184 +++++++++---------
 .../e2e/nshm-alaska-2023/FAIRBANKS_AK.json    | 184 +++++++++---------
 .../e2e/nshm-alaska-2023/JUNEAU_AK.json       | 184 +++++++++---------
 .../e2e/nshm-alaska-2023/KODIAK_AK.json       | 184 +++++++++---------
 .../e2e/nshm-alaska-2023/VALDEZ_AK.json       | 184 +++++++++---------
 5 files changed, 460 insertions(+), 460 deletions(-)

diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
index d9addf3b..e38d1eb0 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      1.3537468328928346,
-      1.0103154427598815,
-      0.7323786350946773,
-      0.5150449703517822,
-      0.35345412134723325,
-      0.2344910294085141,
-      0.15334907120509234,
-      0.09727623638180859,
-      0.060176238499631794,
-      0.03585826525074532,
-      0.020380445279889404,
-      0.010900794198883759,
-      0.005388442426619103,
-      0.002404954255789383,
-      9.441273563210114E-4,
-      3.193844266082103E-4,
-      8.673259516301395E-5,
-      1.8036535042472592E-5,
-      2.799179550215747E-6,
-      3.013028621585243E-7
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.36205511025623816,
-      0.2608473736299835,
-      0.18255336992687307,
-      0.1236219050947805,
-      0.08037702914959681,
-      0.05023327554359663,
-      0.029818329911675604,
-      0.016864452690360004,
-      0.009021333844345322,
-      0.004475360983021283,
-      0.002019621949196018,
-      8.047408485465233E-4,
-      2.7109083388956843E-4,
-      7.577409257805477E-5,
-      1.5204642255166092E-5,
-      2.0834669490803287E-6,
-      1.21794529978192E-7,
-      1.6583407068056797E-9,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.3471540423378944E-4,
       2.9396669346552432E-5
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.3537468328928346,
+      1.0103154427598815,
+      0.7323786350946773,
+      0.5150449703517822,
+      0.35345412134723325,
+      0.2344910294085141,
+      0.15334907120509234,
+      0.09727623638180859,
+      0.060176238499631794,
+      0.03585826525074532,
+      0.020380445279889404,
+      0.010900794198883759,
+      0.005388442426619103,
+      0.002404954255789383,
+      9.441273563210114E-4,
+      3.193844266082103E-4,
+      8.673259516301395E-5,
+      1.8036535042472592E-5,
+      2.799179550215747E-6,
+      3.013028621585243E-7
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.36205511025623816,
+      0.2608473736299835,
+      0.18255336992687307,
+      0.1236219050947805,
+      0.08037702914959681,
+      0.05023327554359663,
+      0.029818329911675604,
+      0.016864452690360004,
+      0.009021333844345322,
+      0.004475360983021283,
+      0.002019621949196018,
+      8.047408485465233E-4,
+      2.7109083388956843E-4,
+      7.577409257805477E-5,
+      1.5204642255166092E-5,
+      2.0834669490803287E-6,
+      1.21794529978192E-7,
+      1.6583407068056797E-9,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
index 37fa914a..7ea91e7c 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.6299367955268628,
-      0.4711801260493742,
-      0.339436874554311,
-      0.23353578076485115,
-      0.15305109663302438,
-      0.09365616265742083,
-      0.05444830506157231,
-      0.029426073427048553,
-      0.014939814203279814,
-      0.007063912287836687,
-      0.003099249875967003,
-      0.0012486794584624082,
-      4.545983491944361E-4,
-      1.4563774971743148E-4,
-      3.95373614100591E-5,
-      8.687897425612776E-6,
-      1.3269042742265163E-6,
-      1.2619367548125488E-7,
-      5.665542846335972E-9,
-      4.380256208276404E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.2022966925066381,
-      0.1402983162089764,
-      0.09209092515325219,
-      0.05699685255584053,
-      0.03301574073541317,
-      0.017962434745860262,
-      0.009036387258834747,
-      0.004206626660247896,
-      0.0017874421618739116,
-      6.752575716348747E-4,
-      2.230424682608342E-4,
-      6.266782923990366E-5,
-      1.4393259611992817E-5,
-      2.7373717183159915E-6,
-      3.7249956647577337E-7,
-      3.492872689157643E-8,
-      1.1854844117945035E-9,
-      7.721291928710127E-12,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.7145090353998691E-6,
       1.0436138874114594E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.6299367955268628,
+      0.4711801260493742,
+      0.339436874554311,
+      0.23353578076485115,
+      0.15305109663302438,
+      0.09365616265742083,
+      0.05444830506157231,
+      0.029426073427048553,
+      0.014939814203279814,
+      0.007063912287836687,
+      0.003099249875967003,
+      0.0012486794584624082,
+      4.545983491944361E-4,
+      1.4563774971743148E-4,
+      3.95373614100591E-5,
+      8.687897425612776E-6,
+      1.3269042742265163E-6,
+      1.2619367548125488E-7,
+      5.665542846335972E-9,
+      4.380256208276404E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.2022966925066381,
+      0.1402983162089764,
+      0.09209092515325219,
+      0.05699685255584053,
+      0.03301574073541317,
+      0.017962434745860262,
+      0.009036387258834747,
+      0.004206626660247896,
+      0.0017874421618739116,
+      6.752575716348747E-4,
+      2.230424682608342E-4,
+      6.266782923990366E-5,
+      1.4393259611992817E-5,
+      2.7373717183159915E-6,
+      3.7249956647577337E-7,
+      3.492872689157643E-8,
+      1.1854844117945035E-9,
+      7.721291928710127E-12,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
index 2bc3cbf8..1cf09e55 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.3775735254287933,
-      0.27744207723652275,
-      0.19477057661509148,
-      0.12875113340888142,
-      0.07929674735656218,
-      0.04411600602826025,
-      0.02253219605451738,
-      0.010286395011257915,
-      0.004273800534436701,
-      0.001620897165435973,
-      5.776426623840872E-4,
-      1.987286185713807E-4,
-      6.823005284740018E-5,
-      2.3251769378972825E-5,
-      7.514188693753363E-6,
-      2.1213215816591875E-6,
-      4.554463808664307E-7,
-      6.616480177939729E-8,
-      4.838396012080842E-9,
-      4.240103338446744E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.13710145426410605,
-      0.0942573295464636,
-      0.060745301879708447,
-      0.036565930620404447,
-      0.02037832172090549,
-      0.01050480119489072,
-      0.004888034968610816,
-      0.0020445061280406373,
-      7.562728552245487E-4,
-      2.4308078953655867E-4,
-      6.901714663477101E-5,
-      1.8223732019732375E-5,
-      4.897967342053475E-6,
-      1.3783636623081346E-6,
-      3.190626395541543E-7,
-      5.565592356249592E-8,
-      5.7200155082606955E-9,
-      2.200754931135628E-10,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.662141469275799E-7,
       3.63015145137678E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.3775735254287933,
+      0.27744207723652275,
+      0.19477057661509148,
+      0.12875113340888142,
+      0.07929674735656218,
+      0.04411600602826025,
+      0.02253219605451738,
+      0.010286395011257915,
+      0.004273800534436701,
+      0.001620897165435973,
+      5.776426623840872E-4,
+      1.987286185713807E-4,
+      6.823005284740018E-5,
+      2.3251769378972825E-5,
+      7.514188693753363E-6,
+      2.1213215816591875E-6,
+      4.554463808664307E-7,
+      6.616480177939729E-8,
+      4.838396012080842E-9,
+      4.240103338446744E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.13710145426410605,
+      0.0942573295464636,
+      0.060745301879708447,
+      0.036565930620404447,
+      0.02037832172090549,
+      0.01050480119489072,
+      0.004888034968610816,
+      0.0020445061280406373,
+      7.562728552245487E-4,
+      2.4308078953655867E-4,
+      6.901714663477101E-5,
+      1.8223732019732375E-5,
+      4.897967342053475E-6,
+      1.3783636623081346E-6,
+      3.190626395541543E-7,
+      5.565592356249592E-8,
+      5.7200155082606955E-9,
+      2.200754931135628E-10,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
index 75407a2a..799c2e19 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      1.2212066080842208,
-      0.8598707411309544,
-      0.5934279769186845,
-      0.40330700684824355,
-      0.2725851554279007,
-      0.1816932763562211,
-      0.1215099716825198,
-      0.0797912998230498,
-      0.05122460878813123,
-      0.03150369852592356,
-      0.018314408386513464,
-      0.009953011317713843,
-      0.0049968365580898315,
-      0.002277051745675493,
-      9.21374067242452E-4,
-      3.251186475050686E-4,
-      9.39427218693006E-5,
-      2.1190014820001016E-5,
-      3.484520277155361E-6,
-      4.559925657574019E-7
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.3199527704875783,
-      0.2293876786217369,
-      0.16195682824630434,
-      0.11213720631502762,
-      0.07517404938243484,
-      0.048373252517777826,
-      0.02926392103092542,
-      0.0166252702545217,
-      0.008829742348953057,
-      0.004321460254724308,
-      0.0019175421844803125,
-      7.502088947592418E-4,
-      2.463028185638767E-4,
-      6.601152839690208E-5,
-      1.190827934208269E-5,
-      1.2870098414063422E-6,
-      3.103489305140823E-8,
-      1.6551032765075596E-12,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.5373567516193523E-4,
       4.070985240786104E-5
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      1.2212066080842208,
+      0.8598707411309544,
+      0.5934279769186845,
+      0.40330700684824355,
+      0.2725851554279007,
+      0.1816932763562211,
+      0.1215099716825198,
+      0.0797912998230498,
+      0.05122460878813123,
+      0.03150369852592356,
+      0.018314408386513464,
+      0.009953011317713843,
+      0.0049968365580898315,
+      0.002277051745675493,
+      9.21374067242452E-4,
+      3.251186475050686E-4,
+      9.39427218693006E-5,
+      2.1190014820001016E-5,
+      3.484520277155361E-6,
+      4.559925657574019E-7
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.3199527704875783,
+      0.2293876786217369,
+      0.16195682824630434,
+      0.11213720631502762,
+      0.07517404938243484,
+      0.048373252517777826,
+      0.02926392103092542,
+      0.0166252702545217,
+      0.008829742348953057,
+      0.004321460254724308,
+      0.0019175421844803125,
+      7.502088947592418E-4,
+      2.463028185638767E-4,
+      6.601152839690208E-5,
+      1.190827934208269E-5,
+      1.2870098414063422E-6,
+      3.103489305140823E-8,
+      1.6551032765075596E-12,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
index 819f3047..8c01f9a3 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.9325100071452752,
-      0.6954852673807081,
-      0.5015347246401772,
-      0.34699112675366706,
-      0.23109903974440474,
-      0.14726413169910962,
-      0.09275498067615105,
-      0.057510240251391405,
-      0.03561986618241648,
-      0.021767159064577258,
-      0.012914752382063832,
-      0.00729818627623514,
-      0.003850977745017842,
-      0.0018566143796475624,
-      7.980148609168511E-4,
-      3.005088996697045E-4,
-      9.404583654655203E-5,
-      2.3919112611967835E-5,
-      4.347770805088602E-6,
-      6.504792547924437E-7
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.3180631054709156,
-      0.22754832272154957,
-      0.1559815130802516,
-      0.10254761825442882,
-      0.06442660473012998,
-      0.03891099020654898,
-      0.02242826992039175,
-      0.01244756305418766,
-      0.006635648542112594,
-      0.0033434928688918465,
-      0.0015591950868602612,
-      6.494478379314242E-4,
-      2.2955602096397197E-4,
-      6.743345969174902E-5,
-      1.4107940103572502E-5,
-      1.7831017390912254E-6,
-      6.069083084964396E-8,
-      2.6456223770550034E-12,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.500874173984748E-4,
       4.367787680902291E-5
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.9325100071452752,
+      0.6954852673807081,
+      0.5015347246401772,
+      0.34699112675366706,
+      0.23109903974440474,
+      0.14726413169910962,
+      0.09275498067615105,
+      0.057510240251391405,
+      0.03561986618241648,
+      0.021767159064577258,
+      0.012914752382063832,
+      0.00729818627623514,
+      0.003850977745017842,
+      0.0018566143796475624,
+      7.980148609168511E-4,
+      3.005088996697045E-4,
+      9.404583654655203E-5,
+      2.3919112611967835E-5,
+      4.347770805088602E-6,
+      6.504792547924437E-7
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.3180631054709156,
+      0.22754832272154957,
+      0.1559815130802516,
+      0.10254761825442882,
+      0.06442660473012998,
+      0.03891099020654898,
+      0.02242826992039175,
+      0.01244756305418766,
+      0.006635648542112594,
+      0.0033434928688918465,
+      0.0015591950868602612,
+      6.494478379314242E-4,
+      2.2955602096397197E-4,
+      6.743345969174902E-5,
+      1.4107940103572502E-5,
+      1.7831017390912254E-6,
+      6.069083084964396E-8,
+      2.6456223770550034E-12,
+      0.0,
+      0.0
+    ]
   }
 }
-- 
GitLab


From b9e02c08eb054b8e16d719e291497ead10a380db Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Feb 2024 14:54:37 -0700
Subject: [PATCH 08/11] reordered conus 2023 results

---
 .../e2e/nshm-conus-2023/BOSTON_MA.json        | 184 +++++++++---------
 .../e2e/nshm-conus-2023/CHICAGO_IL.json       | 184 +++++++++---------
 .../e2e/nshm-conus-2023/LOS_ANGELES_CA.json   | 184 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_MADRID_MO.json    | 184 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_YORK_NY.json      | 184 +++++++++---------
 .../e2e/nshm-conus-2023/RENO_NV.json          | 184 +++++++++---------
 .../nshm-conus-2023/SALT_LAKE_CITY_UT.json    | 184 +++++++++---------
 .../e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json | 184 +++++++++---------
 .../e2e/nshm-conus-2023/SEATTLE_WA.json       | 184 +++++++++---------
 9 files changed, 828 insertions(+), 828 deletions(-)

diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index 3060b720..c6000586 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.03781690942134723,
-      0.025609987126957216,
-      0.016835178417561724,
-      0.010675317900339298,
-      0.006527977980738502,
-      0.0037666741939616066,
-      0.0020910571328798203,
-      0.00109235908996311,
-      5.458772566494525E-4,
-      2.610498573544112E-4,
-      1.2062939801655832E-4,
-      5.411364755018729E-5,
-      2.3475389991093996E-5,
-      9.699580588310421E-6,
-      3.7213621990011277E-6,
-      1.2984686317975075E-6,
-      3.882066000228318E-7,
-      9.785045471794201E-8,
-      1.946037843483607E-8,
-      2.742272834535854E-9
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.009213207300948616,
-      0.006121721172229911,
-      0.003927784889616463,
-      0.002415843378135533,
-      0.001407276929891261,
-      7.774423342976145E-4,
-      4.024693099758765E-4,
-      1.9730634218575706E-4,
-      9.182408947706066E-5,
-      4.046584903685399E-5,
-      1.703760017497274E-5,
-      6.8664822239861384E-6,
-      2.616062277136032E-6,
-      9.54240383432457E-7,
-      3.1185607453236496E-7,
-      9.181884057053902E-8,
-      2.284823926814979E-8,
-      4.620311222721341E-9,
-      6.936412711209975E-10,
-      7.028579358099718E-11
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.0342006360285488E-6,
       2.3647467423869639E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.03781690942134723,
+      0.025609987126957216,
+      0.016835178417561724,
+      0.010675317900339298,
+      0.006527977980738502,
+      0.0037666741939616066,
+      0.0020910571328798203,
+      0.00109235908996311,
+      5.458772566494525E-4,
+      2.610498573544112E-4,
+      1.2062939801655832E-4,
+      5.411364755018729E-5,
+      2.3475389991093996E-5,
+      9.699580588310421E-6,
+      3.7213621990011277E-6,
+      1.2984686317975075E-6,
+      3.882066000228318E-7,
+      9.785045471794201E-8,
+      1.946037843483607E-8,
+      2.742272834535854E-9
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.009213207300948616,
+      0.006121721172229911,
+      0.003927784889616463,
+      0.002415843378135533,
+      0.001407276929891261,
+      7.774423342976145E-4,
+      4.024693099758765E-4,
+      1.9730634218575706E-4,
+      9.182408947706066E-5,
+      4.046584903685399E-5,
+      1.703760017497274E-5,
+      6.8664822239861384E-6,
+      2.616062277136032E-6,
+      9.54240383432457E-7,
+      3.1185607453236496E-7,
+      9.181884057053902E-8,
+      2.284823926814979E-8,
+      4.620311222721341E-9,
+      6.936412711209975E-10,
+      7.028579358099718E-11
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index e7202e7b..13687b7f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.03324893310902484,
-      0.022004431105884844,
-      0.014310147752740471,
-      0.009151239631673424,
-      0.005779616772275175,
-      0.00351403260771589,
-      0.0020552936759178292,
-      0.001102482842375513,
-      5.332796764095532E-4,
-      2.2502078443087175E-4,
-      8.132456018629313E-5,
-      2.498360281093742E-5,
-      6.6829514950423814E-6,
-      1.7449632407250264E-6,
-      4.909788509372824E-7,
-      1.5684348441413014E-7,
-      4.415991214768775E-8,
-      1.0492474877263184E-8,
-      1.957656771069103E-9,
-      2.5802146447004877E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.01000596693045542,
-      0.007020138549279936,
-      0.004946069582032202,
-      0.003483151215561255,
-      0.0023991290974655823,
-      0.0015793614229230991,
-      9.569588656999184E-4,
-      5.209847415833336E-4,
-      2.473505223610801E-4,
-      9.904665205541753E-5,
-      3.2778684521866866E-5,
-      8.712990693707895E-6,
-      1.7904539860522435E-6,
-      3.0534530225080447E-7,
-      4.5864222733130684E-8,
-      9.67071147027627E-9,
-      2.3562950445765526E-9,
-      4.914029457128014E-10,
-      7.997984106407277E-11,
-      9.381018392075353E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.4267651060313717E-7,
       3.1124228394497636E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.03324893310902484,
+      0.022004431105884844,
+      0.014310147752740471,
+      0.009151239631673424,
+      0.005779616772275175,
+      0.00351403260771589,
+      0.0020552936759178292,
+      0.001102482842375513,
+      5.332796764095532E-4,
+      2.2502078443087175E-4,
+      8.132456018629313E-5,
+      2.498360281093742E-5,
+      6.6829514950423814E-6,
+      1.7449632407250264E-6,
+      4.909788509372824E-7,
+      1.5684348441413014E-7,
+      4.415991214768775E-8,
+      1.0492474877263184E-8,
+      1.957656771069103E-9,
+      2.5802146447004877E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.01000596693045542,
+      0.007020138549279936,
+      0.004946069582032202,
+      0.003483151215561255,
+      0.0023991290974655823,
+      0.0015793614229230991,
+      9.569588656999184E-4,
+      5.209847415833336E-4,
+      2.473505223610801E-4,
+      9.904665205541753E-5,
+      3.2778684521866866E-5,
+      8.712990693707895E-6,
+      1.7904539860522435E-6,
+      3.0534530225080447E-7,
+      4.5864222733130684E-8,
+      9.67071147027627E-9,
+      2.3562950445765526E-9,
+      4.914029457128014E-10,
+      7.997984106407277E-11,
+      9.381018392075353E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index 8fee0814..99bd8e8f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.786819911296504,
-      0.5989977644133435,
-      0.44119197993150483,
-      0.3138521723362104,
-      0.21596233731930775,
-      0.14138659682005233,
-      0.08936173981821659,
-      0.053571206921636506,
-      0.030805802165079648,
-      0.01691363012419211,
-      0.00887050490251598,
-      0.004442451953532403,
-      0.00211670264649697,
-      9.438419330811554E-4,
-      3.819154377529803E-4,
-      1.3550505201544378E-4,
-      3.8845344810999264E-5,
-      8.454437599000299E-6,
-      1.1049521824670764E-6,
-      5.2588487621771735E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.2542942042981856,
-      0.18604400068217566,
-      0.13154249673339402,
-      0.08937408116256132,
-      0.05805899608181195,
-      0.03638627009097949,
-      0.021907366190621492,
-      0.01270510711275724,
-      0.006983625116279073,
-      0.0035421863469641407,
-      0.0016310845082246523,
-      6.735434870800991E-4,
-      2.4513239707115337E-4,
-      8.03508366264512E-5,
-      2.2497141682863387E-5,
-      5.4211128874109765E-6,
-      9.955933871382086E-7,
-      1.1798184600469259E-7,
-      6.032781739742643E-9,
-      3.1737259531833734E-14
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       2.959166719348735E-5,
       5.041371572081886E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.786819911296504,
+      0.5989977644133435,
+      0.44119197993150483,
+      0.3138521723362104,
+      0.21596233731930775,
+      0.14138659682005233,
+      0.08936173981821659,
+      0.053571206921636506,
+      0.030805802165079648,
+      0.01691363012419211,
+      0.00887050490251598,
+      0.004442451953532403,
+      0.00211670264649697,
+      9.438419330811554E-4,
+      3.819154377529803E-4,
+      1.3550505201544378E-4,
+      3.8845344810999264E-5,
+      8.454437599000299E-6,
+      1.1049521824670764E-6,
+      5.2588487621771735E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.2542942042981856,
+      0.18604400068217566,
+      0.13154249673339402,
+      0.08937408116256132,
+      0.05805899608181195,
+      0.03638627009097949,
+      0.021907366190621492,
+      0.01270510711275724,
+      0.006983625116279073,
+      0.0035421863469641407,
+      0.0016310845082246523,
+      6.735434870800991E-4,
+      2.4513239707115337E-4,
+      8.03508366264512E-5,
+      2.2497141682863387E-5,
+      5.4211128874109765E-6,
+      9.955933871382086E-7,
+      1.1798184600469259E-7,
+      6.032781739742643E-9,
+      3.1737259531833734E-14
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index a9d80102..61d9b7df 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.11534974599388692,
-      0.08698148362667113,
-      0.06406292276167219,
-      0.046078192405115966,
-      0.03253637462327355,
-      0.022366693877149554,
-      0.015293415446741954,
-      0.010356860424666315,
-      0.0071064708130948295,
-      0.005007065846783981,
-      0.003667414131534427,
-      0.002770848786775516,
-      0.0020867731377499964,
-      0.001487821691947794,
-      9.535157338758259E-4,
-      5.30892978375666E-4,
-      2.463295318863031E-4,
-      9.45996695314454E-5,
-      2.8905529125483268E-5,
-      6.721429379688255E-6
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.02653824712720612,
-      0.01906655327064791,
-      0.0136267899834865,
-      0.009766412410391969,
-      0.007066017083512371,
-      0.00523951388261743,
-      0.004007441363707505,
-      0.003191472930812207,
-      0.002618022856257823,
-      0.002144323130572638,
-      0.0016874006667018076,
-      0.001232553642822115,
-      8.112607839937965E-4,
-      4.7620846546351104E-4,
-      2.377895200044316E-4,
-      1.0104841608143458E-4,
-      3.5068623684891964E-5,
-      9.656025948555974E-6,
-      1.971220245968162E-6,
-      2.7985578953711946E-7
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.0838031869483585E-4,
       1.083218280210284E-4
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.11534974599388692,
+      0.08698148362667113,
+      0.06406292276167219,
+      0.046078192405115966,
+      0.03253637462327355,
+      0.022366693877149554,
+      0.015293415446741954,
+      0.010356860424666315,
+      0.0071064708130948295,
+      0.005007065846783981,
+      0.003667414131534427,
+      0.002770848786775516,
+      0.0020867731377499964,
+      0.001487821691947794,
+      9.535157338758259E-4,
+      5.30892978375666E-4,
+      2.463295318863031E-4,
+      9.45996695314454E-5,
+      2.8905529125483268E-5,
+      6.721429379688255E-6
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.02653824712720612,
+      0.01906655327064791,
+      0.0136267899834865,
+      0.009766412410391969,
+      0.007066017083512371,
+      0.00523951388261743,
+      0.004007441363707505,
+      0.003191472930812207,
+      0.002618022856257823,
+      0.002144323130572638,
+      0.0016874006667018076,
+      0.001232553642822115,
+      8.112607839937965E-4,
+      4.7620846546351104E-4,
+      2.377895200044316E-4,
+      1.0104841608143458E-4,
+      3.5068623684891964E-5,
+      9.656025948555974E-6,
+      1.971220245968162E-6,
+      2.7985578953711946E-7
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index 6809afc0..ddb2e5f8 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.038262468062309395,
-      0.02603046344860471,
-      0.01715540085524189,
-      0.010885390093212639,
-      0.006660097241570286,
-      0.0038580884951301187,
-      0.002166326100789246,
-      0.0011583421935267536,
-      6.009032500164473E-4,
-      3.0233926709153145E-4,
-      1.4817587290785015E-4,
-      7.050104808577863E-5,
-      3.218992880314698E-5,
-      1.3832096806263695E-5,
-      5.4595298421187765E-6,
-      1.9428392150340854E-6,
-      5.888734403531786E-7,
-      1.497447089129761E-7,
-      2.995182697021267E-8,
-      4.2393461421128455E-9
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.009600199498981162,
-      0.006320598140568551,
-      0.003998495592416971,
-      0.002420968116332609,
-      0.0013922805998762865,
-      7.653511087722585E-4,
-      3.9910028144342E-4,
-      2.0013103147428787E-4,
-      9.684010210476125E-5,
-      4.5019235797793824E-5,
-      2.015822783889487E-5,
-      8.64004496540036E-6,
-      3.4752442404719267E-6,
-      1.3213285385796123E-6,
-      4.448966364141142E-7,
-      1.3385272064306846E-7,
-      3.3837155590627995E-8,
-      6.921729172485613E-9,
-      1.0496384684360477E-9,
-      1.0719894546654211E-10
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.6050336029577978E-6,
       3.6913561822247894E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.038262468062309395,
+      0.02603046344860471,
+      0.01715540085524189,
+      0.010885390093212639,
+      0.006660097241570286,
+      0.0038580884951301187,
+      0.002166326100789246,
+      0.0011583421935267536,
+      6.009032500164473E-4,
+      3.0233926709153145E-4,
+      1.4817587290785015E-4,
+      7.050104808577863E-5,
+      3.218992880314698E-5,
+      1.3832096806263695E-5,
+      5.4595298421187765E-6,
+      1.9428392150340854E-6,
+      5.888734403531786E-7,
+      1.497447089129761E-7,
+      2.995182697021267E-8,
+      4.2393461421128455E-9
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.009600199498981162,
+      0.006320598140568551,
+      0.003998495592416971,
+      0.002420968116332609,
+      0.0013922805998762865,
+      7.653511087722585E-4,
+      3.9910028144342E-4,
+      2.0013103147428787E-4,
+      9.684010210476125E-5,
+      4.5019235797793824E-5,
+      2.015822783889487E-5,
+      8.64004496540036E-6,
+      3.4752442404719267E-6,
+      1.3213285385796123E-6,
+      4.448966364141142E-7,
+      1.3385272064306846E-7,
+      3.3837155590627995E-8,
+      6.921729172485613E-9,
+      1.0496384684360477E-9,
+      1.0719894546654211E-10
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index f4820e25..b79cbeb7 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.42208946071091547,
-      0.2974192992829224,
-      0.20135076585285114,
-      0.1305395246849512,
-      0.0815970067558681,
-      0.048744740501394795,
-      0.028725892277458667,
-      0.016541985226090673,
-      0.009470995324371843,
-      0.005335755665961307,
-      0.002901525464829851,
-      0.0014719781786799477,
-      6.683264181931445E-4,
-      2.605397174213752E-4,
-      8.3404708447151E-5,
-      2.0739047848048297E-5,
-      3.4299913798081007E-6,
-      2.997988841557021E-7,
-      5.025722906176405E-9,
-      1.0054998350751101E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.11164429388903,
-      0.07615027439606956,
-      0.05022756412049563,
-      0.03205463978596522,
-      0.019725440887377196,
-      0.01179269779117072,
-      0.006779075962713359,
-      0.0037356672166708156,
-      0.0019318485274554854,
-      9.074369294380869E-4,
-      3.767767567965271E-4,
-      1.3364910505404506E-4,
-      3.848011036543469E-5,
-      8.843590615521889E-6,
-      1.3209823866585529E-6,
-      1.1402111764402845E-7,
-      3.993898781907206E-9,
-      4.57747291671781E-11,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.192750625801088E-6,
       4.01123348460218E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.42208946071091547,
+      0.2974192992829224,
+      0.20135076585285114,
+      0.1305395246849512,
+      0.0815970067558681,
+      0.048744740501394795,
+      0.028725892277458667,
+      0.016541985226090673,
+      0.009470995324371843,
+      0.005335755665961307,
+      0.002901525464829851,
+      0.0014719781786799477,
+      6.683264181931445E-4,
+      2.605397174213752E-4,
+      8.3404708447151E-5,
+      2.0739047848048297E-5,
+      3.4299913798081007E-6,
+      2.997988841557021E-7,
+      5.025722906176405E-9,
+      1.0054998350751101E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.11164429388903,
+      0.07615027439606956,
+      0.05022756412049563,
+      0.03205463978596522,
+      0.019725440887377196,
+      0.01179269779117072,
+      0.006779075962713359,
+      0.0037356672166708156,
+      0.0019318485274554854,
+      9.074369294380869E-4,
+      3.767767567965271E-4,
+      1.3364910505404506E-4,
+      3.848011036543469E-5,
+      8.843590615521889E-6,
+      1.3209823866585529E-6,
+      1.1402111764402845E-7,
+      3.993898781907206E-9,
+      4.57747291671781E-11,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index bd2bc1d9..0a90b7f1 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.10661956825578006,
-      0.07825519171496548,
-      0.0561094891689216,
-      0.039341880324394375,
-      0.02709410074929607,
-      0.018091891653570336,
-      0.011936507040030752,
-      0.007741438737676913,
-      0.005076325830295601,
-      0.00340464389948409,
-      0.002321055813108433,
-      0.0015492739820206014,
-      9.575059527875631E-4,
-      5.18588452697687E-4,
-      2.3545109060021696E-4,
-      8.704532042458257E-5,
-      2.427075127671637E-5,
-      4.6354399691063655E-6,
-      4.445186505995051E-7,
-      1.3362154203028717E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.036680532988787325,
-      0.027414530535075986,
-      0.02001079626050058,
-      0.014182599832325685,
-      0.00971186969071408,
-      0.006490198649420548,
-      0.004248749262339053,
-      0.002760588932101651,
-      0.0017653871994333199,
-      0.0010774435275250059,
-      6.045404997728946E-4,
-      2.999097181329959E-4,
-      1.2672661498885026E-4,
-      4.5597555745573066E-5,
-      1.2806028374110111E-5,
-      2.811031292211179E-6,
-      4.3749715102153516E-7,
-      3.7783452369069785E-8,
-      9.623240540872695E-10,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.660393923546466E-5,
       2.386951424389801E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.10661956825578006,
+      0.07825519171496548,
+      0.0561094891689216,
+      0.039341880324394375,
+      0.02709410074929607,
+      0.018091891653570336,
+      0.011936507040030752,
+      0.007741438737676913,
+      0.005076325830295601,
+      0.00340464389948409,
+      0.002321055813108433,
+      0.0015492739820206014,
+      9.575059527875631E-4,
+      5.18588452697687E-4,
+      2.3545109060021696E-4,
+      8.704532042458257E-5,
+      2.427075127671637E-5,
+      4.6354399691063655E-6,
+      4.445186505995051E-7,
+      1.3362154203028717E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.036680532988787325,
+      0.027414530535075986,
+      0.02001079626050058,
+      0.014182599832325685,
+      0.00971186969071408,
+      0.006490198649420548,
+      0.004248749262339053,
+      0.002760588932101651,
+      0.0017653871994333199,
+      0.0010774435275250059,
+      6.045404997728946E-4,
+      2.999097181329959E-4,
+      1.2672661498885026E-4,
+      4.5597555745573066E-5,
+      1.2806028374110111E-5,
+      2.811031292211179E-6,
+      4.3749715102153516E-7,
+      3.7783452369069785E-8,
+      9.623240540872695E-10,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index f5e68379..67c28524 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.7412169588394697,
-      0.5467816001080601,
-      0.38957338716575196,
-      0.26932234854741943,
-      0.182424277120165,
-      0.11994931531037087,
-      0.07799445393522517,
-      0.04927159721001212,
-      0.030375182622177848,
-      0.01800756632149536,
-      0.010097345897268723,
-      0.005212677576971366,
-      0.0023891867079266814,
-      9.327503975257338E-4,
-      2.9569280246056746E-4,
-      7.19503902368207E-5,
-      1.056522123963837E-5,
-      5.827805191672568E-7,
-      4.900618906359252E-9,
-      4.275203391051003E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.1998955891950991,
-      0.14547596255901285,
-      0.1040587366961149,
-      0.07263565013186658,
-      0.04899227095970393,
-      0.032022217251309874,
-      0.02022028637021548,
-      0.012504335812702614,
-      0.007563994237079135,
-      0.004367450760105192,
-      0.0023268221251636764,
-      0.0010965179514701422,
-      4.3485245282467544E-4,
-      1.4274115123127657E-4,
-      3.477749217799798E-5,
-      5.745950716089173E-6,
-      4.6551996044968885E-7,
-      1.0273248639993878E-8,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       6.2062973056638875E-6,
       2.2239402021916294E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.7412169588394697,
+      0.5467816001080601,
+      0.38957338716575196,
+      0.26932234854741943,
+      0.182424277120165,
+      0.11994931531037087,
+      0.07799445393522517,
+      0.04927159721001212,
+      0.030375182622177848,
+      0.01800756632149536,
+      0.010097345897268723,
+      0.005212677576971366,
+      0.0023891867079266814,
+      9.327503975257338E-4,
+      2.9569280246056746E-4,
+      7.19503902368207E-5,
+      1.056522123963837E-5,
+      5.827805191672568E-7,
+      4.900618906359252E-9,
+      4.275203391051003E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.1998955891950991,
+      0.14547596255901285,
+      0.1040587366961149,
+      0.07263565013186658,
+      0.04899227095970393,
+      0.032022217251309874,
+      0.02022028637021548,
+      0.012504335812702614,
+      0.007563994237079135,
+      0.004367450760105192,
+      0.0023268221251636764,
+      0.0010965179514701422,
+      4.3485245282467544E-4,
+      1.4274115123127657E-4,
+      3.477749217799798E-5,
+      5.745950716089173E-6,
+      4.6551996044968885E-7,
+      1.0273248639993878E-8,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 67bc5eb9..4835460e 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.2723316271520372,
-      0.2253595359892266,
-      0.1799621311652722,
-      0.13836979363296367,
-      0.10269140077244304,
-      0.07282824746890097,
-      0.05011926989783884,
-      0.03305816912308876,
-      0.021084933210515206,
-      0.012921430216815149,
-      0.007558665107152614,
-      0.0041592321627043115,
-      0.0021064460405320422,
-      9.557962065453291E-4,
-      3.7679313231394436E-4,
-      1.2566261899114287E-4,
-      3.2681242754494004E-5,
-      6.181223929813808E-6,
-      6.711347732593156E-7,
-      2.2378453810730706E-8
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.10100761994357671,
-      0.07526360103957089,
-      0.05458731487708507,
-      0.03847947914813512,
-      0.02623530957353106,
-      0.017385984037019915,
-      0.01115822621837147,
-      0.007013441952136959,
-      0.004318069667920409,
-      0.0025661941306192957,
-      0.0014399298095535281,
-      7.370477823341763E-4,
-      3.297973882412486E-4,
-      1.2773213803038674E-4,
-      3.9447120140931075E-5,
-      9.544443903761028E-6,
-      1.5457202459085525E-6,
-      1.1327374185809158E-7,
-      2.9729067075443623E-10,
-      4.389238001777538E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.911727085766261E-5,
       4.100982884701552E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.2723316271520372,
+      0.2253595359892266,
+      0.1799621311652722,
+      0.13836979363296367,
+      0.10269140077244304,
+      0.07282824746890097,
+      0.05011926989783884,
+      0.03305816912308876,
+      0.021084933210515206,
+      0.012921430216815149,
+      0.007558665107152614,
+      0.0041592321627043115,
+      0.0021064460405320422,
+      9.557962065453291E-4,
+      3.7679313231394436E-4,
+      1.2566261899114287E-4,
+      3.2681242754494004E-5,
+      6.181223929813808E-6,
+      6.711347732593156E-7,
+      2.2378453810730706E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.10100761994357671,
+      0.07526360103957089,
+      0.05458731487708507,
+      0.03847947914813512,
+      0.02623530957353106,
+      0.017385984037019915,
+      0.01115822621837147,
+      0.007013441952136959,
+      0.004318069667920409,
+      0.0025661941306192957,
+      0.0014399298095535281,
+      7.370477823341763E-4,
+      3.297973882412486E-4,
+      1.2773213803038674E-4,
+      3.9447120140931075E-5,
+      9.544443903761028E-6,
+      1.5457202459085525E-6,
+      1.1327374185809158E-7,
+      2.9729067075443623E-10,
+      4.389238001777538E-12
+    ]
   }
 }
-- 
GitLab


From 0aa6a29422e1fa17c06ddf08160349d393d92bea Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 27 Feb 2024 10:18:01 -0700
Subject: [PATCH 09/11] added carriage return

---
 .../usgs/earthquake/nshmp/model/NshmTestUtils.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 9d0daaba..92b8917c 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -10,6 +10,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,6 +29,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import gov.usgs.earthquake.nshmp.NamedLocation;
+import gov.usgs.earthquake.nshmp.Text;
 import gov.usgs.earthquake.nshmp.calc.CalcConfig;
 import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
@@ -35,7 +37,6 @@ import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
-
 import io.swagger.v3.core.util.Yaml;
 
 /**
@@ -101,7 +102,9 @@ class NshmTestUtils {
   static void writeExpecteds(NshmModel nshmModel, Optional<Path> dataPath) throws IOException {
     for (NamedLocation location : nshmModel.nshm.locations()) {
       Map<String, XySequence> xyMap = generateActual(nshmModel, location);
-      String json = GSON.toJson(xyMap);
+      String json = new StringBuilder(GSON.toJson(xyMap))
+          .append(Text.NEWLINE)
+          .toString();
       writeExpected(nshmModel.nshm, location, json, dataPath);
     }
   }
@@ -164,8 +167,10 @@ class NshmTestUtils {
 
     Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
         .collect(Collectors.toMap(
-            e -> e.getKey().toString(),
-            Entry::getValue));
+            e -> e.getKey().name(),
+            Entry::getValue,
+            (o1, o2) -> o1,
+            LinkedHashMap::new)); // preserve IMT enum order
 
     return xyMap;
   }
-- 
GitLab


From 6c6be75b418a9507669703f6790d57558ce5d4bd Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 27 Feb 2024 10:23:38 -0700
Subject: [PATCH 10/11] updated conus 2023 tests results; normal fault grid fix

---
 .../e2e/nshm-conus-2023/BOSTON_MA.json        | 108 ++++++------
 .../e2e/nshm-conus-2023/CHICAGO_IL.json       | 100 +++++------
 .../e2e/nshm-conus-2023/NEW_MADRID_MO.json    | 132 +++++++--------
 .../e2e/nshm-conus-2023/NEW_YORK_NY.json      | 120 ++++++-------
 .../e2e/nshm-conus-2023/RENO_NV.json          | 156 ++++++++---------
 .../nshm-conus-2023/SALT_LAKE_CITY_UT.json    | 158 +++++++++---------
 .../e2e/nshm-conus-2023/SEATTLE_WA.json       |  46 ++---
 7 files changed, 410 insertions(+), 410 deletions(-)

diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index c6000586..61da07dd 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -25,22 +25,22 @@
     "ys": [
       0.06599397975220576,
       0.04951601624256741,
-      0.0365137389821365,
+      0.036513738982136494,
       0.026258583569526418,
-      0.01833916291963425,
-      0.012411914456006224,
+      0.018339162919634257,
+      0.012411914456006222,
       0.008141006833289569,
       0.005152225174879873,
-      0.0031678998704058074,
-      0.001891726179226934,
-      0.0011035470885633655,
+      0.003167899870405808,
+      0.0018917261792269341,
+      0.0011035470885633653,
       6.179966567302163E-4,
-      3.3856119751495657E-4,
+      3.385611975149566E-4,
       1.763058445320691E-4,
-      8.726172285630189E-5,
+      8.72617228563019E-5,
       3.9826481132802925E-5,
-      1.632507906376405E-5,
-      5.769066788130917E-6,
+      1.6325079063764054E-5,
+      5.769066788130916E-6,
       1.7184900721224076E-6,
       3.963193550050804E-7
     ]
@@ -70,25 +70,25 @@
     ],
     "ys": [
       0.09353115905390524,
-      0.07030167366690494,
-      0.05123931616345851,
-      0.03630581145641292,
-      0.024635985605014437,
-      0.016213078359687383,
+      0.0703016736669049,
+      0.051239316163458525,
+      0.036305811456412915,
+      0.024635985605014423,
+      0.01621307835968738,
       0.010249801865790505,
-      0.006212298795439012,
-      0.003630754390360235,
-      0.0020431384223740224,
-      0.001110331693237283,
-      5.822894133817991E-4,
-      2.940195468041952E-4,
+      0.006212298795439011,
+      0.0036307543903602345,
+      0.002043138422374023,
+      0.0011103316932372833,
+      5.822894133817993E-4,
+      2.9401954680419504E-4,
       1.421467305260284E-4,
-      6.507484914740443E-5,
+      6.50748491474044E-5,
       2.7625833026584586E-5,
-      1.0658990087928288E-5,
-      3.6223864109735097E-6,
-      1.0342006360285488E-6,
-      2.3647467423869639E-7
+      1.0658990087928293E-5,
+      3.622386410973509E-6,
+      1.034200636028549E-6,
+      2.3647467423869644E-7
     ]
   },
   "SA1P0": {
@@ -116,24 +116,24 @@
     ],
     "ys": [
       0.03781690942134723,
-      0.025609987126957216,
-      0.016835178417561724,
+      0.025609987126957227,
+      0.016835178417561717,
       0.010675317900339298,
-      0.006527977980738502,
-      0.0037666741939616066,
+      0.0065279779807385,
+      0.0037666741939616057,
       0.0020910571328798203,
       0.00109235908996311,
       5.458772566494525E-4,
-      2.610498573544112E-4,
-      1.2062939801655832E-4,
-      5.411364755018729E-5,
+      2.6104985735441133E-4,
+      1.2062939801655838E-4,
+      5.411364755018728E-5,
       2.3475389991093996E-5,
-      9.699580588310421E-6,
+      9.699580588310414E-6,
       3.7213621990011277E-6,
-      1.2984686317975075E-6,
-      3.882066000228318E-7,
-      9.785045471794201E-8,
-      1.946037843483607E-8,
+      1.2984686317975073E-6,
+      3.882066000228316E-7,
+      9.7850454717942E-8,
+      1.9460378434836078E-8,
       2.742272834535854E-9
     ]
   },
@@ -161,26 +161,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.009213207300948616,
-      0.006121721172229911,
+      0.009213207300948613,
+      0.006121721172229914,
       0.003927784889616463,
-      0.002415843378135533,
-      0.001407276929891261,
+      0.0024158433781355333,
+      0.0014072769298912608,
       7.774423342976145E-4,
-      4.024693099758765E-4,
-      1.9730634218575706E-4,
-      9.182408947706066E-5,
+      4.024693099758766E-4,
+      1.9730634218575704E-4,
+      9.182408947706067E-5,
       4.046584903685399E-5,
-      1.703760017497274E-5,
-      6.8664822239861384E-6,
-      2.616062277136032E-6,
-      9.54240383432457E-7,
-      3.1185607453236496E-7,
-      9.181884057053902E-8,
-      2.284823926814979E-8,
+      1.7037600174972742E-5,
+      6.866482223986136E-6,
+      2.6160622771360315E-6,
+      9.542403834324573E-7,
+      3.118560745323649E-7,
+      9.181884057053904E-8,
+      2.2848239268149787E-8,
       4.620311222721341E-9,
-      6.936412711209975E-10,
-      7.028579358099718E-11
+      6.936412711209973E-10,
+      7.028579358099717E-11
     ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index 13687b7f..c911888c 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -23,24 +23,24 @@
       1.6428726885203377
     ],
     "ys": [
-      0.04088625408517391,
-      0.027424345917626186,
+      0.040886254085173906,
+      0.027424345917626183,
       0.018219034045095478,
-      0.011934422965670084,
-      0.007663011513102013,
-      0.004765114308889276,
-      0.0028282312853084657,
+      0.011934422965670082,
+      0.007663011513102016,
+      0.004765114308889278,
+      0.002828231285308466,
       0.0015783077414236477,
-      8.390693640246434E-4,
-      4.318004979848099E-4,
-      2.2144131101680203E-4,
-      1.1266780710891708E-4,
-      5.821356278132562E-5,
+      8.390693640246431E-4,
+      4.3180049798480994E-4,
+      2.214413110168021E-4,
+      1.1266780710891706E-4,
+      5.821356278132561E-5,
       2.931622679832576E-5,
-      1.423317696903001E-5,
-      6.407467702128437E-6,
+      1.4233176969030012E-5,
+      6.407467702128436E-6,
       2.5948292983347613E-6,
-      9.05830295885436E-7,
+      9.058302958854363E-7,
       2.664550977482879E-7,
       6.060200630189975E-8
     ]
@@ -69,22 +69,22 @@
       1.998773638612381
     ],
     "ys": [
-      0.06915547672860357,
+      0.06915547672860359,
       0.04697296493489196,
-      0.030953931061635513,
-      0.020002703636453706,
-      0.012514413169193663,
+      0.030953931061635506,
+      0.020002703636453692,
+      0.012514413169193665,
       0.007683322438550792,
       0.004524345762442763,
-      0.0025095609630764112,
-      0.0013038143445699912,
+      0.002509560963076411,
+      0.0013038143445699914,
       6.313143767624348E-4,
       2.889831873797796E-4,
       1.2787451423137354E-4,
-      5.6009010931444306E-5,
-      2.4448517395010354E-5,
+      5.600901093144432E-5,
+      2.4448517395010347E-5,
       1.0472190893854825E-5,
-      4.248516889956776E-6,
+      4.248516889956777E-6,
       1.58075707954425E-6,
       5.190573795746768E-7,
       1.4267651060313717E-7,
@@ -115,26 +115,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03324893310902484,
-      0.022004431105884844,
-      0.014310147752740471,
-      0.009151239631673424,
+      0.033248933109024846,
+      0.02200443110588484,
+      0.014310147752740473,
+      0.009151239631673426,
       0.005779616772275175,
-      0.00351403260771589,
+      0.003514032607715889,
       0.0020552936759178292,
-      0.001102482842375513,
-      5.332796764095532E-4,
-      2.2502078443087175E-4,
-      8.132456018629313E-5,
-      2.498360281093742E-5,
-      6.6829514950423814E-6,
+      0.0011024828423755126,
+      5.332796764095533E-4,
+      2.2502078443087172E-4,
+      8.132456018629311E-5,
+      2.4983602810937422E-5,
+      6.682951495042382E-6,
       1.7449632407250264E-6,
       4.909788509372824E-7,
       1.5684348441413014E-7,
       4.415991214768775E-8,
-      1.0492474877263184E-8,
-      1.957656771069103E-9,
-      2.5802146447004877E-10
+      1.0492474877263185E-8,
+      1.9576567710691036E-9,
+      2.580214644700487E-10
     ]
   },
   "SA5P0": {
@@ -161,25 +161,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.01000596693045542,
-      0.007020138549279936,
-      0.004946069582032202,
+      0.010005966930455423,
+      0.007020138549279935,
+      0.004946069582032203,
       0.003483151215561255,
-      0.0023991290974655823,
+      0.0023991290974655828,
       0.0015793614229230991,
-      9.569588656999184E-4,
-      5.209847415833336E-4,
-      2.473505223610801E-4,
-      9.904665205541753E-5,
-      3.2778684521866866E-5,
-      8.712990693707895E-6,
-      1.7904539860522435E-6,
-      3.0534530225080447E-7,
+      9.569588656999188E-4,
+      5.209847415833337E-4,
+      2.4735052236108E-4,
+      9.904665205541754E-5,
+      3.277868452186689E-5,
+      8.712990693707899E-6,
+      1.790453986052243E-6,
+      3.053453022508046E-7,
       4.5864222733130684E-8,
       9.67071147027627E-9,
       2.3562950445765526E-9,
       4.914029457128014E-10,
-      7.997984106407277E-11,
+      7.99798410640728E-11,
       9.381018392075353E-12
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index 61d9b7df..e13e5b9d 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.20082676064116864,
-      0.17303158482719158,
-      0.14594179639708083,
-      0.11988197257474566,
-      0.09577256744660777,
-      0.07448415764500856,
-      0.05653535014883013,
+      0.20082676064116875,
+      0.1730315848271916,
+      0.14594179639708077,
+      0.11988197257474567,
+      0.0957725674466078,
+      0.07448415764500857,
+      0.0565353501488301,
       0.041839648477448414,
       0.0303591809822878,
-      0.021603536983251643,
-      0.015147902209371055,
-      0.010380513858986461,
-      0.0070868686399283305,
-      0.004776405847494424,
-      0.003194033664349469,
-      0.002063032278608447,
-      0.0012314821193950326,
-      6.362959860235963E-4,
-      2.7133142360006776E-4,
-      8.845979888500936E-5
+      0.02160353698325165,
+      0.015147902209371058,
+      0.010380513858986458,
+      0.007086868639928328,
+      0.004776405847494423,
+      0.0031940336643494693,
+      0.0020630322786084473,
+      0.0012314821193950328,
+      6.362959860235962E-4,
+      2.7133142360006787E-4,
+      8.845979888500938E-5
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.23235672977120586,
-      0.20103085787724265,
-      0.16949594749416605,
-      0.1389712314357324,
+      0.2323567297712059,
+      0.20103085787724267,
+      0.1694959474941661,
+      0.13897123143573237,
       0.10971503991301251,
-      0.08417324450282236,
-      0.06257442666659783,
+      0.08417324450282233,
+      0.06257442666659785,
       0.045144369921103045,
       0.03178577283279019,
-      0.02184326900023674,
-      0.014712774190862494,
-      0.009775248303873083,
-      0.006484422014715583,
-      0.004352494841555027,
-      0.0029609855726470823,
-      0.0019882654343830203,
-      0.0012502056040323956,
-      6.867898974882982E-4,
-      3.0838031869483585E-4,
-      1.083218280210284E-4
+      0.021843269000236757,
+      0.014712774190862496,
+      0.00977524830387308,
+      0.006484422014715585,
+      0.004352494841555026,
+      0.002960985572647082,
+      0.0019882654343830195,
+      0.0012502056040323954,
+      6.867898974882981E-4,
+      3.083803186948358E-4,
+      1.0832182802102839E-4
     ]
   },
   "SA1P0": {
@@ -115,26 +115,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.11534974599388692,
-      0.08698148362667113,
-      0.06406292276167219,
-      0.046078192405115966,
+      0.11534974599388693,
+      0.08698148362667112,
+      0.0640629227616722,
+      0.04607819240511596,
       0.03253637462327355,
       0.022366693877149554,
-      0.015293415446741954,
-      0.010356860424666315,
-      0.0071064708130948295,
-      0.005007065846783981,
-      0.003667414131534427,
-      0.002770848786775516,
-      0.0020867731377499964,
-      0.001487821691947794,
+      0.015293415446741959,
+      0.010356860424666317,
+      0.007106470813094831,
+      0.00500706584678398,
+      0.0036674141315344282,
+      0.0027708487867755165,
+      0.002086773137749996,
+      0.0014878216919477938,
       9.535157338758259E-4,
       5.30892978375666E-4,
       2.463295318863031E-4,
-      9.45996695314454E-5,
+      9.459966953144537E-5,
       2.8905529125483268E-5,
-      6.721429379688255E-6
+      6.721429379688254E-6
     ]
   },
   "SA5P0": {
@@ -161,26 +161,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.02653824712720612,
-      0.01906655327064791,
-      0.0136267899834865,
-      0.009766412410391969,
-      0.007066017083512371,
-      0.00523951388261743,
-      0.004007441363707505,
-      0.003191472930812207,
-      0.002618022856257823,
+      0.026538247127206115,
+      0.019066553270647914,
+      0.013626789983486497,
+      0.00976641241039197,
+      0.00706601708351237,
+      0.005239513882617428,
+      0.004007441363707504,
+      0.003191472930812208,
+      0.0026180228562578223,
       0.002144323130572638,
-      0.0016874006667018076,
+      0.001687400666701808,
       0.001232553642822115,
       8.112607839937965E-4,
-      4.7620846546351104E-4,
-      2.377895200044316E-4,
-      1.0104841608143458E-4,
-      3.5068623684891964E-5,
-      9.656025948555974E-6,
-      1.971220245968162E-6,
-      2.7985578953711946E-7
+      4.762084654635111E-4,
+      2.3778952000443157E-4,
+      1.0104841608143451E-4,
+      3.506862368489196E-5,
+      9.656025948555977E-6,
+      1.971220245968161E-6,
+      2.798557895371195E-7
     ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index ddb2e5f8..645f68c1 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -24,24 +24,24 @@
     ],
     "ys": [
       0.06295212478082786,
-      0.04804845815748259,
-      0.03619161082348151,
-      0.02671527513051389,
-      0.019260736860335054,
-      0.013535182229688402,
-      0.009262342125760423,
-      0.0061366371766336985,
-      0.003951706514772565,
-      0.002467202597047593,
-      0.0014990249509793992,
+      0.04804845815748258,
+      0.036191610823481504,
+      0.026715275130513888,
+      0.01926073686033505,
+      0.013535182229688403,
+      0.00926234212576043,
+      0.006136637176633699,
+      0.003951706514772566,
+      0.0024672025970475936,
+      0.001499024950979399,
       8.710019776437942E-4,
       4.921002498934158E-4,
-      2.6283929164592834E-4,
+      2.628392916459283E-4,
       1.3262871270711604E-4,
       6.14117930372459E-5,
-      2.5443650259819508E-5,
-      9.066496305781536E-6,
-      2.719577797059731E-6,
+      2.5443650259819518E-5,
+      9.06649630578154E-6,
+      2.719577797059732E-6,
       6.313004310982963E-7
     ]
   },
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.0877697243193884,
-      0.06659157694814946,
-      0.049225799499276135,
-      0.03552861479492543,
-      0.024688518599665057,
-      0.016720836145648114,
-      0.010940274062286886,
+      0.08776972431938841,
+      0.06659157694814943,
+      0.04922579949927613,
+      0.035528614794925424,
+      0.024688518599665053,
+      0.016720836145648118,
+      0.010940274062286884,
       0.006899372453907444,
       0.004211132882578024,
-      0.002479522815087655,
-      0.0014092415433829236,
-      7.711400309583002E-4,
-      4.0474448623951237E-4,
-      2.0238516038224294E-4,
+      0.0024795228150876554,
+      0.001409241543382924,
+      7.711400309583E-4,
+      4.047444862395125E-4,
+      2.023851603822429E-4,
       9.527876089291167E-5,
-      4.134621298433283E-5,
-      1.6214324144157026E-5,
-      5.575162343216447E-6,
-      1.6050336029577978E-6,
-      3.6913561822247894E-7
+      4.1346212984332834E-5,
+      1.6214324144157016E-5,
+      5.575162343216448E-6,
+      1.605033602957798E-6,
+      3.6913561822247884E-7
     ]
   },
   "SA1P0": {
@@ -117,24 +117,24 @@
     "ys": [
       0.038262468062309395,
       0.02603046344860471,
-      0.01715540085524189,
-      0.010885390093212639,
+      0.0171554008552419,
+      0.010885390093212636,
       0.006660097241570286,
-      0.0038580884951301187,
-      0.002166326100789246,
+      0.0038580884951301183,
+      0.0021663261007892464,
       0.0011583421935267536,
-      6.009032500164473E-4,
-      3.0233926709153145E-4,
-      1.4817587290785015E-4,
-      7.050104808577863E-5,
+      6.009032500164475E-4,
+      3.0233926709153134E-4,
+      1.481758729078501E-4,
+      7.05010480857786E-5,
       3.218992880314698E-5,
       1.3832096806263695E-5,
       5.4595298421187765E-6,
-      1.9428392150340854E-6,
-      5.888734403531786E-7,
+      1.9428392150340858E-6,
+      5.888734403531785E-7,
       1.497447089129761E-7,
-      2.995182697021267E-8,
-      4.2393461421128455E-9
+      2.995182697021266E-8,
+      4.239346142112846E-9
     ]
   },
   "SA5P0": {
@@ -161,26 +161,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.009600199498981162,
-      0.006320598140568551,
-      0.003998495592416971,
-      0.002420968116332609,
-      0.0013922805998762865,
-      7.653511087722585E-4,
-      3.9910028144342E-4,
-      2.0013103147428787E-4,
+      0.00960019949898116,
+      0.0063205981405685535,
+      0.003998495592416973,
+      0.0024209681163326075,
+      0.0013922805998762867,
+      7.653511087722588E-4,
+      3.991002814434198E-4,
+      2.0013103147428784E-4,
       9.684010210476125E-5,
-      4.5019235797793824E-5,
-      2.015822783889487E-5,
+      4.501923579779383E-5,
+      2.0158227838894865E-5,
       8.64004496540036E-6,
-      3.4752442404719267E-6,
+      3.4752442404719263E-6,
       1.3213285385796123E-6,
-      4.448966364141142E-7,
-      1.3385272064306846E-7,
-      3.3837155590627995E-8,
-      6.921729172485613E-9,
-      1.0496384684360477E-9,
-      1.0719894546654211E-10
+      4.448966364141143E-7,
+      1.3385272064306838E-7,
+      3.383715559062799E-8,
+      6.9217291724856125E-9,
+      1.0496384684360479E-9,
+      1.0719894546654213E-10
     ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index b79cbeb7..0d26f673 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.4599333220939226,
-      0.3319776608862077,
-      0.23410088529558729,
-      0.16155236244329693,
-      0.10975325964274066,
-      0.07368639683099817,
-      0.04881766791656007,
-      0.031516148212009015,
-      0.019734501735053228,
-      0.01186342197497338,
-      0.006829116483982683,
-      0.003637082921969351,
-      0.0017718723024865678,
-      7.330347632042515E-4,
-      2.493797124513596E-4,
-      6.540576160652672E-5,
-      1.2274495294260517E-5,
-      1.4624587583248914E-6,
-      9.203515745538137E-8,
-      1.7885452404470933E-10
+      0.5972788279728068,
+      0.45551677756961034,
+      0.3399215909211889,
+      0.2471629565800418,
+      0.17489056501095263,
+      0.12022240407450094,
+      0.08001677667696963,
+      0.05099621491371491,
+      0.031081055916078217,
+      0.01799280612387362,
+      0.009906089653035983,
+      0.005028264089798111,
+      0.0023443978391006585,
+      9.338960382350111E-4,
+      3.077054246112608E-4,
+      7.82471132965498E-5,
+      1.4143256741825616E-5,
+      1.5881903364001947E-6,
+      9.46197537543736E-8,
+      1.8313544728521859E-10
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.5781960731971703,
-      0.43177321810324454,
-      0.31274271601333864,
-      0.22202526342481693,
-      0.15373200297637596,
-      0.10590597476401897,
-      0.07213416807145692,
-      0.048342735627774275,
-      0.03176496757190812,
-      0.020237744450034734,
-      0.012424276707916994,
-      0.007295810162387152,
-      0.004046292522385159,
-      0.0020624086591356215,
-      9.280676384800567E-4,
-      3.520639158917028E-4,
-      1.0857330290598699E-4,
-      2.568936875118568E-5,
-      4.192750625801088E-6,
-      4.01123348460218E-7
+      0.7236108162056203,
+      0.567667719848688,
+      0.43467183079974187,
+      0.32640117978371663,
+      0.23801714263732765,
+      0.17044739409096066,
+      0.11868180647833003,
+      0.07981549025204573,
+      0.051735304312373935,
+      0.032072438082467805,
+      0.01896577722138045,
+      0.010651280186534736,
+      0.005630672217087258,
+      0.0027404159075518093,
+      0.0011842813187515045,
+      4.3397948619161163E-4,
+      1.2968565954640386E-4,
+      2.9700219192423323E-5,
+      4.632251042844163E-6,
+      4.2018344044956796E-7
     ]
   },
   "SA1P0": {
@@ -115,26 +115,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.42208946071091547,
-      0.2974192992829224,
-      0.20135076585285114,
-      0.1305395246849512,
-      0.0815970067558681,
-      0.048744740501394795,
-      0.028725892277458667,
-      0.016541985226090673,
-      0.009470995324371843,
-      0.005335755665961307,
-      0.002901525464829851,
-      0.0014719781786799477,
-      6.683264181931445E-4,
-      2.605397174213752E-4,
-      8.3404708447151E-5,
-      2.0739047848048297E-5,
-      3.4299913798081007E-6,
-      2.997988841557021E-7,
-      5.025722906176405E-9,
-      1.0054998350751101E-11
+      0.5219477726879708,
+      0.37730540599323026,
+      0.2618487318283435,
+      0.17375513024998976,
+      0.11076572090347894,
+      0.0670549997265128,
+      0.03960891514201742,
+      0.0225485628734887,
+      0.012586152262602394,
+      0.006842363626316163,
+      0.003578286603580534,
+      0.0017507944584011482,
+      7.713470669559938E-4,
+      2.936228536623338E-4,
+      9.224261160547563E-5,
+      2.2592712033868176E-5,
+      3.691118541346774E-6,
+      3.231918459771664E-7,
+      6.1232796619845785E-9,
+      2.0109996701502205E-11
     ]
   },
   "SA5P0": {
@@ -161,24 +161,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.11164429388903,
-      0.07615027439606956,
-      0.05022756412049563,
-      0.03205463978596522,
-      0.019725440887377196,
-      0.01179269779117072,
-      0.006779075962713359,
-      0.0037356672166708156,
-      0.0019318485274554854,
-      9.074369294380869E-4,
-      3.767767567965271E-4,
-      1.3364910505404506E-4,
-      3.848011036543469E-5,
-      8.843590615521889E-6,
-      1.3209823866585529E-6,
-      1.1402111764402845E-7,
-      3.993898781907206E-9,
-      4.57747291671781E-11,
+      0.13362884700778677,
+      0.09063239324020197,
+      0.059373920914131254,
+      0.037593384793945264,
+      0.022921784340169032,
+      0.013556328120172888,
+      0.007694274328610629,
+      0.004181826572655606,
+      0.002133090339755707,
+      9.893083682083125E-4,
+      4.063282626074118E-4,
+      1.428928812057351E-4,
+      4.089045563170268E-5,
+      9.367924997047522E-6,
+      1.4045810906759489E-6,
+      1.2317916289669097E-7,
+      4.446141854002224E-9,
+      5.069183745257179E-11,
       0.0,
       0.0
     ]
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index 0a90b7f1..bdc152de 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.13499314894527403,
-      0.10345943672061181,
-      0.07692399077316703,
-      0.05548620988443223,
-      0.03900001317460326,
-      0.02678500066257991,
-      0.017968206202401048,
-      0.01173766157331265,
-      0.007606679496527605,
-      0.005001050150819256,
-      0.0034065854722393333,
-      0.002344470201826488,
-      0.0015592089355909338,
-      9.075635513349779E-4,
-      4.330276156939576E-4,
-      1.5874554685976004E-4,
-      4.254754130488548E-5,
-      7.419397242177774E-6,
-      7.200876073546254E-7,
-      2.266803290550335E-8
+      0.18361545477828986,
+      0.13940459854191709,
+      0.10274385753529175,
+      0.07344711450228097,
+      0.051102038821659396,
+      0.034684056193446736,
+      0.022955979758805103,
+      0.014752405453628468,
+      0.009346401271204565,
+      0.005946214011527529,
+      0.003885690947280724,
+      0.002561650760968823,
+      0.001647496758401624,
+      9.376377302118986E-4,
+      4.413835751257972E-4,
+      1.604802270192597E-4,
+      4.277938579902604E-5,
+      7.432687930412037E-6,
+      7.202489232556826E-7,
+      2.2668227027151583E-8
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.17288418755864438,
-      0.1375827374341671,
-      0.1054346371433752,
-      0.07824019989964623,
-      0.055887122092807634,
-      0.039159099313921884,
-      0.02682324594932466,
-      0.017949410300669166,
-      0.011815578180490236,
-      0.007730434545688283,
-      0.005141237870537882,
-      0.0035259505457939508,
-      0.0024637091317716063,
-      0.0016696333053445832,
-      0.0010219552979188978,
-      5.275816856796742E-4,
-      2.1974043251097854E-4,
-      7.115551098628321E-5,
-      1.660393923546466E-5,
-      2.386951424389801E-6
+      0.23320231521326107,
+      0.1839074472278182,
+      0.1399016626037664,
+      0.10321710634290407,
+      0.07333323315890089,
+      0.051071581130808806,
+      0.03470236295366904,
+      0.02297218326608507,
+      0.014899905527914927,
+      0.009537456232653594,
+      0.0061432010890830275,
+      0.004044425783446501,
+      0.0027096090729598872,
+      0.001774057860401824,
+      0.0010605038653433343,
+      5.394310356819593E-4,
+      2.226322778693759E-4,
+      7.166459439601786E-5,
+      1.6652894586518127E-5,
+      2.388471325072826E-6
     ]
   },
   "SA1P0": {
@@ -115,26 +115,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.10661956825578006,
-      0.07825519171496548,
-      0.0561094891689216,
-      0.039341880324394375,
-      0.02709410074929607,
-      0.018091891653570336,
-      0.011936507040030752,
-      0.007741438737676913,
-      0.005076325830295601,
-      0.00340464389948409,
-      0.002321055813108433,
-      0.0015492739820206014,
-      9.575059527875631E-4,
-      5.18588452697687E-4,
-      2.3545109060021696E-4,
-      8.704532042458257E-5,
-      2.427075127671637E-5,
-      4.6354399691063655E-6,
-      4.445186505995051E-7,
-      1.3362154203028717E-8
+      0.15054622520946292,
+      0.1090217648845708,
+      0.07666483610969545,
+      0.05240778514306985,
+      0.03503783255225136,
+      0.022641352724132043,
+      0.014453880938258973,
+      0.009059609044502733,
+      0.005737353299616898,
+      0.0037181506695530557,
+      0.0024600681425501324,
+      0.0016057935737134156,
+      9.780207254244185E-4,
+      5.250130181225505E-4,
+      2.371103816212096E-4,
+      8.737798975259923E-5,
+      2.4314111542058963E-5,
+      4.638853802978134E-6,
+      4.4466472819508965E-7,
+      1.3363078280723584E-8
     ]
   },
   "SA5P0": {
@@ -161,25 +161,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.036680532988787325,
-      0.027414530535075986,
-      0.02001079626050058,
-      0.014182599832325685,
-      0.00971186969071408,
-      0.006490198649420548,
-      0.004248749262339053,
-      0.002760588932101651,
-      0.0017653871994333199,
-      0.0010774435275250059,
-      6.045404997728946E-4,
-      2.999097181329959E-4,
-      1.2672661498885026E-4,
-      4.5597555745573066E-5,
-      1.2806028374110111E-5,
-      2.811031292211179E-6,
-      4.3749715102153516E-7,
-      3.7783452369069785E-8,
-      9.623240540872695E-10,
+      0.04635707727325521,
+      0.03359280563469308,
+      0.023793194398473917,
+      0.016396814611206165,
+      0.010938700036705825,
+      0.007134739874816184,
+      0.004565236017050662,
+      0.0029069252830032435,
+      0.0018287485283719714,
+      0.001102678349518717,
+      6.136774291034867E-4,
+      3.0284611030529886E-4,
+      1.2752722052965866E-4,
+      4.578182986090827E-5,
+      1.2837978626912138E-5,
+      2.815200293929632E-6,
+      4.3784090881075576E-7,
+      3.779721588259598E-8,
+      9.624889672772523E-10,
       0.0
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 4835460e..dda74425 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -30,10 +30,10 @@
       0.13814440560161714,
       0.10320898786594203,
       0.07371091265962149,
-      0.049925877599589025,
-      0.032096466227447655,
+      0.04992587759958903,
+      0.03209646622744765,
       0.019483440112317264,
-      0.011169175072030645,
+      0.011169175072030647,
       0.005886010861535864,
       0.0028760017939065893,
       0.001238250623016173,
@@ -72,8 +72,8 @@
       0.3316228562852521,
       0.29560208196419013,
       0.25653382052184187,
-      0.21643446693258592,
-      0.17580145371321246,
+      0.21643446693258594,
+      0.17580145371321249,
       0.13812635242096122,
       0.10415840860866447,
       0.07501061312549723,
@@ -81,13 +81,13 @@
       0.033733596742758915,
       0.02094857877622853,
       0.01230118239253893,
-      0.006783792966915222,
+      0.006783792966915221,
       0.0034731591416989173,
       0.0016209320643428172,
       6.710682260221141E-4,
       2.4202921331541668E-4,
       7.461578679920015E-5,
-      1.911727085766261E-5,
+      1.9117270857662606E-5,
       4.100982884701552E-6
     ]
   },
@@ -116,23 +116,23 @@
     ],
     "ys": [
       0.2723316271520372,
-      0.2253595359892266,
+      0.22535953598922662,
       0.1799621311652722,
       0.13836979363296367,
       0.10269140077244304,
-      0.07282824746890097,
+      0.07282824746890096,
       0.05011926989783884,
       0.03305816912308876,
       0.021084933210515206,
-      0.012921430216815149,
-      0.007558665107152614,
-      0.0041592321627043115,
-      0.0021064460405320422,
-      9.557962065453291E-4,
+      0.01292143021681515,
+      0.007558665107152612,
+      0.004159232162704311,
+      0.0021064460405320427,
+      9.557962065453292E-4,
       3.7679313231394436E-4,
-      1.2566261899114287E-4,
+      1.2566261899114284E-4,
       3.2681242754494004E-5,
-      6.181223929813808E-6,
+      6.181223929813809E-6,
       6.711347732593156E-7,
       2.2378453810730706E-8
     ]
@@ -163,19 +163,19 @@
     "ys": [
       0.10100761994357671,
       0.07526360103957089,
-      0.05458731487708507,
+      0.054587314877085076,
       0.03847947914813512,
       0.02623530957353106,
       0.017385984037019915,
       0.01115822621837147,
-      0.007013441952136959,
-      0.004318069667920409,
+      0.00701344195213696,
+      0.004318069667920411,
       0.0025661941306192957,
-      0.0014399298095535281,
-      7.370477823341763E-4,
+      0.001439929809553528,
+      7.370477823341764E-4,
       3.297973882412486E-4,
-      1.2773213803038674E-4,
-      3.9447120140931075E-5,
+      1.2773213803038677E-4,
+      3.944712014093108E-5,
       9.544443903761028E-6,
       1.5457202459085525E-6,
       1.1327374185809158E-7,
-- 
GitLab


From 65530c2eb7eb82b47778780c201841bf95a3f95e Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 27 Feb 2024 15:14:42 -0700
Subject: [PATCH 11/11] spotless formatting

---
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 92b8917c..81b33a0e 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -37,6 +37,7 @@ import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
+
 import io.swagger.v3.core.util.Yaml;
 
 /**
-- 
GitLab