diff --git a/gradle.properties b/gradle.properties
index 44f176a76165c3a354195bbef78be8a62d43867a..5ba9822ae4ec03a0d92bd9bb9371016784e9439e 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.14
+nshmpLibVersion = 1.4.16
nshmpUtilsJavaVersion = 0.4.0
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/nshms.yml b/nshms.yml
index a0033acb631e407c89e0c6a605c61e082ee74567..4dd0bb6458d9fb01d5bc02355fef708719aa8020 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -49,7 +49,7 @@ nshms:
# CONUS 2018 NSHM
-
repo: nshm-conus
- tag: 5.2.1
+ tag: 5.2.2
year: 2018
deployment:
baseHref: /ws/nshmp/conus-2018/dynamic
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 5e0a32164ac32dfe6d7c219131e9d35ac363c056..d9c9eb6734faf5543934ca52c8fa2ce1a1e6cbcb 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-conus-2018"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
nshmModel.exec.shutdown();
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 61da07dd68cbc85af93e57328bd049d56d60ecf8..c89b0188926c38397ddef1a04197041b18db5bd9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -24,25 +24,25 @@
],
"ys": [
0.06599397975220576,
- 0.04951601624256741,
+ 0.0495160162425674,
0.036513738982136494,
0.026258583569526418,
- 0.018339162919634257,
- 0.012411914456006222,
+ 0.018339162919634246,
+ 0.012411914456006224,
0.008141006833289569,
0.005152225174879873,
- 0.003167899870405808,
- 0.0018917261792269341,
- 0.0011035470885633653,
- 6.179966567302163E-4,
+ 0.0031678998704058083,
+ 0.0018917261792269337,
+ 0.0011035470885633657,
+ 6.179966567302161E-4,
3.385611975149566E-4,
- 1.763058445320691E-4,
- 8.72617228563019E-5,
- 3.9826481132802925E-5,
+ 1.7630584453206911E-4,
+ 8.726172285630186E-5,
+ 3.982648113280291E-5,
1.6325079063764054E-5,
- 5.769066788130916E-6,
+ 5.769066788130917E-6,
1.7184900721224076E-6,
- 3.963193550050804E-7
+ 3.963193550050803E-7
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.09353115905390524,
+ 0.09353115905390529,
0.0703016736669049,
- 0.051239316163458525,
+ 0.05123931616345851,
0.036305811456412915,
- 0.024635985605014423,
+ 0.02463598560501443,
0.01621307835968738,
0.010249801865790505,
- 0.006212298795439011,
- 0.0036307543903602345,
- 0.002043138422374023,
- 0.0011103316932372833,
- 5.822894133817993E-4,
+ 0.0062122987954390104,
+ 0.003630754390360235,
+ 0.0020431384223740237,
+ 0.001110331693237283,
+ 5.822894133817992E-4,
2.9401954680419504E-4,
- 1.421467305260284E-4,
- 6.50748491474044E-5,
- 2.7625833026584586E-5,
- 1.0658990087928293E-5,
+ 1.4214673052602837E-4,
+ 6.507484914740442E-5,
+ 2.7625833026584582E-5,
+ 1.065899008792829E-5,
3.622386410973509E-6,
- 1.034200636028549E-6,
- 2.3647467423869644E-7
+ 1.0342006360285488E-6,
+ 2.3647467423869639E-7
]
},
"SA1P0": {
@@ -115,25 +115,25 @@
1.7119945007591924
],
"ys": [
- 0.03781690942134723,
- 0.025609987126957227,
+ 0.03781690942134724,
+ 0.02560998712695722,
0.016835178417561717,
- 0.010675317900339298,
- 0.0065279779807385,
- 0.0037666741939616057,
+ 0.0106753179003393,
+ 0.006527977980738499,
+ 0.0037666741939616066,
0.0020910571328798203,
0.00109235908996311,
5.458772566494525E-4,
- 2.6104985735441133E-4,
- 1.2062939801655838E-4,
- 5.411364755018728E-5,
- 2.3475389991093996E-5,
+ 2.610498573544113E-4,
+ 1.2062939801655834E-4,
+ 5.41136475501873E-5,
+ 2.347538999109399E-5,
9.699580588310414E-6,
3.7213621990011277E-6,
1.2984686317975073E-6,
- 3.882066000228316E-7,
+ 3.882066000228317E-7,
9.7850454717942E-8,
- 1.9460378434836078E-8,
+ 1.946037843483608E-8,
2.742272834535854E-9
]
},
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.009213207300948613,
- 0.006121721172229914,
- 0.003927784889616463,
- 0.0024158433781355333,
- 0.0014072769298912608,
+ 0.00921320730094861,
+ 0.006121721172229913,
+ 0.003927784889616462,
+ 0.0024158433781355324,
+ 0.0014072769298912615,
7.774423342976145E-4,
- 4.024693099758766E-4,
+ 4.024693099758765E-4,
1.9730634218575704E-4,
9.182408947706067E-5,
- 4.046584903685399E-5,
- 1.7037600174972742E-5,
+ 4.0465849036854006E-5,
+ 1.703760017497274E-5,
6.866482223986136E-6,
- 2.6160622771360315E-6,
- 9.542403834324573E-7,
+ 2.616062277136032E-6,
+ 9.542403834324575E-7,
3.118560745323649E-7,
- 9.181884057053904E-8,
- 2.2848239268149787E-8,
+ 9.181884057053902E-8,
+ 2.284823926814979E-8,
4.620311222721341E-9,
- 6.936412711209973E-10,
- 7.028579358099717E-11
+ 6.936412711209974E-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 c911888c9d1e6a6c949561cf5810c9f06a2e090b..009aceda005a3f7b20327294fc881b22752ecb52 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -24,25 +24,25 @@
],
"ys": [
0.040886254085173906,
- 0.027424345917626183,
- 0.018219034045095478,
- 0.011934422965670082,
- 0.007663011513102016,
- 0.004765114308889278,
- 0.002828231285308466,
- 0.0015783077414236477,
+ 0.027424345917626186,
+ 0.018219034045095474,
+ 0.011934422965670086,
+ 0.007663011513102012,
+ 0.004765114308889277,
+ 0.0028282312853084666,
+ 0.0015783077414236475,
8.390693640246431E-4,
- 4.3180049798480994E-4,
+ 4.318004979848099E-4,
2.214413110168021E-4,
1.1266780710891706E-4,
5.821356278132561E-5,
- 2.931622679832576E-5,
- 1.4233176969030012E-5,
- 6.407467702128436E-6,
- 2.5948292983347613E-6,
- 9.058302958854363E-7,
- 2.664550977482879E-7,
- 6.060200630189975E-8
+ 2.9316226798325768E-5,
+ 1.4233176969030009E-5,
+ 6.4074677021284365E-6,
+ 2.5948292983347617E-6,
+ 9.058302958854361E-7,
+ 2.664550977482878E-7,
+ 6.060200630189976E-8
]
},
"SA0P2": {
@@ -69,25 +69,25 @@
1.998773638612381
],
"ys": [
- 0.06915547672860359,
- 0.04697296493489196,
+ 0.06915547672860357,
+ 0.046972964934891955,
0.030953931061635506,
- 0.020002703636453692,
- 0.012514413169193665,
+ 0.020002703636453695,
+ 0.012514413169193666,
0.007683322438550792,
- 0.004524345762442763,
+ 0.004524345762442764,
0.002509560963076411,
- 0.0013038143445699914,
- 6.313143767624348E-4,
- 2.889831873797796E-4,
- 1.2787451423137354E-4,
- 5.600901093144432E-5,
- 2.4448517395010347E-5,
+ 0.001303814344569991,
+ 6.31314376762435E-4,
+ 2.8898318737977964E-4,
+ 1.2787451423137356E-4,
+ 5.600901093144431E-5,
+ 2.444851739501035E-5,
1.0472190893854825E-5,
- 4.248516889956777E-6,
+ 4.248516889956776E-6,
1.58075707954425E-6,
5.190573795746768E-7,
- 1.4267651060313717E-7,
+ 1.426765106031372E-7,
3.1124228394497636E-8
]
},
@@ -116,25 +116,25 @@
],
"ys": [
0.033248933109024846,
- 0.02200443110588484,
- 0.014310147752740473,
+ 0.022004431105884844,
+ 0.01431014775274047,
0.009151239631673426,
- 0.005779616772275175,
- 0.003514032607715889,
- 0.0020552936759178292,
+ 0.005779616772275172,
+ 0.00351403260771589,
+ 0.0020552936759178297,
0.0011024828423755126,
- 5.332796764095533E-4,
- 2.2502078443087172E-4,
- 8.132456018629311E-5,
- 2.4983602810937422E-5,
- 6.682951495042382E-6,
- 1.7449632407250264E-6,
- 4.909788509372824E-7,
+ 5.332796764095535E-4,
+ 2.2502078443087164E-4,
+ 8.132456018629307E-5,
+ 2.4983602810937415E-5,
+ 6.682951495042383E-6,
+ 1.7449632407250266E-6,
+ 4.909788509372823E-7,
1.5684348441413014E-7,
- 4.415991214768775E-8,
- 1.0492474877263185E-8,
- 1.9576567710691036E-9,
- 2.580214644700487E-10
+ 4.4159912147687756E-8,
+ 1.0492474877263184E-8,
+ 1.957656771069103E-9,
+ 2.5802146447004877E-10
]
},
"SA5P0": {
@@ -161,25 +161,25 @@
0.7929925155296614
],
"ys": [
- 0.010005966930455423,
+ 0.010005966930455426,
0.007020138549279935,
0.004946069582032203,
- 0.003483151215561255,
- 0.0023991290974655828,
- 0.0015793614229230991,
- 9.569588656999188E-4,
- 5.209847415833337E-4,
+ 0.0034831512155612545,
+ 0.002399129097465582,
+ 0.0015793614229230985,
+ 9.569588656999186E-4,
+ 5.209847415833339E-4,
2.4735052236108E-4,
9.904665205541754E-5,
- 3.277868452186689E-5,
- 8.712990693707899E-6,
+ 3.277868452186687E-5,
+ 8.712990693707894E-6,
1.790453986052243E-6,
- 3.053453022508046E-7,
+ 3.0534530225080447E-7,
4.5864222733130684E-8,
- 9.67071147027627E-9,
+ 9.670711470276267E-9,
2.3562950445765526E-9,
4.914029457128014E-10,
- 7.99798410640728E-11,
+ 7.997984106407279E-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 99bd8e8fb0f01bcb3469a52aa9da9a00c3cc02d4..a4a1ee9293f0e1fabad83d54d493e742aa9d1f0c 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
@@ -23,22 +23,22 @@
1.6428726885203377
],
"ys": [
- 0.9060050847592981,
- 0.7175752781536691,
- 0.5558555506966582,
- 0.42078460768848186,
- 0.31075933496399283,
- 0.22259208943416386,
- 0.15336119255340921,
- 0.10025626794045822,
- 0.0620233986634114,
- 0.03600102576167425,
- 0.019590569749519476,
- 0.009779698336973813,
- 0.004621183161915629,
- 0.0020103826897193175,
- 7.962597777072059E-4,
- 2.687947423527658E-4,
+ 0.9024014286415121,
+ 0.7152812115910017,
+ 0.5546053703562474,
+ 0.4202062611924988,
+ 0.31052775644621844,
+ 0.22250842652867092,
+ 0.15333292793832914,
+ 0.1002475619887438,
+ 0.062021164229324854,
+ 0.03600061579107137,
+ 0.019590522804469185,
+ 0.009779695748976101,
+ 0.004621183104687814,
+ 0.002010382689719318,
+ 7.962597777072058E-4,
+ 2.6879474235276584E-4,
7.171139765481873E-5,
1.3578410116556566E-5,
1.5629304265358868E-6,
@@ -69,23 +69,23 @@
1.998773638612381
],
"ys": [
- 1.0704911249635107,
- 0.8749088267603049,
- 0.6955542515773959,
- 0.5416958681657765,
- 0.4104584089252401,
- 0.30531106839534905,
- 0.22031724779258055,
- 0.1527501072974481,
- 0.10121660039467142,
- 0.06347142603560565,
- 0.03749794864850485,
- 0.020783089957195106,
- 0.010808160040269188,
- 0.0052941181283052766,
+ 1.0660888228644068,
+ 0.8716730067978099,
+ 0.6934801717332749,
+ 0.5405326220075642,
+ 0.40990321960704657,
+ 0.30507938231502557,
+ 0.2202337918399829,
+ 0.1527245757695499,
+ 0.10121006109591386,
+ 0.06346997910945823,
+ 0.03749768324889921,
+ 0.020783058026570825,
+ 0.010808157958241638,
+ 0.005294118065393745,
0.0024377564292367812,
- 0.0010302190494455154,
- 3.8564882358079914E-4,
+ 0.0010302190494455156,
+ 3.8564882358079925E-4,
1.2133563966813449E-4,
2.959166719348735E-5,
5.041371572081886E-6
@@ -115,21 +115,21 @@
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,
+ 0.784110167732982,
+ 0.5971127127912483,
+ 0.44000489121477754,
+ 0.3131829193807278,
+ 0.21562526351716427,
+ 0.141239285165485,
+ 0.08930378590735805,
+ 0.05355145134039893,
+ 0.03079990379511722,
+ 0.016912072022014606,
+ 0.008870177641666898,
+ 0.004442400317639017,
+ 0.002116697170663203,
+ 9.438416520552268E-4,
+ 3.819154343536784E-4,
1.3550505201544378E-4,
3.8845344810999264E-5,
8.454437599000299E-6,
@@ -161,19 +161,19 @@
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,
+ 0.2541901671759064,
+ 0.18598536864775972,
+ 0.13150834380027404,
+ 0.08935335465026673,
+ 0.05804675588087531,
+ 0.03637970502839559,
+ 0.021904398834717693,
+ 0.012704001192508222,
+ 0.0069832944154086165,
+ 0.003542111298937448,
+ 0.0016310730650602543,
+ 6.735425535872206E-4,
+ 2.4513236903154904E-4,
8.03508366264512E-5,
2.2497141682863387E-5,
5.4211128874109765E-6,
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 e13e5b9db18b7663db747ebefe15ac8dac120c47..d560348ec0dfeb4ce663f1caea056173cf8c3f97 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,25 +23,25 @@
1.6428726885203377
],
"ys": [
- 0.20082676064116875,
- 0.1730315848271916,
- 0.14594179639708077,
+ 0.20082676064116867,
+ 0.17303158482719158,
+ 0.14594179639708083,
0.11988197257474567,
- 0.0957725674466078,
- 0.07448415764500857,
- 0.0565353501488301,
+ 0.09577256744660781,
+ 0.07448415764500858,
+ 0.05653535014883011,
0.041839648477448414,
0.0303591809822878,
- 0.02160353698325165,
- 0.015147902209371058,
- 0.010380513858986458,
- 0.007086868639928328,
- 0.004776405847494423,
- 0.0031940336643494693,
+ 0.021603536983251646,
+ 0.015147902209371051,
+ 0.010380513858986464,
+ 0.007086868639928331,
+ 0.004776405847494422,
+ 0.00319403366434947,
0.0020630322786084473,
- 0.0012314821193950328,
- 6.362959860235962E-4,
- 2.7133142360006787E-4,
+ 0.0012314821193950326,
+ 6.362959860235963E-4,
+ 2.713314236000678E-4,
8.845979888500938E-5
]
},
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.2323567297712059,
- 0.20103085787724267,
- 0.1694959474941661,
- 0.13897123143573237,
+ 0.23235672977120586,
+ 0.20103085787724273,
+ 0.16949594749416605,
+ 0.1389712314357323,
0.10971503991301251,
- 0.08417324450282233,
+ 0.08417324450282236,
0.06257442666659785,
- 0.045144369921103045,
+ 0.04514436992110307,
0.03178577283279019,
- 0.021843269000236757,
- 0.014712774190862496,
- 0.00977524830387308,
- 0.006484422014715585,
+ 0.021843269000236736,
+ 0.014712774190862494,
+ 0.009775248303873083,
+ 0.006484422014715584,
0.004352494841555026,
- 0.002960985572647082,
- 0.0019882654343830195,
+ 0.0029609855726470814,
+ 0.001988265434383021,
0.0012502056040323954,
- 6.867898974882981E-4,
- 3.083803186948358E-4,
- 1.0832182802102839E-4
+ 6.867898974882983E-4,
+ 3.08380318694836E-4,
+ 1.0832182802102842E-4
]
},
"SA1P0": {
@@ -115,24 +115,24 @@
1.7119945007591924
],
"ys": [
- 0.11534974599388693,
- 0.08698148362667112,
- 0.0640629227616722,
- 0.04607819240511596,
+ 0.11534974599388695,
+ 0.08698148362667116,
+ 0.06406292276167219,
+ 0.046078192405115945,
0.03253637462327355,
- 0.022366693877149554,
- 0.015293415446741959,
- 0.010356860424666317,
- 0.007106470813094831,
- 0.00500706584678398,
- 0.0036674141315344282,
- 0.0027708487867755165,
- 0.002086773137749996,
+ 0.02236669387714956,
+ 0.015293415446741954,
+ 0.010356860424666315,
+ 0.007106470813094833,
+ 0.005007065846783978,
+ 0.003667414131534428,
+ 0.002770848786775516,
+ 0.002086773137749997,
0.0014878216919477938,
- 9.535157338758259E-4,
- 5.30892978375666E-4,
+ 9.535157338758262E-4,
+ 5.308929783756662E-4,
2.463295318863031E-4,
- 9.459966953144537E-5,
+ 9.459966953144536E-5,
2.8905529125483268E-5,
6.721429379688254E-6
]
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.026538247127206115,
- 0.019066553270647914,
+ 0.02653824712720612,
+ 0.019066553270647907,
0.013626789983486497,
0.00976641241039197,
0.00706601708351237,
- 0.005239513882617428,
- 0.004007441363707504,
+ 0.00523951388261743,
+ 0.004007441363707505,
0.003191472930812208,
- 0.0026180228562578223,
- 0.002144323130572638,
- 0.001687400666701808,
- 0.001232553642822115,
- 8.112607839937965E-4,
- 4.762084654635111E-4,
+ 0.0026180228562578227,
+ 0.0021443231305726374,
+ 0.0016874006667018072,
+ 0.0012325536428221151,
+ 8.112607839937964E-4,
+ 4.762084654635112E-4,
2.3778952000443157E-4,
- 1.0104841608143451E-4,
- 3.506862368489196E-5,
- 9.656025948555977E-6,
- 1.971220245968161E-6,
- 2.798557895371195E-7
+ 1.0104841608143454E-4,
+ 3.5068623684891964E-5,
+ 9.656025948555976E-6,
+ 1.971220245968162E-6,
+ 2.798557895371194E-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 645f68c1a373857c0508345a4766f6f2fa618010..652a2f4f307158bdfb82c9a0cf037570d97c9011 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,25 +24,25 @@
],
"ys": [
0.06295212478082786,
- 0.04804845815748258,
- 0.036191610823481504,
- 0.026715275130513888,
- 0.01926073686033505,
+ 0.048048458157482585,
+ 0.03619161082348148,
+ 0.0267152751305139,
+ 0.019260736860335054,
0.013535182229688403,
- 0.00926234212576043,
+ 0.009262342125760426,
0.006136637176633699,
- 0.003951706514772566,
- 0.0024672025970475936,
+ 0.003951706514772565,
+ 0.0024672025970475927,
0.001499024950979399,
8.710019776437942E-4,
- 4.921002498934158E-4,
- 2.628392916459283E-4,
- 1.3262871270711604E-4,
+ 4.921002498934159E-4,
+ 2.6283929164592823E-4,
+ 1.326287127071161E-4,
6.14117930372459E-5,
- 2.5443650259819518E-5,
- 9.06649630578154E-6,
+ 2.544365025981951E-5,
+ 9.066496305781538E-6,
2.719577797059732E-6,
- 6.313004310982963E-7
+ 6.313004310982962E-7
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.08776972431938841,
- 0.06659157694814943,
+ 0.0877697243193884,
+ 0.06659157694814948,
0.04922579949927613,
- 0.035528614794925424,
- 0.024688518599665053,
- 0.016720836145648118,
- 0.010940274062286884,
- 0.006899372453907444,
- 0.004211132882578024,
- 0.0024795228150876554,
- 0.001409241543382924,
- 7.711400309583E-4,
- 4.047444862395125E-4,
- 2.023851603822429E-4,
- 9.527876089291167E-5,
+ 0.03552861479492543,
+ 0.024688518599665064,
+ 0.01672083614564811,
+ 0.010940274062286886,
+ 0.006899372453907445,
+ 0.004211132882578026,
+ 0.0024795228150876546,
+ 0.0014092415433829243,
+ 7.711400309583004E-4,
+ 4.047444862395124E-4,
+ 2.0238516038224294E-4,
+ 9.527876089291164E-5,
4.1346212984332834E-5,
- 1.6214324144157016E-5,
- 5.575162343216448E-6,
- 1.605033602957798E-6,
- 3.6913561822247884E-7
+ 1.6214324144157022E-5,
+ 5.575162343216449E-6,
+ 1.6050336029577986E-6,
+ 3.691356182224788E-7
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591924
],
"ys": [
- 0.038262468062309395,
+ 0.03826246806230938,
0.02603046344860471,
- 0.0171554008552419,
- 0.010885390093212636,
- 0.006660097241570286,
- 0.0038580884951301183,
- 0.0021663261007892464,
- 0.0011583421935267536,
- 6.009032500164475E-4,
- 3.0233926709153134E-4,
+ 0.017155400855241892,
+ 0.010885390093212639,
+ 0.006660097241570287,
+ 0.003858088495130119,
+ 0.002166326100789246,
+ 0.0011583421935267531,
+ 6.009032500164472E-4,
+ 3.0233926709153145E-4,
1.481758729078501E-4,
- 7.05010480857786E-5,
- 3.218992880314698E-5,
- 1.3832096806263695E-5,
- 5.4595298421187765E-6,
- 1.9428392150340858E-6,
+ 7.050104808577863E-5,
+ 3.2189928803146996E-5,
+ 1.383209680626369E-5,
+ 5.459529842118774E-6,
+ 1.942839215034085E-6,
5.888734403531785E-7,
1.497447089129761E-7,
2.995182697021266E-8,
- 4.239346142112846E-9
+ 4.2393461421128455E-9
]
},
"SA5P0": {
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.00960019949898116,
- 0.0063205981405685535,
+ 0.009600199498981164,
+ 0.006320598140568553,
0.003998495592416973,
- 0.0024209681163326075,
- 0.0013922805998762867,
- 7.653511087722588E-4,
- 3.991002814434198E-4,
- 2.0013103147428784E-4,
- 9.684010210476125E-5,
- 4.501923579779383E-5,
- 2.0158227838894865E-5,
+ 0.0024209681163326084,
+ 0.001392280599876287,
+ 7.653511087722585E-4,
+ 3.991002814434199E-4,
+ 2.0013103147428787E-4,
+ 9.684010210476127E-5,
+ 4.501923579779381E-5,
+ 2.0158227838894868E-5,
8.64004496540036E-6,
3.4752442404719263E-6,
1.3213285385796123E-6,
4.448966364141143E-7,
- 1.3385272064306838E-7,
+ 1.338527206430684E-7,
3.383715559062799E-8,
- 6.9217291724856125E-9,
- 1.0496384684360479E-9,
- 1.0719894546654213E-10
+ 6.921729172485612E-9,
+ 1.0496384684360477E-9,
+ 1.071989454665421E-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 0d26f67397ce1ad5b09d2688217404dcd1d59e76..306029e2badc58bf030612e1938c0b9217ebff65 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.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
+ 0.5758963591396192,
+ 0.43670801070473725,
+ 0.3240168617746965,
+ 0.23415179633332647,
+ 0.16457670202113264,
+ 0.11233601961898793,
+ 0.07425068674098803,
+ 0.047028698362003726,
+ 0.028531598635389184,
+ 0.016477953524790336,
+ 0.009071377180117614,
+ 0.0046111976462253675,
+ 0.002153196360499234,
+ 8.583917263340775E-4,
+ 2.829609950190527E-4,
+ 7.206823692384048E-5,
+ 1.3101124477648389E-5,
+ 1.504931810870186E-6,
+ 9.244920976047788E-8,
+ 1.7576389971140777E-10
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.702104775280691,
+ 0.5477985858587733,
+ 0.41716835550529163,
+ 0.31153345142843625,
+ 0.22583847101507867,
+ 0.1607373099038445,
+ 0.11121095346437515,
+ 0.07432781208642227,
+ 0.04791702940189752,
+ 0.029582710732423727,
+ 0.01745189556422591,
+ 0.009797183664117526,
+ 0.0051856467450227,
+ 0.0025285995398624,
+ 0.001094392596047108,
+ 4.013954784182032E-4,
+ 1.2009475138515132E-4,
+ 2.7568603956290765E-5,
+ 4.349211800032327E-6,
+ 4.049796750543507E-7
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591924
],
"ys": [
- 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
+ 0.5037815068164847,
+ 0.36232769044544194,
+ 0.2502317877044603,
+ 0.16527564110221518,
+ 0.10491376344791659,
+ 0.06328235572250315,
+ 0.03729241696615875,
+ 0.021216923098733832,
+ 0.011860650539141315,
+ 0.006469521752897596,
+ 0.0033978185298613704,
+ 0.0016693252761849414,
+ 7.37847177944601E-4,
+ 2.815028806357047E-4,
+ 8.855042818298073E-5,
+ 2.169395730571108E-5,
+ 3.54265809194102E-6,
+ 3.0728007273696624E-7,
+ 5.0866458201725544E-9,
+ 1.93222203900609E-12
]
},
"SA5P0": {
@@ -161,24 +161,24 @@
0.7929925155296614
],
"ys": [
- 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.13233288451521713,
+ 0.08977540213967225,
+ 0.05882358655458601,
+ 0.03724983826410473,
+ 0.0227163228543992,
+ 0.013440022854711936,
+ 0.007633639812747502,
+ 0.004152790339150027,
+ 0.00212045052364047,
+ 9.844000224349687E-4,
+ 4.046507020147577E-4,
+ 1.4240223337367506E-4,
+ 4.077384817524468E-5,
+ 9.34644799588954E-6,
+ 1.4024619752347574E-6,
+ 1.2316882994106377E-7,
+ 4.464442556419103E-9,
+ 5.182326631898767E-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 bdc152def3052881781325215e3afd2682f12c78..4ae8a49ebe96bede5181953abaa0c275c9577785 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.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
+ 0.17804932760568043,
+ 0.13481129138484363,
+ 0.09912001157718145,
+ 0.0707041991473213,
+ 0.04910272275447791,
+ 0.03327821957072737,
+ 0.022001417177528085,
+ 0.014130093536055805,
+ 0.00895648847606198,
+ 0.005713988835711515,
+ 0.0037554311356734474,
+ 0.002495579266978758,
+ 0.0016173329462348075,
+ 9.260672181584312E-4,
+ 4.377752886751453E-4,
+ 1.5963736753540306E-4,
+ 4.264990056231934E-5,
+ 7.423896387068807E-6,
+ 7.201121825554799E-7,
+ 2.2667892662628333E-8
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.2273056192373788,
+ 0.17877826308879446,
+ 0.1356678153764279,
+ 0.09986757362886715,
+ 0.07079981073537762,
+ 0.04921088287252879,
+ 0.033380947918689514,
+ 0.022067083018556838,
+ 0.014301066499500267,
+ 0.009157027514487454,
+ 0.005912474193919543,
+ 0.003912510945659108,
+ 0.0026398288339377217,
+ 0.0017407724252953987,
+ 0.0010466432208707053,
+ 5.346080756978021E-4,
+ 2.2129469521516696E-4,
+ 7.139049766403652E-5,
+ 1.662103819762455E-5,
+ 2.3872257929322637E-6
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591924
],
"ys": [
- 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
+ 0.1457749149192624,
+ 0.1051942632106557,
+ 0.07377523675929343,
+ 0.050359195314580635,
+ 0.033670519261203014,
+ 0.021793231508606188,
+ 0.013952704422754418,
+ 0.008781093265310977,
+ 0.00558915486660228,
+ 0.0036428412051353887,
+ 0.0024237761778375545,
+ 0.0015895088289442656,
+ 9.714202171149326E-4,
+ 5.226859798546034E-4,
+ 2.3642848274539277E-4,
+ 8.722037276861857E-5,
+ 2.4290153114547387E-5,
+ 4.6367018958989855E-6,
+ 4.4454758065228954E-7,
+ 1.3361540606233621E-8
]
},
"SA5P0": {
@@ -161,25 +161,25 @@
0.7929925155296614
],
"ys": [
- 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.0460271728313632,
+ 0.03337299070321494,
+ 0.02364984596929688,
+ 0.016305036812306675,
+ 0.010882423497124953,
+ 0.007102419653614212,
+ 0.004548495316836788,
+ 0.0028991581969824497,
+ 0.0018255578782369417,
+ 0.0011015485296465535,
+ 6.133452925118181E-4,
+ 3.027744347865482E-4,
+ 1.2752100687508648E-4,
+ 4.5784693825692186E-5,
+ 1.283966202898652E-5,
+ 2.8156379169367597E-6,
+ 4.378979386447339E-7,
+ 3.7800483363232443E-8,
+ 9.625180707007092E-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 67c285248f90c1869278cec4fed62ad86e8c47c7..2dedc649ddd0b4f49e80ea53c78d52aa4be82117 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
@@ -23,26 +23,26 @@
1.6428726885203377
],
"ys": [
- 0.9414810535304671,
- 0.7408139550713904,
- 0.5636943361968325,
- 0.41426552866931143,
- 0.2953033077217156,
- 0.20553134899726505,
- 0.14053637018176046,
- 0.09407347568516078,
- 0.0615250729989172,
- 0.03870406669911486,
- 0.02306213495313035,
- 0.012420643569475764,
- 0.00594417702025036,
- 0.0023438054706417,
+ 0.9383481323320757,
+ 0.7390523768482087,
+ 0.5627964770568757,
+ 0.41384460537666956,
+ 0.2951183765291972,
+ 0.20545628554322426,
+ 0.14050972162930606,
+ 0.09406594261791489,
+ 0.061523508139426766,
+ 0.038703853535948095,
+ 0.02306211765405425,
+ 0.012420642934022442,
+ 0.005944177013425149,
+ 0.0023438054706417005,
7.320751296367926E-4,
1.661797539916622E-4,
- 2.3733810312619126E-5,
- 1.363751935901511E-6,
- 1.1752390713919063E-8,
- 2.588602412382955E-11
+ 2.3733810312619122E-5,
+ 1.3637519359015107E-6,
+ 1.175239071391906E-8,
+ 2.588602412382956E-11
]
},
"SA0P2": {
@@ -69,24 +69,24 @@
1.998773638612381
],
"ys": [
- 1.109513010115341,
- 0.9074836796534743,
- 0.7163173946179702,
- 0.5478080266286055,
- 0.4030794739346962,
- 0.2900437497773374,
- 0.20377843046247973,
- 0.14019609095348026,
- 0.09489458579824983,
- 0.06276169954459061,
- 0.04015343702197098,
- 0.024367531915021563,
- 0.013637174500766009,
- 0.006794975303810369,
- 0.0029006200492462564,
- 0.0010127375521486687,
+ 1.105186444264793,
+ 0.9047245484304951,
+ 0.714744025341657,
+ 0.546997755822552,
+ 0.40271063499401516,
+ 0.28989177892584883,
+ 0.2037239893877545,
+ 0.14017957748814378,
+ 0.0948903653141086,
+ 0.06276086748518236,
+ 0.04015332394666482,
+ 0.024367522547533004,
+ 0.013637174084145737,
+ 0.006794975297013088,
+ 0.002900620049246257,
+ 0.0010127375521486685,
2.766551097246086E-4,
- 5.473721307536003E-5,
+ 5.473721307536004E-5,
6.2062973056638875E-6,
2.2239402021916294E-7
]
@@ -115,26 +115,26 @@
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,
+ 0.7380978654700251,
+ 0.5446829559803509,
+ 0.3882780266315755,
+ 0.26859834279854655,
+ 0.18205883783417204,
+ 0.11978775591182694,
+ 0.07793051728607309,
+ 0.049250429318840334,
+ 0.030369267986667357,
+ 0.01800626428691472,
+ 0.010097153845010632,
+ 0.005212659562294559,
+ 0.002389185797053447,
+ 9.327503871755168E-4,
2.9569280246056746E-4,
7.19503902368207E-5,
1.056522123963837E-5,
5.827805191672568E-7,
4.900618906359252E-9,
- 4.275203391051003E-11
+ 4.2752033910510036E-11
]
},
"SA5P0": {
@@ -161,19 +161,19 @@
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,
+ 0.19975804852619505,
+ 0.14538909788131346,
+ 0.10400307640456691,
+ 0.07260105916563274,
+ 0.04897274401246109,
+ 0.03201273179114714,
+ 0.020216517311188346,
+ 0.012503128127985501,
+ 0.007563700057139103,
+ 0.004367402236019257,
+ 0.0023268176863251258,
+ 0.0010965177651704634,
+ 4.348524528212359E-4,
1.4274115123127657E-4,
3.477749217799798E-5,
5.745950716089173E-6,
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 dda744256f709b5e2cc2c4d4ac3f2e9fefc16481..c00b67b1ac9f99ed741045fd80ec3bc7f63dc39d 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -23,23 +23,23 @@
1.6428726885203377
],
"ys": [
- 0.30015403836168786,
- 0.2599680401353482,
- 0.2185297304438204,
- 0.17722215931380336,
- 0.13814440560161714,
- 0.10320898786594203,
- 0.07371091265962149,
- 0.04992587759958903,
- 0.03209646622744765,
- 0.019483440112317264,
- 0.011169175072030647,
- 0.005886010861535864,
- 0.0028760017939065893,
- 0.001238250623016173,
+ 0.3001540383616879,
+ 0.25996804013534813,
+ 0.21852973044382043,
+ 0.17722215931380342,
+ 0.13814440560161717,
+ 0.10320898786594213,
+ 0.07371091265962146,
+ 0.049925877599589025,
+ 0.032096466227447676,
+ 0.01948344011231727,
+ 0.011169175072030642,
+ 0.00588601086153586,
+ 0.00287600179390659,
+ 0.0012382506230161731,
4.616461295239516E-4,
1.4192899171483836E-4,
- 3.4750168831031875E-5,
+ 3.475016883103188E-5,
6.464774248247943E-6,
9.534150265565325E-7,
9.671006675588189E-8
@@ -69,23 +69,23 @@
1.998773638612381
],
"ys": [
- 0.3316228562852521,
+ 0.331622856285252,
0.29560208196419013,
- 0.25653382052184187,
- 0.21643446693258594,
- 0.17580145371321249,
- 0.13812635242096122,
- 0.10415840860866447,
+ 0.2565338205218416,
+ 0.21643446693258578,
+ 0.1758014537132124,
+ 0.1381263524209612,
+ 0.10415840860866449,
0.07501061312549723,
- 0.05158880947038996,
+ 0.05158880947038995,
0.033733596742758915,
0.02094857877622853,
- 0.01230118239253893,
+ 0.012301182392538933,
0.006783792966915221,
- 0.0034731591416989173,
- 0.0016209320643428172,
+ 0.003473159141698918,
+ 0.0016209320643428167,
6.710682260221141E-4,
- 2.4202921331541668E-4,
+ 2.420292133154167E-4,
7.461578679920015E-5,
1.9117270857662606E-5,
4.100982884701552E-6
@@ -116,24 +116,24 @@
],
"ys": [
0.2723316271520372,
- 0.22535953598922662,
- 0.1799621311652722,
- 0.13836979363296367,
- 0.10269140077244304,
- 0.07282824746890096,
+ 0.22535953598922656,
+ 0.17996213116527232,
+ 0.13836979363296364,
+ 0.1026914007724431,
+ 0.07282824746890089,
0.05011926989783884,
0.03305816912308876,
- 0.021084933210515206,
- 0.01292143021681515,
- 0.007558665107152612,
- 0.004159232162704311,
+ 0.021084933210515196,
+ 0.012921430216815149,
+ 0.007558665107152614,
+ 0.00415923216270431,
0.0021064460405320427,
9.557962065453292E-4,
- 3.7679313231394436E-4,
+ 3.767931323139444E-4,
1.2566261899114284E-4,
3.2681242754494004E-5,
6.181223929813809E-6,
- 6.711347732593156E-7,
+ 6.711347732593155E-7,
2.2378453810730706E-8
]
},
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.10100761994357671,
+ 0.10100761994357677,
0.07526360103957089,
0.054587314877085076,
- 0.03847947914813512,
+ 0.03847947914813511,
0.02623530957353106,
- 0.017385984037019915,
- 0.01115822621837147,
+ 0.017385984037019908,
+ 0.011158226218371469,
0.00701344195213696,
- 0.004318069667920411,
- 0.0025661941306192957,
- 0.001439929809553528,
- 7.370477823341764E-4,
- 3.297973882412486E-4,
- 1.2773213803038677E-4,
- 3.944712014093108E-5,
- 9.544443903761028E-6,
- 1.5457202459085525E-6,
+ 0.004318069667920408,
+ 0.0025661941306192966,
+ 0.001439929809553527,
+ 7.370477823341765E-4,
+ 3.297973882412485E-4,
+ 1.2773213803038674E-4,
+ 3.9447120140931075E-5,
+ 9.544443903761026E-6,
+ 1.5457202459085527E-6,
1.1327374185809158E-7,
- 2.9729067075443623E-10,
- 4.389238001777538E-12
+ 2.972906707544361E-10,
+ 4.389238001777539E-12
]
}
}