Merge pull request #214 from pmpowers-usgs/deagg-summary-iml

changed exceedanceIml label
usgs · Apr 30, 2017 · d6ce0a5 · d6ce0a5
2 parents e8340f5 + 2a53bf0
commit d6ce0a5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/org/opensha2/calc/DeaggExport.java b/src/org/opensha2/calc/DeaggExport.java
@@ -12,6 +12,7 @@
 import org.opensha2.calc.DeaggContributor.SystemContributor;
 import org.opensha2.data.Data;
 import org.opensha2.eq.model.SourceType;
+import org.opensha2.gmm.Imt;
 import org.opensha2.internal.Parsing;
 import org.opensha2.internal.Parsing.Delimiter;
 import org.opensha2.util.Maths;
@@ -351,13 +352,17 @@ private static SummaryElements createSummaryElements(
     String mDiscr = String.format(DISCRETIZATION_FMT, b.mMin, b.mMax, b.Δm);
     String εDiscr = String.format(DISCRETIZATION_FMT, b.εMin, b.εMax, b.Δε);
 
+    /* custom imt formatting */
+    Imt imt = dc.imt;
+    String imlLabel = (imt.isSA() ? imt.period() + "s SA": imt.name()) + " ground motion";
+
     ImmutableList.Builder<SummaryElement> summaryElements = ImmutableList.builder();
     summaryElements.add(
 
         new SummaryElement("Deaggregation targets", true, ImmutableList.of(
             new SummaryItem("Return period", dc.returnPeriod, "yrs"),
             new SummaryItem("Exceedance rate", dc.rate, "yr⁻¹"),
-            new SummaryItem("Exceedance IML", exp(dc.iml), "g"))),
+            new SummaryItem(imlLabel, exp(dc.iml), dc.imt.units()))),
 
         new SummaryElement("Recovered targets", true, ImmutableList.of(
             new SummaryItem("Return period", recoveredReturnPeriod, "yrs"),