diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
index 567f66950a5d14bd4758bb13af3d93524b906f06..fa13e5019d914bc4982232e18947d3b50f9ed079 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1076,125 +1076,6 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_1(
- NgaEastUsgs_2017.Sammons_1.class,
- NgaEastUsgs_2017.Sammons_1.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_2(
- NgaEastUsgs_2017.Sammons_2.class,
- NgaEastUsgs_2017.Sammons_2.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_3(
- NgaEastUsgs_2017.Sammons_3.class,
- NgaEastUsgs_2017.Sammons_3.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_4(
- NgaEastUsgs_2017.Sammons_4.class,
- NgaEastUsgs_2017.Sammons_4.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_5(
- NgaEastUsgs_2017.Sammons_5.class,
- NgaEastUsgs_2017.Sammons_5.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_6(
- NgaEastUsgs_2017.Sammons_6.class,
- NgaEastUsgs_2017.Sammons_6.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_7(
- NgaEastUsgs_2017.Sammons_7.class,
- NgaEastUsgs_2017.Sammons_7.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_8(
- NgaEastUsgs_2017.Sammons_8.class,
- NgaEastUsgs_2017.Sammons_8.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_9(
- NgaEastUsgs_2017.Sammons_9.class,
- NgaEastUsgs_2017.Sammons_9.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_10(
- NgaEastUsgs_2017.Sammons_10.class,
- NgaEastUsgs_2017.Sammons_10.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_11(
- NgaEastUsgs_2017.Sammons_11.class,
- NgaEastUsgs_2017.Sammons_11.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_12(
- NgaEastUsgs_2017.Sammons_12.class,
- NgaEastUsgs_2017.Sammons_12.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_13(
- NgaEastUsgs_2017.Sammons_13.class,
- NgaEastUsgs_2017.Sammons_13.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_14(
- NgaEastUsgs_2017.Sammons_14.class,
- NgaEastUsgs_2017.Sammons_14.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_15(
- NgaEastUsgs_2017.Sammons_15.class,
- NgaEastUsgs_2017.Sammons_15.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_16(
- NgaEastUsgs_2017.Sammons_16.class,
- NgaEastUsgs_2017.Sammons_16.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
- /** @see NgaEastUsgs_2017 */
- NGA_EAST_USGS_17(
- NgaEastUsgs_2017.Sammons_17.class,
- NgaEastUsgs_2017.Sammons_17.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
/** NGA-East for USGS with Guo & Chapman Gulf CPA **/
NGA_EAST_USGS_CPA(
NgaEastUsgs_2017.Usgs17Cpa.class,
@@ -1211,6 +1092,13 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
+ /** NGA-East for USGS Seed Models with Guo & Chapman Gulf CPA **/
+ NGA_EAST_USGS_SEEDS_CPA(
+ NgaEastUsgs_2017.UsgsSeedsCpa.class,
+ NgaEastUsgs_2017.UsgsSeedsCpa.NAME,
+ NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
+ NgaEastUsgs_2017.CONSTRAINTS),
+
/* NGA-East Seed Models */
/** @see NgaEastUsgs_2017 */
@@ -1367,13 +1255,6 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
- /** NGA-East for USGS Seed Models with Guo & Chapman Gulf CPA **/
- NGA_EAST_USGS_SEEDS_CPA(
- NgaEastUsgs_2017.UsgsSeedsCpa.class,
- NgaEastUsgs_2017.UsgsSeedsCpa.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
-
/* Combined: must be declared after any dependent models above. */
/**
@@ -1834,27 +1715,6 @@ public enum Gmm {
NGA_EAST_USGS_CPA,
NGA_EAST_USGS_SEEDS_CPA)),
- NGA_EAST_SAMMONS2(
- "NGA-East USGS Sammons",
- List.of(
- NGA_EAST_USGS_1,
- NGA_EAST_USGS_2,
- NGA_EAST_USGS_3,
- NGA_EAST_USGS_4,
- NGA_EAST_USGS_5,
- NGA_EAST_USGS_6,
- NGA_EAST_USGS_7,
- NGA_EAST_USGS_8,
- NGA_EAST_USGS_9,
- NGA_EAST_USGS_10,
- NGA_EAST_USGS_11,
- NGA_EAST_USGS_12,
- NGA_EAST_USGS_13,
- NGA_EAST_USGS_14,
- NGA_EAST_USGS_15,
- NGA_EAST_USGS_16,
- NGA_EAST_USGS_17)),
-
NGA_EAST_SEEDS(
"NGA-East Seeds",
List.of(
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
index 96939fc1a87e3783e8c59d502077c339f256a971..69c035102b7e0a3e2cad0a560a1960aeefc184d4 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
@@ -585,191 +585,6 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
}
}
- static abstract class Sammons extends NgaEastUsgs_2017 {
- static final String NAME = NgaEastUsgs_2017.NAME + " : Sammons : ";
- static final String NAME0 = NAME + "0";
-
- final int id;
- final GroundMotionTable table;
- final GroundMotionTable pgaTable;
- final SiteAmp siteAmp;
-
- Sammons(int id, Imt imt) {
- super(imt);
- this.id = id;
- this.table = GroundMotionTables.getNgaEast(imt)[id - 1];
- this.pgaTable = GroundMotionTables.getNgaEast(Imt.PGA)[id - 1];
- this.siteAmp = new SiteAmp(imt);
- }
-
- @Override
- public LogicTree<GroundMotion> calc(GmmInput in) {
- double σEpri = sigmaEpri(in.Mw);
- double σPanel = sigmaPanel(in.Mw, in.vs30);
- Position p = table.position(in.rRup, in.Mw);
- double μPga = exp(pgaTable.get(p));
- SiteAmp.Value fSite = siteAmp.calc(μPga, in.vs30);
- double μ = fSite.apply(table.get(p));
- double σ = Maths.srssWeighted(
- new double[] { σEpri, σPanel },
- SIGMA_WTS);
- return GroundMotions.createTree(μ, σ);
- }
- }
-
- static class Sammons_1 extends Sammons {
- static final int ID = 1;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_1(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_2 extends Sammons {
- static final int ID = 2;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_2(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_3 extends Sammons {
- static final int ID = 3;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_3(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_4 extends Sammons {
- static final int ID = 4;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_4(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_5 extends Sammons {
- static final int ID = 5;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_5(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_6 extends Sammons {
- static final int ID = 6;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_6(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_7 extends Sammons {
- static final int ID = 7;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_7(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_8 extends Sammons {
- static final int ID = 8;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_8(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_9 extends Sammons {
- static final int ID = 9;
- static final String NAME = Sammons.NAME0 + ID;
-
- Sammons_9(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_10 extends Sammons {
- static final int ID = 10;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_10(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_11 extends Sammons {
- static final int ID = 11;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_11(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_12 extends Sammons {
- static final int ID = 12;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_12(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_13 extends Sammons {
- static final int ID = 13;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_13(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_14 extends Sammons {
- static final int ID = 14;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_14(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_15 extends Sammons {
- static final int ID = 15;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_15(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_16 extends Sammons {
- static final int ID = 16;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_16(Imt imt) {
- super(ID, imt);
- }
- }
-
- static class Sammons_17 extends Sammons {
- static final int ID = 17;
- static final String NAME = Sammons.NAME + ID;
-
- Sammons_17(Imt imt) {
- super(ID, imt);
- }
- }
-
static abstract class Seed extends NgaEastUsgs_2017 {
static final String NAME = NgaEastUsgs_2017.NAME + " : Seed : ";