Skip to content
Snippets Groups Projects
Commit 3dcc1727 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

disagg epsilon output options from config

parent e0af6e30
No related branches found
No related tags found
2 merge requests!593Production Release | nshm-haz,!586Get DisaggEpsilon output options from config
...@@ -2,6 +2,8 @@ package gov.usgs.earthquake.nshmp; ...@@ -2,6 +2,8 @@ package gov.usgs.earthquake.nshmp;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static gov.usgs.earthquake.nshmp.Text.NEWLINE; import static gov.usgs.earthquake.nshmp.Text.NEWLINE;
import static gov.usgs.earthquake.nshmp.calc.DataType.GMM;
import static gov.usgs.earthquake.nshmp.calc.DataType.SOURCE;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
...@@ -251,10 +253,13 @@ public class DisaggEpsilon { ...@@ -251,10 +253,13 @@ public class DisaggEpsilon {
Site site = sites.get(i); Site site = sites.get(i);
Map<Imt, Double> spectrum = rtrSpectra.get(i); Map<Imt, Double> spectrum = rtrSpectra.get(i);
// use IMLs from site spectra // task: use IMLs from site spectra
Hazard hazard = HazardCalcs.hazard(model, config, site, exec); Hazard hazard = HazardCalcs.hazard(model, config, site, exec);
Disaggregation disagg = Disaggregation.atImls(hazard, spectrum, exec); Disaggregation disagg = Disaggregation.atImls(hazard, spectrum, exec);
boolean gmmsOut = config.output.dataTypes.contains(GMM);
boolean typesOut = config.output.dataTypes.contains(SOURCE);
List<Response> responses = new ArrayList<>(spectrum.size()); List<Response> responses = new ArrayList<>(spectrum.size());
for (Imt imt : spectrum.keySet()) { for (Imt imt : spectrum.keySet()) {
ResponseData imtMetadata = new ResponseData( ResponseData imtMetadata = new ResponseData(
...@@ -264,7 +269,7 @@ public class DisaggEpsilon { ...@@ -264,7 +269,7 @@ public class DisaggEpsilon {
spectrum.get(imt)); spectrum.get(imt));
Response response = new Response( Response response = new Response(
imtMetadata, imtMetadata,
disagg.toJson(imt, false, true, true, false)); disagg.toJson(imt, false, gmmsOut, typesOut, false));
responses.add(response); responses.add(response);
} }
Result result = new Result(responses); Result result = new Result(responses);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment