plots, Boolean showLegend) {
* as { log10(centerFrequency), log10(amplitiude), Symbol }
*
* @param showLegend
- * @param referenceSpectra
+ * @param spectra
*
- * A source spectra containing the amp/freq/mw information for a
- * reference event used in the calibration
- *
- * @param theoreticalSpectra
- *
- * A source spectra containing the amp/freq/mw information for a
- * theoretical best fit spectra
+ * Spectra containing the amp/freq/mw information for a
+ * calibration spectra
*
*/
- public void plotXYdata(final List plots, Boolean showLegend, Spectra... spectra) {
+ public void plotXYdata(final List plots, Boolean showLegend, List spectra) {
symbolMap.clear();
// line based legends for trending
@@ -178,8 +174,11 @@ public void plotXYdata(final List plots, Boolean showLegend, Spectra.
legend.addLabeledLine(AVG_MW_LEGEND_LABEL, line);
}
- for (int j = 0; j < spectra.length; j++) {
- plotSpectraObject(jsubplot, spectra[j], legend);
+ if (spectra != null) {
+ spectra.sort((s1, s2) -> (s1.getType() == SPECTRA_TYPES.UQ1 || s1.getType() == SPECTRA_TYPES.UQ2) ? -1 : 1);
+ for (Spectra spec : spectra) {
+ plotSpectraObject(jsubplot, spec, legend);
+ }
}
plotXYdata(plots);
@@ -204,22 +203,34 @@ private void plotSpectraObject(JSubplot jsubplot, Spectra spectra, Legend legend
y[i] = point.getY().floatValue();
}
- Line line;
+ Line line = null;
switch (spectra.getType()) {
case REF:
line = new Line(x, y, Color.BLACK, PaintMode.COPY, PenStyle.DASH, 2);
break;
- default:
+ case UQ1:
+ line = new Line(x, y, Color.LIGHT_GRAY, PaintMode.COPY, PenStyle.DASH, 2);
+ break;
+ case UQ2:
+ line = new Line(x, y, Color.LIGHT_GRAY, PaintMode.COPY, PenStyle.DOT, 2);
+ break;
+ case FIT:
line = new Line(x, y, Color.RED, PaintMode.COPY, PenStyle.DASH, 2);
break;
+ default:
+ break;
}
- jsubplot.AddPlotObject(line);
- DecimalFormat df = new DecimalFormat("#.0#");
- if (spectra.getApparentStress() > 0.0) {
- DecimalFormat df2 = new DecimalFormat("#0.0#");
- legend.addLabeledLine(spectra.getType().name() + ' ' + df.format(spectra.getMw()) + " @ " + df2.format(spectra.getApparentStress()) + "MPa", line);
- } else {
- legend.addLabeledLine(spectra.getType().name() + ' ' + df.format(spectra.getMw()), line);
+ if (line != null) {
+ jsubplot.AddPlotObject(line);
+ if (SPECTRA_TYPES.UQ1 != spectra.getType() && SPECTRA_TYPES.UQ2 != spectra.getType()) {
+ DecimalFormat df = new DecimalFormat("#.0#");
+ if (spectra.getApparentStress() > 0.0) {
+ DecimalFormat df2 = new DecimalFormat("#0.0#");
+ legend.addLabeledLine(spectra.getType().name() + ' ' + df.format(spectra.getMw()) + " @ " + df2.format(spectra.getApparentStress()) + "MPa", line);
+ } else {
+ legend.addLabeledLine(spectra.getType().name() + ' ' + df.format(spectra.getMw()), line);
+ }
+ }
}
}
}
@@ -369,6 +380,18 @@ public void setAllXlimits() {
properties.setMinXAxisValue(xmin);
}
+ public void setAllYlimits(double ymin, double ymax) {
+ jsubplot.setYlimits(ymin, ymax);
+ this.ymin = ymin;
+ this.ymax = ymax;
+ }
+
+ public void setAllYlimits() {
+ jsubplot.setYlimits(defaultYMin, defaultYMax);
+ this.ymin = defaultYMin;
+ this.ymax = defaultYMax;
+ }
+
public void refreshPlotAxes() {
double xMin;
double xMax;
@@ -398,6 +421,7 @@ public void setLabels(String title, String xlabel, String ylabel) {
this.getTitle().setText(title);
this.getXaxis().setLabelText(xlabel);
jsubplot.getYaxis().setLabelText(ylabel);
+ jsubplot.getYaxis().setLabelOffset(12d);
}
public JSubplot getSubplot() {
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/WaveformGui.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/WaveformGui.java
index 7a1853db..3ac0b040 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/WaveformGui.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/WaveformGui.java
@@ -14,10 +14,13 @@
*/
package gov.llnl.gnem.apps.coda.calibration.gui.plotting;
+import java.io.File;
import java.io.IOException;
import javax.swing.SwingUtilities;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -34,25 +37,36 @@
import javafx.beans.property.Property;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.embed.swing.SwingNode;
+import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
import javafx.scene.input.KeyEvent;
import javafx.scene.text.Font;
+import javafx.stage.DirectoryChooser;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
@Controller
public class WaveformGui {
+ private static final Logger log = LoggerFactory.getLogger(WaveformGui.class);
+
private Parent root;
private Scene scene;
private Stage stage;
@FXML
private SwingNode waveformPlotNode;
+
+ @FXML
+ private Button snapshotButton;
+
private CodaWaveformPlotManager waveformPlotManager;
private WaveformClient waveformClient;
private ShapeMeasurementClient shapeClient;
@@ -61,6 +75,7 @@ public class WaveformGui {
private GeoMap map;
private MapPlottingUtilities mapPlotUtilities;
private Property shouldFocus = new SimpleBooleanProperty(false);
+ private DirectoryChooser screenshotFolderChooser = new DirectoryChooser();
@Autowired
public WaveformGui(WaveformClient waveformClient, ShapeMeasurementClient shapeClient, ParameterClient paramsClient, PeakVelocityClient peakVelocityClient, GeoMap map,
@@ -120,12 +135,32 @@ private void repaintWaveformWindow() {
@FXML
public void initialize() {
+ Label label = new Label("\uE3B0");
+ label.getStyleClass().add("material-icons-medium");
+ label.setMaxHeight(16);
+ label.setMinWidth(16);
+ snapshotButton.setGraphic(label);
+ snapshotButton.setContentDisplay(ContentDisplay.CENTER);
+ screenshotFolderChooser.setTitle("Screenshot Export Folder");
SwingUtilities.invokeLater(() -> {
waveformPlotManager = new CodaWaveformPlotManager(waveformClient, shapeClient, paramsClient, peakVelocityClient, map, mapPlotUtilities);
waveformPlotNode.setContent(waveformPlotManager);
});
}
+ @FXML
+ private void screenshotPlots(ActionEvent e) {
+ File folder = screenshotFolderChooser.showDialog(scene.getWindow());
+ try {
+ if (folder != null && folder.exists() && folder.isDirectory() && folder.canWrite()) {
+ screenshotFolderChooser.setInitialDirectory(folder);
+ Platform.runLater(() -> waveformPlotManager.exportScreenshots(folder));
+ }
+ } catch (SecurityException ex) {
+ log.warn("Exception trying to write screenshots to folder {} : {}", folder, ex.getLocalizedMessage(), ex);
+ }
+ }
+
public void hide() {
Platform.runLater(() -> {
stage.hide();
diff --git a/calibration-gui/src/main/resources/application.properties b/calibration-gui/src/main/resources/application.properties
index 436c4ce8..d35e6960 100644
--- a/calibration-gui/src/main/resources/application.properties
+++ b/calibration-gui/src/main/resources/application.properties
@@ -5,4 +5,5 @@ webclient.basePath=localhost:53921
webclient.subscriptions=/topic/status-events,/topic/calibration-events
app.height=1200
app.width=800
-app.baseTitle=Coda Calibration
\ No newline at end of file
+app.baseTitle=Coda Calibration
+spring.codec.max-in-memory-size=-1
\ No newline at end of file
diff --git a/calibration-gui/src/main/resources/fxml/CodaGui.fxml b/calibration-gui/src/main/resources/fxml/CodaGui.fxml
index b895c9fe..1ac520d6 100644
--- a/calibration-gui/src/main/resources/fxml/CodaGui.fxml
+++ b/calibration-gui/src/main/resources/fxml/CodaGui.fxml
@@ -15,6 +15,7 @@
+
@@ -91,26 +92,32 @@
-
+
-
+
+
+
-
+
diff --git a/calibration-gui/src/main/resources/fxml/Data.fxml b/calibration-gui/src/main/resources/fxml/Data.fxml
index e9f56320..be063020 100644
--- a/calibration-gui/src/main/resources/fxml/Data.fxml
+++ b/calibration-gui/src/main/resources/fxml/Data.fxml
@@ -12,7 +12,7 @@
-
+
diff --git a/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml b/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
index f16bdc60..e513f701 100644
--- a/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
+++ b/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
@@ -17,7 +17,6 @@
-
@@ -25,7 +24,7 @@
-
+
@@ -49,6 +48,16 @@
+
+
+
+
+
+
+
+
@@ -67,9 +76,9 @@
-
+
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
diff --git a/calibration-gui/src/main/resources/fxml/ShapeConstraints.fxml b/calibration-gui/src/main/resources/fxml/ShapeConstraints.fxml
index bd6b892e..0e0efad5 100644
--- a/calibration-gui/src/main/resources/fxml/ShapeConstraints.fxml
+++ b/calibration-gui/src/main/resources/fxml/ShapeConstraints.fxml
@@ -76,6 +76,7 @@
-
+
@@ -50,6 +50,16 @@
+
+
+
+
+
+
+
+
@@ -67,9 +77,9 @@
-
+
-
+
-
+
-
+
@@ -150,10 +160,23 @@
+
+
+
+
@@ -17,7 +19,16 @@
-
+
+
+
+
+
+
+
diff --git a/calibration-service/calibration-application/pom.xml b/calibration-service/calibration-application/pom.xml
index e4ba253e..fc92c6e5 100644
--- a/calibration-service/calibration-application/pom.xml
+++ b/calibration-service/calibration-application/pom.xml
@@ -5,7 +5,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/MeasurementJsonController.java b/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/MeasurementJsonController.java
index b41be351..f5754630 100644
--- a/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/MeasurementJsonController.java
+++ b/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/MeasurementJsonController.java
@@ -27,14 +27,13 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import gov.llnl.gnem.apps.coda.calibration.model.domain.MeasuredMwReportByEvent;
+import gov.llnl.gnem.apps.coda.calibration.model.domain.MeasurementJob;
import gov.llnl.gnem.apps.coda.calibration.service.api.CalibrationService;
import gov.llnl.gnem.apps.coda.common.model.domain.Waveform;
import gov.llnl.gnem.apps.coda.common.model.messaging.Result;
@@ -52,35 +51,28 @@ public MeasurementJsonController(CalibrationService service) {
this.service = service;
}
- @GetMapping(value = "/measure-mws/{autoPickingEnabled}", name = "measureMws")
- public ResponseEntity measureMws(@PathVariable(name = "autoPickingEnabled", required = false) Boolean autoPickingEnabled) {
- return measureMw(autoPickingEnabled, null, null);
+ @PostMapping(value = "/measure-mws", name = "measureMws")
+ public ResponseEntity measureMws(@RequestBody MeasurementJob job) {
+ return measureMw(job.getAutopickingEnabled(), job.getPersistResults(), job.getEventIds(), job.getStacks());
}
- @PostMapping(value = "/measure-mws/{autoPickingEnabled}", name = "measureMws")
- public ResponseEntity measureMws(@PathVariable(name = "autoPickingEnabled", required = false) Boolean autoPickingEnabled, @RequestBody List eventIds) {
- return measureMw(autoPickingEnabled, eventIds, null);
- }
-
- @PostMapping(value = "/measure-mws-from-stacks/{autoPickingEnabled}", name = "measureMwsFromStacks")
- public ResponseEntity measureMwsFromStacks(@PathVariable(name = "autoPickingEnabled", required = false) Boolean autoPickingEnabled, @RequestBody List stacks) {
- return measureMw(autoPickingEnabled, null, stacks);
- }
-
- private ResponseEntity measureMw(Boolean autoPickingEnabled, List evids, List stacks) {
+ private ResponseEntity measureMw(Boolean autoPickingEnabled, Boolean persistResults, List evids, List stacks) {
if (autoPickingEnabled == null) {
autoPickingEnabled = Boolean.FALSE;
}
+ if (persistResults == null) {
+ persistResults = Boolean.FALSE;
+ }
ResponseEntity resp = null;
try {
Result measuredMws;
if (evids != null && !evids.isEmpty()) {
- measuredMws = service.makeMwMeasurements(autoPickingEnabled, new HashSet<>(evids)).get(500, TimeUnit.SECONDS);
+ measuredMws = service.makeMwMeasurements(autoPickingEnabled, persistResults, new HashSet<>(evids)).get(4, TimeUnit.HOURS);
} else if (stacks != null && !stacks.isEmpty()) {
- measuredMws = service.makeMwMeasurements(autoPickingEnabled, stacks).get(500, TimeUnit.SECONDS);
+ measuredMws = service.makeMwMeasurements(autoPickingEnabled, persistResults, stacks).get(4, TimeUnit.HOURS);
} else {
- measuredMws = service.makeMwMeasurements(autoPickingEnabled).get(500, TimeUnit.SECONDS);
+ measuredMws = service.makeMwMeasurements(autoPickingEnabled, persistResults).get(4, TimeUnit.HOURS);
}
if (measuredMws != null) {
if (measuredMws.isSuccess()) {
diff --git a/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/SpectraMeasurementJsonController.java b/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/SpectraMeasurementJsonController.java
index 1b3aa9b5..94a81a3e 100644
--- a/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/SpectraMeasurementJsonController.java
+++ b/calibration-service/calibration-application/src/main/java/gov/llnl/gnem/apps/coda/calibration/application/web/SpectraMeasurementJsonController.java
@@ -53,20 +53,20 @@ public List getMeasurements() {
@GetMapping(name = "getMeasurementsMetadata", path = "/metadata/all")
public List getMeasurementsMetadata() {
- return service.findAllMetadataOnly().stream().map(md -> new SpectraMeasurement(md)).collect(Collectors.toList());
+ return service.findAllMetadataOnly().stream().map(md -> new SpectraMeasurement(md)).collect(Collectors.toList());
}
@PostMapping(value = "/reference-spectra", name = "computeSpectraForEventId")
public ResponseEntity computeSpectraForEventId(@RequestBody String eventId, BindingResult result) {
//FIXME: Accept a phase to use!
- Spectra theoreticalSpectra = service.computeSpectraForEventId(eventId, sharedParamsService.getFrequencyBands(), PICK_TYPES.LG);
+ Spectra theoreticalSpectra = service.computeReferenceSpectraForEventId(eventId, sharedParamsService.getFrequencyBands(), PICK_TYPES.LG);
return ResponseEntity.ok(theoreticalSpectra);
}
@PostMapping(value = "/fit-spectra", name = "getFitSpectraForEventId")
public ResponseEntity getFitSpectraForEventId(@RequestBody String eventId, BindingResult result) {
//FIXME: Accept a phase to use!
- Spectra fitSpectra = service.getFitSpectraForEventId(eventId, sharedParamsService.getFrequencyBands(), PICK_TYPES.LG);
+ List fitSpectra = service.getFitSpectraForEventId(eventId, sharedParamsService.getFrequencyBands(), PICK_TYPES.LG);
return ResponseEntity.ok(fitSpectra);
}
diff --git a/calibration-service/calibration-integration/pom.xml b/calibration-service/calibration-integration/pom.xml
index 79d2f1f8..4a9a46f9 100644
--- a/calibration-service/calibration-integration/pom.xml
+++ b/calibration-service/calibration-integration/pom.xml
@@ -4,7 +4,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-model/pom.xml b/calibration-service/calibration-model/pom.xml
index 4b252a86..6a5b1394 100644
--- a/calibration-service/calibration-model/pom.xml
+++ b/calibration-service/calibration-model/pom.xml
@@ -5,7 +5,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/InjectedCalibrationShapeFitterConstraints.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/InjectedCalibrationShapeFitterConstraints.java
index 7b0fe361..6a945f4c 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/InjectedCalibrationShapeFitterConstraints.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/InjectedCalibrationShapeFitterConstraints.java
@@ -146,48 +146,52 @@ public class InjectedCalibrationShapeFitterConstraints {
@Value("${shape-constraints.iterations:10}")
private int iterations;
+ @Value("${shape-constraints.fitting-point-count:10000}")
+ private int fittingPointCount;
+
@Bean
public ShapeFitterConstraints toCalibrationShapeFitterConstraints() {
return new ShapeFitterConstraints().setMaxVP1(maxVP1)
- .setMinVP1(minVP1)
- .setV0reg(v0reg)
- .setMaxVP2(maxVP2)
- .setMinVP2(minVP2)
- .setMaxVP3(maxVP3)
- .setMinVP3(minVP3)
- .setMaxBP1(maxBP1)
- .setMinBP1(minBP1)
- .setB0reg(b0reg)
- .setMaxBP2(maxBP2)
- .setMinBP2(minBP2)
- .setMaxBP3(maxBP3)
- .setMinBP3(minBP3)
- .setMaxGP1(maxGP1)
- .setMinGP1(minGP1)
- .setG0reg(g0reg)
- .setMaxGP2(maxGP2)
- .setMinGP2(minGP2)
- .setG1reg(g1reg)
- .setMaxGP3(maxGP3)
- .setMinGP3(minGP3)
- .setYvvMin(yvvMin)
- .setYvvMax(yvvMax)
- .setvDistMax(vDistMax)
- .setvDistMin(vDistMin)
- .setYbbMin(ybbMin)
- .setYbbMax(ybbMax)
- .setbDistMax(bDistMax)
- .setbDistMin(bDistMin)
- .setYggMin(yggMin)
- .setYggMax(yggMax)
- .setgDistMin(gDistMin)
- .setgDistMax(gDistMax)
- .setMinIntercept(minIntercept)
- .setMaxIntercept(maxIntercept)
- .setMinBeta(minBeta)
- .setMaxBeta(maxBeta)
- .setMinGamma(minGamma)
- .setMaxGamma(maxGamma)
- .setIterations(iterations);
+ .setMinVP1(minVP1)
+ .setV0reg(v0reg)
+ .setMaxVP2(maxVP2)
+ .setMinVP2(minVP2)
+ .setMaxVP3(maxVP3)
+ .setMinVP3(minVP3)
+ .setMaxBP1(maxBP1)
+ .setMinBP1(minBP1)
+ .setB0reg(b0reg)
+ .setMaxBP2(maxBP2)
+ .setMinBP2(minBP2)
+ .setMaxBP3(maxBP3)
+ .setMinBP3(minBP3)
+ .setMaxGP1(maxGP1)
+ .setMinGP1(minGP1)
+ .setG0reg(g0reg)
+ .setMaxGP2(maxGP2)
+ .setMinGP2(minGP2)
+ .setG1reg(g1reg)
+ .setMaxGP3(maxGP3)
+ .setMinGP3(minGP3)
+ .setYvvMin(yvvMin)
+ .setYvvMax(yvvMax)
+ .setvDistMax(vDistMax)
+ .setvDistMin(vDistMin)
+ .setYbbMin(ybbMin)
+ .setYbbMax(ybbMax)
+ .setbDistMax(bDistMax)
+ .setbDistMin(bDistMin)
+ .setYggMin(yggMin)
+ .setYggMax(yggMax)
+ .setgDistMin(gDistMin)
+ .setgDistMax(gDistMax)
+ .setMinIntercept(minIntercept)
+ .setMaxIntercept(maxIntercept)
+ .setMinBeta(minBeta)
+ .setMaxBeta(maxBeta)
+ .setMinGamma(minGamma)
+ .setMaxGamma(maxGamma)
+ .setIterations(iterations)
+ .setFittingPointCount(fittingPointCount);
}
}
\ No newline at end of file
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MdacParametersFI.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MdacParametersFI.java
index 4c6665f5..94ee9bd0 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MdacParametersFI.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MdacParametersFI.java
@@ -158,8 +158,9 @@ public double getSigma() {
return this.sigma;
}
- public void setSigma(double sigma) {
+ public MdacParametersFI setSigma(double sigma) {
this.sigma = sigma;
+ return this;
}
public double getDelSigma() {
@@ -174,8 +175,9 @@ public double getPsi() {
return this.psi;
}
- public void setPsi(double psi) {
+ public MdacParametersFI setPsi(double psi) {
this.psi = psi;
+ return this;
}
public double getDelPsi() {
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
index 0a7023d0..dd9985c6 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2018, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
+* Copyright (c) 2020, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
* CODE-743439.
* All rights reserved.
* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool.
@@ -15,6 +15,7 @@
package gov.llnl.gnem.apps.coda.calibration.model.domain;
import java.time.format.DateTimeFormatter;
+import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,12 +27,34 @@ public class MeasuredMwDetails {
private Double mw;
+ private Double mwSd;
+
+ private Double mw1Max;
+
+ private Double mw1Min;
+
+ private Double mw2Max;
+
+ private Double mw2Min;
+
private Double refMw;
private Double apparentStressInMpa;
+ private Double apparentStress1Max;
+
+ private Double apparentStress1Min;
+
+ private Double apparentStress2Max;
+
+ private Double apparentStress2Min;
+
private Double refApparentStressInMpa;
+ private Double cornerFreq;
+
+ private Double cornerFreqSd;
+
private Integer dataCount;
private Double latitude;
@@ -40,12 +63,29 @@ public class MeasuredMwDetails {
private String datetime;
+ private Integer iterations;
+
+ private Double misfit;
+
public MeasuredMwDetails(MeasuredMwParameters meas, ReferenceMwParameters ref, Event event) {
if (meas != null) {
- this.mw = meas.getMw();
this.eventId = meas.getEventId();
+ this.mw = meas.getMw();
+ // this.mwSd = meas.getMwSd();
+ this.mw1Max = meas.getMw1Max();
+ this.mw1Min = meas.getMw1Min();
+ this.mw2Max = meas.getMw2Max();
+ this.mw2Min = meas.getMw2Min();
this.apparentStressInMpa = meas.getApparentStressInMpa();
+ this.apparentStress1Max = meas.getApparentStress1Max();
+ this.apparentStress1Min = meas.getApparentStress1Min();
+ this.apparentStress2Max = meas.getApparentStress2Max();
+ this.apparentStress2Min = meas.getApparentStress2Min();
+ this.cornerFreq = meas.getCornerFrequency();
+ // this.cornerFreqSd = meas.getCornerFrequencySd();
this.dataCount = meas.getDataCount();
+ this.iterations = meas.getIterations();
+ this.misfit = meas.getMisfit();
}
if (event != null && event.getEventId() != null) {
this.eventId = event.getEventId();
@@ -86,6 +126,15 @@ public MeasuredMwDetails setMw(double mw) {
return this;
}
+ public Double getMwSd() {
+ return mwSd;
+ }
+
+ public MeasuredMwDetails setMwSd(Double mwSd) {
+ this.mwSd = mwSd;
+ return this;
+ }
+
public Double getRefMw() {
return refMw;
}
@@ -149,19 +198,190 @@ public MeasuredMwDetails setDatetime(String datetime) {
return this;
}
+ public Double getMw1Max() {
+ return mw1Max;
+ }
+
+ public MeasuredMwDetails setMw1Max(Double mw1Max) {
+ this.mw1Max = mw1Max;
+ return this;
+ }
+
+ public Double getMw1Min() {
+ return mw1Min;
+ }
+
+ public MeasuredMwDetails setMw1Min(Double mw1Min) {
+ this.mw1Min = mw1Min;
+ return this;
+ }
+
+ public Double getMw2Max() {
+ return mw2Max;
+ }
+
+ public MeasuredMwDetails setMw2Max(Double mw2Max) {
+ this.mw2Max = mw2Max;
+ return this;
+ }
+
+ public Double getMw2Min() {
+ return mw2Min;
+ }
+
+ public MeasuredMwDetails setMw2Min(Double mw2Min) {
+ this.mw2Min = mw2Min;
+ return this;
+ }
+
+ public Double getApparentStress1Max() {
+ return apparentStress1Max;
+ }
+
+ public MeasuredMwDetails setApparentStress1Max(Double apparentStress1Max) {
+ this.apparentStress1Max = apparentStress1Max;
+ return this;
+ }
+
+ public Double getApparentStress1Min() {
+ return apparentStress1Min;
+ }
+
+ public MeasuredMwDetails setApparentStress1Min(Double apparentStress1Min) {
+ this.apparentStress1Min = apparentStress1Min;
+ return this;
+ }
+
+ public Double getApparentStress2Max() {
+ return apparentStress2Max;
+ }
+
+ public MeasuredMwDetails setApparentStress2Max(Double apparentStress2Max) {
+ this.apparentStress2Max = apparentStress2Max;
+ return this;
+ }
+
+ public Double getApparentStress2Min() {
+ return apparentStress2Min;
+ }
+
+ public MeasuredMwDetails setApparentStress2Min(Double apparentStress2Min) {
+ this.apparentStress2Min = apparentStress2Min;
+ return this;
+ }
+
+ public Double getCornerFreq() {
+ return cornerFreq;
+ }
+
+ public MeasuredMwDetails setCornerFreq(Double cornerFreq) {
+ this.cornerFreq = cornerFreq;
+ return this;
+ }
+
+ public Double getCornerFreqSd() {
+ return cornerFreqSd;
+ }
+
+ public MeasuredMwDetails setCornerFreqSd(Double cornerFreqSd) {
+ this.cornerFreqSd = cornerFreqSd;
+ return this;
+ }
+
+ public Integer getIterations() {
+ return iterations;
+ }
+
+ public MeasuredMwDetails setIterations(Integer iterations) {
+ this.iterations = iterations;
+ return this;
+ }
+
+ public Double getMisfit() {
+ return misfit;
+ }
+
+ public MeasuredMwDetails setMisfit(Double misfit) {
+ this.misfit = misfit;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("MeasuredMwDetails [eventId=")
+ .append(eventId)
+ .append(", mw=")
+ .append(mw)
+ .append(", mwSd=")
+ .append(mwSd)
+ .append(", mw1Max=")
+ .append(mw1Max)
+ .append(", mw1Min=")
+ .append(mw1Min)
+ .append(", mw2Max=")
+ .append(mw2Max)
+ .append(", mw2Min=")
+ .append(mw2Min)
+ .append(", refMw=")
+ .append(refMw)
+ .append(", apparentStressInMpa=")
+ .append(apparentStressInMpa)
+ .append(", apparentStress1Max=")
+ .append(apparentStress1Max)
+ .append(", apparentStress1Min=")
+ .append(apparentStress1Min)
+ .append(", apparentStress2Max=")
+ .append(apparentStress2Max)
+ .append(", apparentStress2Min=")
+ .append(apparentStress2Min)
+ .append(", refApparentStressInMpa=")
+ .append(refApparentStressInMpa)
+ .append(", cornerFreq=")
+ .append(cornerFreq)
+ .append(", cornerFreqSd=")
+ .append(cornerFreqSd)
+ .append(", dataCount=")
+ .append(dataCount)
+ .append(", latitude=")
+ .append(latitude)
+ .append(", longitude=")
+ .append(longitude)
+ .append(", datetime=")
+ .append(datetime)
+ .append(", iterations=")
+ .append(iterations)
+ .append(", misfit=")
+ .append(misfit)
+ .append("]");
+ return builder.toString();
+ }
+
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((apparentStressInMpa == null) ? 0 : apparentStressInMpa.hashCode());
- result = prime * result + ((datetime == null) ? 0 : datetime.hashCode());
- result = prime * result + ((eventId == null) ? 0 : eventId.hashCode());
- result = prime * result + ((latitude == null) ? 0 : latitude.hashCode());
- result = prime * result + ((longitude == null) ? 0 : longitude.hashCode());
- result = prime * result + ((mw == null) ? 0 : mw.hashCode());
- result = prime * result + ((refApparentStressInMpa == null) ? 0 : refApparentStressInMpa.hashCode());
- result = prime * result + ((refMw == null) ? 0 : refMw.hashCode());
- return result;
+ return Objects.hash(
+ apparentStress1Max,
+ apparentStress1Min,
+ apparentStress2Max,
+ apparentStress2Min,
+ apparentStressInMpa,
+ cornerFreq,
+ cornerFreqSd,
+ dataCount,
+ datetime,
+ eventId,
+ iterations,
+ latitude,
+ longitude,
+ misfit,
+ mw,
+ mw1Max,
+ mw1Min,
+ mw2Max,
+ mw2Min,
+ mwSd,
+ refApparentStressInMpa,
+ refMw);
}
@Override
@@ -169,91 +389,32 @@ public boolean equals(Object obj) {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (!(obj instanceof MeasuredMwDetails)) {
return false;
}
MeasuredMwDetails other = (MeasuredMwDetails) obj;
- if (apparentStressInMpa == null) {
- if (other.apparentStressInMpa != null) {
- return false;
- }
- } else if (!apparentStressInMpa.equals(other.apparentStressInMpa)) {
- return false;
- }
- if (datetime == null) {
- if (other.datetime != null) {
- return false;
- }
- } else if (!datetime.equals(other.datetime)) {
- return false;
- }
- if (eventId == null) {
- if (other.eventId != null) {
- return false;
- }
- } else if (!eventId.equals(other.eventId)) {
- return false;
- }
- if (latitude == null) {
- if (other.latitude != null) {
- return false;
- }
- } else if (!latitude.equals(other.latitude)) {
- return false;
- }
- if (longitude == null) {
- if (other.longitude != null) {
- return false;
- }
- } else if (!longitude.equals(other.longitude)) {
- return false;
- }
- if (mw == null) {
- if (other.mw != null) {
- return false;
- }
- } else if (!mw.equals(other.mw)) {
- return false;
- }
- if (refApparentStressInMpa == null) {
- if (other.refApparentStressInMpa != null) {
- return false;
- }
- } else if (!refApparentStressInMpa.equals(other.refApparentStressInMpa)) {
- return false;
- }
- if (refMw == null) {
- if (other.refMw != null) {
- return false;
- }
- } else if (!refMw.equals(other.refMw)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "MeasuredMwDetails [eventId="
- + eventId
- + ", mw="
- + mw
- + ", refMw="
- + refMw
- + ", apparentStressInMpa="
- + apparentStressInMpa
- + ", refApparentStressInMpa="
- + refApparentStressInMpa
- + ", latitude="
- + latitude
- + ", longitude="
- + longitude
- + ", datetime="
- + datetime
- + "]";
+ return Objects.equals(apparentStress1Max, other.apparentStress1Max)
+ && Objects.equals(apparentStress1Min, other.apparentStress1Min)
+ && Objects.equals(apparentStress2Max, other.apparentStress2Max)
+ && Objects.equals(apparentStress2Min, other.apparentStress2Min)
+ && Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
+ && Objects.equals(cornerFreq, other.cornerFreq)
+ && Objects.equals(cornerFreqSd, other.cornerFreqSd)
+ && Objects.equals(dataCount, other.dataCount)
+ && Objects.equals(datetime, other.datetime)
+ && Objects.equals(eventId, other.eventId)
+ && Objects.equals(iterations, other.iterations)
+ && Objects.equals(latitude, other.latitude)
+ && Objects.equals(longitude, other.longitude)
+ && Objects.equals(misfit, other.misfit)
+ && Objects.equals(mw, other.mw)
+ && Objects.equals(mw1Max, other.mw1Max)
+ && Objects.equals(mw1Min, other.mw1Min)
+ && Objects.equals(mw2Max, other.mw2Max)
+ && Objects.equals(mw2Min, other.mw2Min)
+ && Objects.equals(mwSd, other.mwSd)
+ && Objects.equals(refApparentStressInMpa, other.refApparentStressInMpa)
+ && Objects.equals(refMw, other.refMw);
}
@JsonIgnore
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
index a18b951e..1e790925 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
@@ -56,6 +56,22 @@ public class MeasuredMwParameters implements Serializable {
@Column(nullable = true)
private Double mwSd;
+ @NumberFormat
+ @Column(nullable = true)
+ private Double mw1Min;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double mw1Max;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double mw2Min;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double mw2Max;
+
@NumberFormat
@Column(nullable = true)
private Double apparentStressInMpa;
@@ -66,7 +82,23 @@ public class MeasuredMwParameters implements Serializable {
@NumberFormat
@Column(nullable = true)
- private Double stressSd;
+ private Double apparentStressSd;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double apparentStress1Min;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double apparentStress1Max;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double apparentStress2Min;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double apparentStress2Max;
@NumberFormat
@Column(nullable = true)
@@ -80,8 +112,18 @@ public class MeasuredMwParameters implements Serializable {
@Column(nullable = true)
private Double misfitSd;
+ @NumberFormat
+ @Column(nullable = true)
+ private Double cornerFrequency;
+
+ @NumberFormat
+ @Column(nullable = true)
+ private Double cornerFrequencySd;
+
private int dataCount;
+ private int iterations;
+
public Long getId() {
return id;
}
@@ -122,6 +164,42 @@ public MeasuredMwParameters setMwSd(Double mwSd) {
return this;
}
+ public Double getMw1Min() {
+ return mw1Min;
+ }
+
+ public MeasuredMwParameters setMw1Min(Double mw1Min) {
+ this.mw1Min = mw1Min;
+ return this;
+ }
+
+ public Double getMw1Max() {
+ return mw1Max;
+ }
+
+ public MeasuredMwParameters setMw1Max(Double mw1Max) {
+ this.mw1Max = mw1Max;
+ return this;
+ }
+
+ public Double getMw2Min() {
+ return mw2Min;
+ }
+
+ public MeasuredMwParameters setMw2Min(Double mw2Min) {
+ this.mw2Min = mw2Min;
+ return this;
+ }
+
+ public Double getMw2Max() {
+ return mw2Max;
+ }
+
+ public MeasuredMwParameters setMw2Max(Double mw2Max) {
+ this.mw2Max = mw2Max;
+ return this;
+ }
+
public Double getApparentStressInMpa() {
return apparentStressInMpa;
}
@@ -131,12 +209,48 @@ public MeasuredMwParameters setApparentStressInMpa(Double apparentStressInMpa) {
return this;
}
- public Double getStressSd() {
- return stressSd;
+ public Double getApparentStressSd() {
+ return apparentStressSd;
+ }
+
+ public MeasuredMwParameters setApparentStressSd(Double apparentStressSd) {
+ this.apparentStressSd = apparentStressSd;
+ return this;
+ }
+
+ public Double getApparentStress1Min() {
+ return apparentStress1Min;
}
- public MeasuredMwParameters setStressSd(Double stressSd) {
- this.stressSd = stressSd;
+ public MeasuredMwParameters setApparentStress1Min(Double apparentStress1Min) {
+ this.apparentStress1Min = apparentStress1Min;
+ return this;
+ }
+
+ public Double getApparentStress1Max() {
+ return apparentStress1Max;
+ }
+
+ public MeasuredMwParameters setApparentStress1Max(Double apparentStress1Max) {
+ this.apparentStress1Max = apparentStress1Max;
+ return this;
+ }
+
+ public Double getApparentStress2Min() {
+ return apparentStress2Min;
+ }
+
+ public MeasuredMwParameters setApparentStress2Min(Double apparentStress2Min) {
+ this.apparentStress2Min = apparentStress2Min;
+ return this;
+ }
+
+ public Double getApparentStress2Max() {
+ return apparentStress2Max;
+ }
+
+ public MeasuredMwParameters setApparentStress2Max(Double apparentStress2Max) {
+ this.apparentStress2Max = apparentStress2Max;
return this;
}
@@ -194,23 +308,85 @@ public MeasuredMwParameters setMeanMisfit(Double meanMisfit) {
return this;
}
+ public Double getCornerFrequency() {
+ return cornerFrequency;
+ }
+
+ public MeasuredMwParameters setCornerFrequency(Double cornerFrequency) {
+ this.cornerFrequency = cornerFrequency;
+ return this;
+ }
+
+ public Double getCornerFrequencySd() {
+ return cornerFrequencySd;
+ }
+
+ public MeasuredMwParameters setCornerFrequencySd(Double cornerFrequencySd) {
+ this.cornerFrequencySd = cornerFrequencySd;
+ return this;
+ }
+
+ public int getIterations() {
+ return iterations;
+ }
+
+ public MeasuredMwParameters setIterations(int iterations) {
+ this.iterations = iterations;
+ return this;
+ }
+
public MeasuredMwParameters merge(MeasuredMwParameters overlay) {
this.mw = overlay.getMw();
this.meanMw = overlay.getMeanMw();
this.mwSd = overlay.getMwSd();
+ this.mw1Min = overlay.getMw1Min();
+ this.mw1Max = overlay.getMw1Max();
+ this.mw2Min = overlay.getMw2Min();
+ this.mw2Max = overlay.getMw2Max();
this.apparentStressInMpa = overlay.getApparentStressInMpa();
this.meanApparentStressInMpa = overlay.getMeanApparentStressInMpa();
- this.stressSd = overlay.getStressSd();
+ this.apparentStressSd = overlay.getApparentStressSd();
+ this.apparentStress1Min = overlay.getApparentStress1Min();
+ this.apparentStress1Max = overlay.getApparentStress1Max();
+ this.apparentStress2Min = overlay.getApparentStress2Min();
+ this.apparentStress2Max = overlay.getApparentStress2Max();
this.misfit = overlay.getMisfit();
this.meanMisfit = overlay.getMeanMisfit();
this.misfitSd = overlay.getMisfitSd();
this.dataCount = overlay.getDataCount();
+ this.iterations = overlay.getIterations();
+ this.cornerFrequency = overlay.getCornerFrequency();
+ this.cornerFrequencySd = overlay.getCornerFrequencySd();
return this;
}
@Override
public int hashCode() {
- return Objects.hash(apparentStressInMpa, dataCount, eventId, id, meanApparentStressInMpa, meanMisfit, meanMw, misfit, misfitSd, mw, mwSd, stressSd, version);
+ return Objects.hash(
+ apparentStress1Max,
+ apparentStress1Min,
+ apparentStress2Max,
+ apparentStress2Min,
+ apparentStressInMpa,
+ apparentStressSd,
+ cornerFrequency,
+ cornerFrequencySd,
+ dataCount,
+ eventId,
+ id,
+ iterations,
+ meanApparentStressInMpa,
+ meanMisfit,
+ meanMw,
+ misfit,
+ misfitSd,
+ mw,
+ mw1Max,
+ mw1Min,
+ mw2Max,
+ mw2Min,
+ mwSd,
+ version);
}
@Override
@@ -222,18 +398,29 @@ public boolean equals(Object obj) {
return false;
}
MeasuredMwParameters other = (MeasuredMwParameters) obj;
- return Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
+ return Objects.equals(apparentStress1Max, other.apparentStress1Max)
+ && Objects.equals(apparentStress1Min, other.apparentStress1Min)
+ && Objects.equals(apparentStress2Max, other.apparentStress2Max)
+ && Objects.equals(apparentStress2Min, other.apparentStress2Min)
+ && Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
+ && Objects.equals(apparentStressSd, other.apparentStressSd)
+ && Objects.equals(cornerFrequency, other.cornerFrequency)
+ && Objects.equals(cornerFrequencySd, other.cornerFrequencySd)
&& dataCount == other.dataCount
&& Objects.equals(eventId, other.eventId)
&& Objects.equals(id, other.id)
+ && iterations == other.iterations
&& Objects.equals(meanApparentStressInMpa, other.meanApparentStressInMpa)
&& Objects.equals(meanMisfit, other.meanMisfit)
&& Objects.equals(meanMw, other.meanMw)
&& Objects.equals(misfit, other.misfit)
&& Objects.equals(misfitSd, other.misfitSd)
&& Double.doubleToLongBits(mw) == Double.doubleToLongBits(other.mw)
+ && Objects.equals(mw1Max, other.mw1Max)
+ && Objects.equals(mw1Min, other.mw1Min)
+ && Objects.equals(mw2Max, other.mw2Max)
+ && Objects.equals(mw2Min, other.mw2Min)
&& Objects.equals(mwSd, other.mwSd)
- && Objects.equals(stressSd, other.stressSd)
&& Objects.equals(version, other.version);
}
@@ -252,20 +439,42 @@ public String toString() {
.append(meanMw)
.append(", mwSd=")
.append(mwSd)
+ .append(", mw1Min=")
+ .append(mw1Min)
+ .append(", mw1Max=")
+ .append(mw1Max)
+ .append(", mw2Min=")
+ .append(mw2Min)
+ .append(", mw2Max=")
+ .append(mw2Max)
.append(", apparentStressInMpa=")
.append(apparentStressInMpa)
.append(", meanApparentStressInMpa=")
.append(meanApparentStressInMpa)
- .append(", stressSd=")
- .append(stressSd)
+ .append(", apparentStressSd=")
+ .append(apparentStressSd)
+ .append(", apparentStress1Min=")
+ .append(apparentStress1Min)
+ .append(", apparentStress1Max=")
+ .append(apparentStress1Max)
+ .append(", apparentStress2Min=")
+ .append(apparentStress2Min)
+ .append(", apparentStress2Max=")
+ .append(apparentStress2Max)
.append(", misfit=")
.append(misfit)
.append(", meanMisfit=")
.append(meanMisfit)
.append(", misfitSd=")
.append(misfitSd)
+ .append(", cornerFrequency=")
+ .append(cornerFrequency)
+ .append(", cornerFrequencySd=")
+ .append(cornerFrequencySd)
.append(", dataCount=")
.append(dataCount)
+ .append(", iterations=")
+ .append(iterations)
.append("]");
return builder.toString();
}
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwReportByEvent.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwReportByEvent.java
index bce93ca3..27df5fac 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwReportByEvent.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwReportByEvent.java
@@ -21,10 +21,10 @@
public class MeasuredMwReportByEvent {
private Map measuredMwDetails;
- private Map fitSpectra;
+ private Map> fitSpectra;
private Map> spectraMeasurements;
- public MeasuredMwReportByEvent(Map measuredMwDetails, Map fitSpectra, Map> spectraMeasurements) {
+ public MeasuredMwReportByEvent(Map measuredMwDetails, Map> fitSpectra, Map> spectraMeasurements) {
super();
this.measuredMwDetails = measuredMwDetails;
this.fitSpectra = fitSpectra;
@@ -46,11 +46,11 @@ public MeasuredMwReportByEvent setMeasuredMwDetails(Map getFitSpectra() {
+ public Map> getFitSpectra() {
return fitSpectra;
}
- public MeasuredMwReportByEvent setFitSpectra(Map fitSpectra) {
+ public MeasuredMwReportByEvent setFitSpectra(Map> fitSpectra) {
this.fitSpectra = fitSpectra;
return this;
}
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasurementJob.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasurementJob.java
new file mode 100644
index 00000000..a2ef9aef
--- /dev/null
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasurementJob.java
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 2020, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
+* CODE-743439.
+* All rights reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the “Licensee”); you may not use this file except in compliance with the License. You may obtain a copy of the License at:
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and limitations under the license.
+*
+* This work was performed under the auspices of the U.S. Department of Energy
+* by Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
+*/
+package gov.llnl.gnem.apps.coda.calibration.model.domain;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.llnl.gnem.apps.coda.common.model.domain.Waveform;
+
+public class MeasurementJob {
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+ private List eventIds = null;
+ private List stacks = null;
+ private Boolean autopickingEnabled = Boolean.FALSE;
+ private Boolean persistResults = Boolean.FALSE;
+
+ public List getEventIds() {
+ return eventIds;
+ }
+
+ public MeasurementJob setEventIds(List eventIds) {
+ this.eventIds = eventIds;
+ return this;
+ }
+
+ public List getStacks() {
+ return stacks;
+ }
+
+ public MeasurementJob setStacks(List stacks) {
+ this.stacks = stacks;
+ return this;
+ }
+
+ public Boolean getAutopickingEnabled() {
+ return autopickingEnabled;
+ }
+
+ public MeasurementJob setAutopickingEnabled(Boolean autopickingEnabled) {
+ this.autopickingEnabled = autopickingEnabled;
+ return this;
+ }
+
+ public Boolean getPersistResults() {
+ return persistResults;
+ }
+
+ public MeasurementJob setPersistResults(Boolean persistResults) {
+ this.persistResults = persistResults;
+ return this;
+ }
+
+}
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/ShapeFitterConstraints.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/ShapeFitterConstraints.java
index 87d948cc..771488c8 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/ShapeFitterConstraints.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/ShapeFitterConstraints.java
@@ -126,6 +126,8 @@ public class ShapeFitterConstraints implements Serializable {
private double maxGamma;
@NumberFormat
private int iterations;
+ @NumberFormat
+ private int fittingPointCount;
public Long getId() {
return id;
@@ -514,6 +516,15 @@ public ShapeFitterConstraints setIterations(int iterations) {
return this;
}
+ public int getFittingPointCount() {
+ return fittingPointCount;
+ }
+
+ public ShapeFitterConstraints setFittingPointCount(int fittingPointCount) {
+ this.fittingPointCount = fittingPointCount;
+ return this;
+ }
+
public ShapeFitterConstraints merge(ShapeFitterConstraints other) {
if (other.getId() != null) {
id = other.getId();
@@ -562,108 +573,17 @@ public ShapeFitterConstraints merge(ShapeFitterConstraints other) {
iterations = other.getIterations();
gDistMin = other.getgDistMin();
gDistMax = other.getgDistMax();
+ fittingPointCount = other.getFittingPointCount();
return this;
}
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("CalibrationShapeFitterConstraints [id=")
- .append(id)
- .append(", version=")
- .append(version)
- .append(", maxVP1=")
- .append(maxVP1)
- .append(", minVP1=")
- .append(minVP1)
- .append(", v0reg=")
- .append(v0reg)
- .append(", maxVP2=")
- .append(maxVP2)
- .append(", minVP2=")
- .append(minVP2)
- .append(", maxVP3=")
- .append(maxVP3)
- .append(", minVP3=")
- .append(minVP3)
- .append(", maxBP1=")
- .append(maxBP1)
- .append(", minBP1=")
- .append(minBP1)
- .append(", b0reg=")
- .append(b0reg)
- .append(", maxBP2=")
- .append(maxBP2)
- .append(", minBP2=")
- .append(minBP2)
- .append(", maxBP3=")
- .append(maxBP3)
- .append(", minBP3=")
- .append(minBP3)
- .append(", maxGP1=")
- .append(maxGP1)
- .append(", minGP1=")
- .append(minGP1)
- .append(", g0reg=")
- .append(g0reg)
- .append(", maxGP2=")
- .append(maxGP2)
- .append(", minGP2=")
- .append(minGP2)
- .append(", g1reg=")
- .append(g1reg)
- .append(", maxGP3=")
- .append(maxGP3)
- .append(", minGP3=")
- .append(minGP3)
- .append(", yvvMin=")
- .append(yvvMin)
- .append(", yvvMax=")
- .append(yvvMax)
- .append(", vDistMax=")
- .append(vDistMax)
- .append(", vDistMin=")
- .append(vDistMin)
- .append(", ybbMin=")
- .append(ybbMin)
- .append(", ybbMax=")
- .append(ybbMax)
- .append(", bDistMax=")
- .append(bDistMax)
- .append(", bDistMin=")
- .append(bDistMin)
- .append(", yggMin=")
- .append(yggMin)
- .append(", yggMax=")
- .append(yggMax)
- .append(", gDistMin=")
- .append(gDistMin)
- .append(", gDistMax=")
- .append(gDistMax)
- .append(", minIntercept=")
- .append(minIntercept)
- .append(", maxIntercept=")
- .append(maxIntercept)
- .append(", minBeta=")
- .append(minBeta)
- .append(", maxBeta=")
- .append(maxBeta)
- .append(", minGamma=")
- .append(minGamma)
- .append(", maxGamma=")
- .append(maxGamma)
- .append(", iterations=")
- .append(iterations)
- .append("]");
- return builder.toString();
- }
-
@Override
public int hashCode() {
return Objects.hash(
b0reg,
bDistMax,
bDistMin,
+ fittingPointCount,
g0reg,
g1reg,
gDistMax,
@@ -718,6 +638,7 @@ public boolean equals(Object obj) {
return Double.doubleToLongBits(b0reg) == Double.doubleToLongBits(other.b0reg)
&& Double.doubleToLongBits(bDistMax) == Double.doubleToLongBits(other.bDistMax)
&& Double.doubleToLongBits(bDistMin) == Double.doubleToLongBits(other.bDistMin)
+ && fittingPointCount == other.fittingPointCount
&& Double.doubleToLongBits(g0reg) == Double.doubleToLongBits(other.g0reg)
&& Double.doubleToLongBits(g1reg) == Double.doubleToLongBits(other.g1reg)
&& Double.doubleToLongBits(gDistMax) == Double.doubleToLongBits(other.gDistMax)
@@ -759,4 +680,100 @@ public boolean equals(Object obj) {
&& Double.doubleToLongBits(yvvMax) == Double.doubleToLongBits(other.yvvMax)
&& Double.doubleToLongBits(yvvMin) == Double.doubleToLongBits(other.yvvMin);
}
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("ShapeFitterConstraints [id=")
+ .append(id)
+ .append(", version=")
+ .append(version)
+ .append(", maxVP1=")
+ .append(maxVP1)
+ .append(", minVP1=")
+ .append(minVP1)
+ .append(", v0reg=")
+ .append(v0reg)
+ .append(", maxVP2=")
+ .append(maxVP2)
+ .append(", minVP2=")
+ .append(minVP2)
+ .append(", maxVP3=")
+ .append(maxVP3)
+ .append(", minVP3=")
+ .append(minVP3)
+ .append(", maxBP1=")
+ .append(maxBP1)
+ .append(", minBP1=")
+ .append(minBP1)
+ .append(", b0reg=")
+ .append(b0reg)
+ .append(", maxBP2=")
+ .append(maxBP2)
+ .append(", minBP2=")
+ .append(minBP2)
+ .append(", maxBP3=")
+ .append(maxBP3)
+ .append(", minBP3=")
+ .append(minBP3)
+ .append(", maxGP1=")
+ .append(maxGP1)
+ .append(", minGP1=")
+ .append(minGP1)
+ .append(", g0reg=")
+ .append(g0reg)
+ .append(", maxGP2=")
+ .append(maxGP2)
+ .append(", minGP2=")
+ .append(minGP2)
+ .append(", g1reg=")
+ .append(g1reg)
+ .append(", maxGP3=")
+ .append(maxGP3)
+ .append(", minGP3=")
+ .append(minGP3)
+ .append(", yvvMin=")
+ .append(yvvMin)
+ .append(", yvvMax=")
+ .append(yvvMax)
+ .append(", vDistMax=")
+ .append(vDistMax)
+ .append(", vDistMin=")
+ .append(vDistMin)
+ .append(", ybbMin=")
+ .append(ybbMin)
+ .append(", ybbMax=")
+ .append(ybbMax)
+ .append(", bDistMax=")
+ .append(bDistMax)
+ .append(", bDistMin=")
+ .append(bDistMin)
+ .append(", yggMin=")
+ .append(yggMin)
+ .append(", yggMax=")
+ .append(yggMax)
+ .append(", gDistMin=")
+ .append(gDistMin)
+ .append(", gDistMax=")
+ .append(gDistMax)
+ .append(", minIntercept=")
+ .append(minIntercept)
+ .append(", maxIntercept=")
+ .append(maxIntercept)
+ .append(", minBeta=")
+ .append(minBeta)
+ .append(", maxBeta=")
+ .append(maxBeta)
+ .append(", minGamma=")
+ .append(minGamma)
+ .append(", maxGamma=")
+ .append(maxGamma)
+ .append(", iterations=")
+ .append(iterations)
+ .append(", fittingPointCount=")
+ .append(fittingPointCount)
+ .append("]");
+ return builder.toString();
+ }
+
}
\ No newline at end of file
diff --git a/calibration-service/calibration-repository/pom.xml b/calibration-service/calibration-repository/pom.xml
index 67b525fb..8fd56f08 100644
--- a/calibration-service/calibration-repository/pom.xml
+++ b/calibration-service/calibration-repository/pom.xml
@@ -5,7 +5,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-service-api/pom.xml b/calibration-service/calibration-service-api/pom.xml
index 30f88a87..498120dd 100644
--- a/calibration-service/calibration-service-api/pom.xml
+++ b/calibration-service/calibration-service-api/pom.xml
@@ -4,7 +4,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/CalibrationService.java b/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/CalibrationService.java
index f28fd530..8bfdd687 100644
--- a/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/CalibrationService.java
+++ b/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/CalibrationService.java
@@ -28,9 +28,9 @@ public interface CalibrationService {
public boolean clearData();
- public Future> makeMwMeasurements(Boolean autoPickingEnabled);
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults);
- public Future> makeMwMeasurements(Boolean autoPickingEnabled, Set eventIds);
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults, Set eventIds);
- public Future> makeMwMeasurements(Boolean autoPickingEnabled, List stacks);
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults, List stacks);
}
diff --git a/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/SpectraMeasurementService.java b/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/SpectraMeasurementService.java
index a884153b..bf3a3d70 100644
--- a/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/SpectraMeasurementService.java
+++ b/calibration-service/calibration-service-api/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/api/SpectraMeasurementService.java
@@ -50,7 +50,7 @@ public List measureSpectra(List generatedSynt
public long count();
- public Spectra computeSpectraForEventId(String eventId, List frequencyBands, PICK_TYPES selectedPhase);
+ public Spectra computeReferenceSpectraForEventId(String eventId, List frequencyBands, PICK_TYPES selectedPhase);
- public Spectra getFitSpectraForEventId(String eventId, List frequencyBands, PICK_TYPES selectedPhase);
+ public List getFitSpectraForEventId(String eventId, List frequencyBands, PICK_TYPES selectedPhase);
}
diff --git a/calibration-service/calibration-service-impl/pom.xml b/calibration-service/calibration-service-impl/pom.xml
index 78043885..d586aa92 100644
--- a/calibration-service/calibration-service-impl/pom.xml
+++ b/calibration-service/calibration-service-impl/pom.xml
@@ -5,7 +5,7 @@
gov.llnl.gnem.apps.coda.calibration
calibration-service
- 1.0.7.1
+ 1.0.8
4.0.0
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/AutopickingServiceImpl.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/AutopickingServiceImpl.java
index 1278fea3..407ffd2a 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/AutopickingServiceImpl.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/AutopickingServiceImpl.java
@@ -90,7 +90,9 @@ public Collection autoPickVelocityMeasuredWaveforms(fin
}
TimeSeries segment = converter.convert(vel.getWaveform());
- segment.interpolate(1.0);
+ if (segment.getSamprate() > 1.0) {
+ segment.interpolate(1.0);
+ }
double stopTime = endTimePicker.getEndTime(
segment.getData(),
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
index 7d3ae881..d73dfea2 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
@@ -84,11 +84,13 @@
import gov.llnl.gnem.apps.coda.common.model.domain.FrequencyBand;
import gov.llnl.gnem.apps.coda.common.model.domain.SharedFrequencyBandParameters;
import gov.llnl.gnem.apps.coda.common.model.domain.Station;
+import gov.llnl.gnem.apps.coda.common.model.domain.SyntheticCoda;
import gov.llnl.gnem.apps.coda.common.model.domain.Waveform;
import gov.llnl.gnem.apps.coda.common.model.domain.WaveformPick;
import gov.llnl.gnem.apps.coda.common.model.messaging.Result;
import gov.llnl.gnem.apps.coda.common.model.util.LightweightIllegalStateException;
import gov.llnl.gnem.apps.coda.common.model.util.PICK_TYPES;
+import gov.llnl.gnem.apps.coda.common.model.util.SPECTRA_TYPES;
import gov.llnl.gnem.apps.coda.common.service.api.NotificationService;
import gov.llnl.gnem.apps.coda.common.service.api.WaveformService;
import gov.llnl.gnem.apps.coda.common.service.util.WaveformUtils;
@@ -157,13 +159,13 @@ public CalibrationServiceImpl(WaveformService waveformService, PeakVelocityMeasu
}
@Override
- public Future> makeMwMeasurements(Boolean autoPickingEnabled) {
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults) {
final Long id = atomicLong.getAndIncrement();
Future> future = CompletableFuture.completedFuture(new Result<>(false, new MeasuredMwReportByEvent()));
Supplier measurementFunc = () -> {
List stationNames = siteParamsService.findDistinctStationNames();
List stacks = waveformService.getAllActiveStacksInStationNames(stationNames);
- return makeMwMeasurements(id, autoPickingEnabled, stacks);
+ return makeMwMeasurements(id, autoPickingEnabled, persistResults, stacks);
};
future = getMeasurementFuture(id, measurementFunc);
@@ -171,14 +173,14 @@ public Future> makeMwMeasurements(Boolean autoPi
}
@Override
- public Future> makeMwMeasurements(Boolean autoPickingEnabled, Set eventIds) {
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults, Set eventIds) {
final Long id = atomicLong.getAndIncrement();
Supplier measurementFunc = () -> {
MeasuredMwReportByEvent measuredMws = new MeasuredMwReportByEvent();
List stationNames = siteParamsService.findDistinctStationNames();
List stacks = eventIds.stream().flatMap(eventId -> waveformService.findAllActiveStacksByEventIdAndStationNames(eventId, stationNames).stream()).collect(Collectors.toList());
if (stacks != null && !stacks.isEmpty()) {
- measuredMws = makeMwMeasurements(id, autoPickingEnabled, stacks);
+ measuredMws = makeMwMeasurements(id, autoPickingEnabled, persistResults, stacks);
} else {
notificationService.post(
new MeasurementStatusEvent(id,
@@ -195,7 +197,7 @@ public Future> makeMwMeasurements(Boolean autoPi
}
@Override
- public Future> makeMwMeasurements(Boolean autoPickingEnabled, List waveforms) {
+ public Future> makeMwMeasurements(Boolean autoPickingEnabled, Boolean persistResults, List waveforms) {
final Long id = atomicLong.getAndIncrement();
Supplier measurementFunc = () -> {
MeasuredMwReportByEvent measuredMws = new MeasuredMwReportByEvent();
@@ -207,7 +209,7 @@ public Future> makeMwMeasurements(Boolean autoPi
.collect(Collectors.toList());
if (stacks != null && !stacks.isEmpty()) {
- measuredMws = makeMwMeasurements(id, autoPickingEnabled, stacks);
+ measuredMws = makeMwMeasurements(id, autoPickingEnabled, persistResults, stacks);
} else {
String msg = "No valid waveforms provided. Waveforms must have event and station information and must match a station for which a site calibration exists.";
log.trace(msg);
@@ -240,7 +242,7 @@ private Future> getMeasurementFuture(final Long
return future;
}
- private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingEnabled, List stacks) {
+ private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingEnabled, Boolean persistResults, List stacks) {
log.info("Starting measurement at {}", LocalDateTime.now());
MeasuredMwReportByEvent details = new MeasuredMwReportByEvent();
if (stacks != null) {
@@ -255,24 +257,19 @@ private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingE
.collect(Collectors.toList());
if (autoPickingEnabled) {
velocityMeasured = picker.autoPickVelocityMeasuredWaveforms(velocityMeasured, frequencyBandParameterMap);
+ if (persistResults) {
+ velocityMeasured = velocityMeasured.parallelStream().map(v -> v.setWaveform(waveformService.save(v.getWaveform()))).collect(Collectors.toList());
+ }
}
- log.trace("velocity measurements {}", velocityMeasured);
-
final Map snrFilterMap = new HashMap<>(frequencyBandParameterMap);
velocityMeasured = filterVelocityBySnr(snrFilterMap, velocityMeasured.stream());
measStacks = velocityMeasured.stream().map(vel -> vel.getWaveform()).collect(Collectors.toList());
measStacks = filterToEndPicked(measStacks);
- log.trace("filtered stacks {}", measStacks);
-
- List spectra = spectraCalc.measureAmplitudes(
- syntheticGenerationService.generateSynthetics(measStacks, frequencyBandParameterMap),
- frequencyBandParameterMap,
- velocityConfig,
- stationFrequencyBandMap);
+ List synthetics = syntheticGenerationService.generateSynthetics(measStacks, frequencyBandParameterMap);
- log.trace("spectra {}", spectra);
+ List spectra = spectraCalc.measureAmplitudes(synthetics, frequencyBandParameterMap, velocityConfig, stationFrequencyBandMap);
List measuredMwsParams = siteCalibrationService.fitMws(
spectraByFrequencyBand(spectra),
@@ -282,8 +279,6 @@ private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingE
stationFrequencyBandMap,
PICK_TYPES.LG);
- log.trace("measured mw params {}", measuredMwsParams);
-
Map measuredMwsMap = Optional.ofNullable(measuredMwsParams).orElseGet(ArrayList::new).stream().map(mwp -> {
Event event = getEventForId(mwp.getEventId(), eventsInStacks);
if (event != null) {
@@ -293,15 +288,20 @@ private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingE
}
}).collect(Collectors.toMap(kv -> kv.getKey(), kv -> kv.getValue()));
- Map fitSpectra = measuredMwsMap.entrySet()
- .parallelStream()
- .map(
- mw -> new AbstractMap.SimpleEntry<>(mw.getKey().getEventId(),
- spectraCalc.computeFitSpectra(
- mw.getValue(),
- frequencyBandParameterMap.keySet(),
- PICK_TYPES.LG)))
- .collect(Collectors.toConcurrentMap(kv -> kv.getKey(), kv -> kv.getValue()));
+ Map> fitSpectra = measuredMwsMap.entrySet()
+ .parallelStream()
+ .map(
+ mw -> new AbstractMap.SimpleEntry<>(mw.getKey().getEventId(),
+ computeFitSpectra(mw.getValue(), frequencyBandParameterMap.keySet(), PICK_TYPES.LG)))
+ .collect(Collectors.toConcurrentMap(kv -> kv.getKey(), kv -> kv.getValue()));
+
+ if (persistResults) {
+ peakVelocityMeasurementsService.deleteAll();
+ syntheticService.deleteAll();
+ peakVelocityMeasurementsService.save(velocityMeasured);
+ syntheticService.save(synthetics);
+ }
+
details.setFitSpectra(fitSpectra);
details.setMeasuredMwDetails(
@@ -319,6 +319,19 @@ private MeasuredMwReportByEvent makeMwMeasurements(Long id, Boolean autoPickingE
return details;
}
+ private List computeFitSpectra(MeasuredMwParameters event, Set frequencyBands, PICK_TYPES selectedPhase) {
+ List spectra = new ArrayList<>();
+ if (event != null) {
+ spectra.add(spectraCalc.computeFitSpectra(event, frequencyBands, selectedPhase));
+ spectra.add(spectraCalc.computeSpecificSpectra(event.getMw1Max(), event.getApparentStress1Max(), frequencyBands, selectedPhase, SPECTRA_TYPES.UQ1));
+ spectra.add(spectraCalc.computeSpecificSpectra(event.getMw1Min(), event.getApparentStress1Min(), frequencyBands, selectedPhase, SPECTRA_TYPES.UQ1));
+ spectra.add(spectraCalc.computeSpecificSpectra(event.getMw2Max(), event.getApparentStress2Max(), frequencyBands, selectedPhase, SPECTRA_TYPES.UQ2));
+ spectra.add(spectraCalc.computeSpecificSpectra(event.getMw2Min(), event.getApparentStress2Min(), frequencyBands, selectedPhase, SPECTRA_TYPES.UQ2));
+ }
+ return spectra;
+
+ }
+
private Event getEventForId(String eventId, List eventsInStacks) {
return Optional.ofNullable(waveformService.findEventById(eventId))
.filter(Objects::nonNull)
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/Joint1DPathCorrection.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/Joint1DPathCorrection.java
index 661e175a..42231627 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/Joint1DPathCorrection.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/Joint1DPathCorrection.java
@@ -342,14 +342,14 @@ private Map>> removeS
*/
public double costFunction(Map> evidStaData, Map> dataMap, Map> distanceMap,
Map stationIdxMap, FrequencyBand frequencyBand, double[] optimizationParams) {
- Map> localDataMap = new HashMap<>();
- double cost = 0.0;
double freq0 = Math.sqrt(frequencyBand.getLowFrequency() * frequencyBand.getHighFrequency());
- for (Entry> evidEntry : evidStaData.entrySet()) {
+ return evidStaData.entrySet().parallelStream().map(evidEntry -> {
+ double cost = 0.0;
Event evid = evidEntry.getKey();
Map stationMapData = evidEntry.getValue();
+ Map stationValues = new HashMap<>();
DoubleArrayList dataVec = new DoubleArrayList(stationMapData.size());
for (Entry entry : stationMapData.entrySet()) {
@@ -362,23 +362,19 @@ public double costFunction(Map> evidStaD
double pdat = site + spectraCalc.log10ESHcorrection(p1, p2, xcross, xtrans, del) - del * Math.PI * freq0 * efact / (q * vphase);
double adjustedVal = dataMap.get(evid).get(entry.getKey()) - pdat;
dataVec.add(adjustedVal);
- if (!localDataMap.containsKey(evid)) {
- localDataMap.put(evid, new HashMap());
- }
- localDataMap.get(evid).put(entry.getKey(), adjustedVal);
+ stationValues.put(entry.getKey(), adjustedVal);
}
if (dataVec.size() > 1) {
double huberDel = .5d;
double median = dataVec.median();
for (Entry entry1 : stationMapData.entrySet()) {
- double diff = Math.abs(localDataMap.get(evid).get(entry1.getKey()) - median);
+ double diff = Math.abs(stationValues.get(entry1.getKey()) - median);
cost = cost + (Math.pow(huberDel, 2.0) + (Math.sqrt(1d + Math.pow(diff / huberDel, 2.0)) - 1d));
}
}
- }
- return cost;
-
+ return cost;
+ }).reduce(0.0d, Double::sum);
}
/**
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/ServiceConfig.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/ServiceConfig.java
index 7cc1a790..67111495 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/ServiceConfig.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/ServiceConfig.java
@@ -31,6 +31,9 @@ public class ServiceConfig {
private static ExecutorService measurementServicePool;
+ @Value("${spectraTruncationEnabled:true}")
+ private boolean spectraTruncationEnabled;
+
@Value("${measurementPoolSize:10}")
private int measurementPoolSize;
@@ -49,4 +52,13 @@ public ExecutorService getMeasurementExecutor() {
return measurementServicePool;
}
+ public boolean isSpectraTruncationEnabled() {
+ return spectraTruncationEnabled;
+ }
+
+ public ServiceConfig setSpectraTruncationEnabled(boolean spectraTruncationEnabled) {
+ this.spectraTruncationEnabled = spectraTruncationEnabled;
+ return this;
+ }
+
}
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/SiteCalibrationServiceImpl.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/SiteCalibrationServiceImpl.java
index d8e81265..d6317a68 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/SiteCalibrationServiceImpl.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/SiteCalibrationServiceImpl.java
@@ -53,36 +53,39 @@ public class SiteCalibrationServiceImpl implements SiteCalibrationService {
private static final Logger log = LoggerFactory.getLogger(SiteCalibrationServiceImpl.class);
- private static final double UNUSED_DISTANCE = -1d;
private static final double DYNE_LOG10_ADJUSTMENT = 7d;
+
+ private static final double ARBITRARY_LOW_STRESS_SIGMA = 0.01;
private MdacCalculatorService mdac;
private SiteFrequencyBandParametersService siteParamsService;
private MeasuredMwsService measuredMwsService;
private SpectraCalculator spectraCalc;
+ private ServiceConfig serviceConfig;
@Autowired
- public SiteCalibrationServiceImpl(MdacCalculatorService mdac, SiteFrequencyBandParametersService siteParamsService, MeasuredMwsService measuredMwsService, SpectraCalculator spectraCalc) {
+ public SiteCalibrationServiceImpl(ServiceConfig serviceConfig, MdacCalculatorService mdac, SiteFrequencyBandParametersService siteParamsService, MeasuredMwsService measuredMwsService,
+ SpectraCalculator spectraCalc) {
this.mdac = mdac;
this.siteParamsService = siteParamsService;
this.measuredMwsService = measuredMwsService;
this.spectraCalc = spectraCalc;
+ this.serviceConfig = serviceConfig;
}
@Override
public List fitMws(Map> dataByFreqBand, MdacParametersFI mdacFI, Map mdacPS,
Map> refMws, Map> stationFrequencyBandParameters, PICK_TYPES selectedPhase) {
MdacParametersPS psRows = mdacPS.get(selectedPhase);
- Map>> freqBandEvidStaMeasurementsMap = mapToEventAndStation(dataByFreqBand);
+ Map>> evidFreqBandStaMeasurementsMap = mapToEventAndStation(dataByFreqBand);
Map, SortedMap>> weightFunctionMapByEvent = new HashMap<>();
Map> averageMapByEvent = new HashMap<>();
- for (Entry>> evidStaMap : freqBandEvidStaMeasurementsMap.entrySet()) {
- FrequencyBand freqBand = evidStaMap.getKey();
- for (Entry> staMwMap : evidStaMap.getValue().entrySet()) {
- Event evid = staMwMap.getKey();
-
+ for (Entry>> evidFreqMap : evidFreqBandStaMeasurementsMap.entrySet()) {
+ Event evid = evidFreqMap.getKey();
+ for (Entry> freqStaMap : evidFreqMap.getValue().entrySet()) {
+ FrequencyBand freqBand = freqStaMap.getKey();
weightFunctionMapByEvent.put(evid, this::lowerFreqHigherWeights);
- for (Entry staMwEntry : staMwMap.getValue().entrySet()) {
+ for (Entry staMwEntry : freqStaMap.getValue().entrySet()) {
double amp = staMwEntry.getValue().getPathAndSiteCorrected();
if (amp != 0.0) {
if (!averageMapByEvent.containsKey(evid)) {
@@ -109,7 +112,7 @@ public Map> measureSite
MdacParametersPS psRows = mdacPS.get(selectedPhase);
//Input
- Map>> freqBandEvidStaMeasurementsMap = mapToEventAndStation(dataByFreqBand);
+ Map>> evidFreqBandStaMeasurementsMap = mapToEventAndStation(dataByFreqBand);
Map, SortedMap>> weightFunctionMapByEvent = new HashMap<>();
@@ -123,36 +126,53 @@ public Map> measureSite
Map> siteCorrections = new HashMap<>();
//0) Determine if we have a RefMw in the dataset with a GT stress
+ boolean hasGtSpectra = refMws.values().stream().flatMap(refs -> refs.stream()).filter(ref -> ref.getRefApparentStressInMpa() != null).anyMatch(ref -> ref.getRefApparentStressInMpa() > 0.0);
//0-1A) If yes then omit everything above the corner frequency for MDAC model only events
//0-1B) Add it to the GT spectra event map
//0-1C) Weight the Mw fit for that event 1.0 at all bands
//0-2A) If no then weight the corner frequency highly, the low middle, and the high low
//1) Generate spectra for reference events and get the site correction for each station that saw it.
- for (Entry>> evidStaMap : freqBandEvidStaMeasurementsMap.entrySet()) {
- FrequencyBand freqBand = evidStaMap.getKey();
- Double lowFreq = freqBand.getLowFrequency();
- Double highFreq = freqBand.getHighFrequency();
- double centerFreq = (highFreq + lowFreq) / 2;
- for (Entry> staMwMap : evidStaMap.getValue().entrySet()) {
- Event evid = staMwMap.getKey();
- if (refMws != null && refMws.containsKey(evid.getEventId())) {
- List refMwsParams = refMws.get(evid.getEventId());
- ReferenceMwParameters refMw = refMwsParams.stream().findFirst().orElse(null);
- if (refMw != null) {
- double mw = refMw.getRefMw();
- MdacParametersFI mdacFiEntry = new MdacParametersFI(mdacFI);
- if (refMw.getRefApparentStressInMpa() != null && refMw.getRefApparentStressInMpa() != 0.0) {
- mdacFiEntry.setSigma(refMw.getRefApparentStressInMpa());
- mdacFiEntry.setPsi(0.0);
- weightFunctionMapByEvent.put(evid, this::noWeights);
+ for (Entry>> evidFreqMap : evidFreqBandStaMeasurementsMap.entrySet()) {
+ Event evid = evidFreqMap.getKey();
+ if (refMws != null && refMws.containsKey(evid.getEventId())) {
+ List refMwsParams = refMws.get(evid.getEventId());
+ ReferenceMwParameters refMw = refMwsParams.stream().findFirst().orElse(null);
+ if (refMw != null) {
+ double mw = refMw.getRefMw();
+ boolean evidHasSpectra = false;
+ MdacParametersFI mdacFiEntry = new MdacParametersFI(mdacFI);
+ if (refMw.getRefApparentStressInMpa() != null && refMw.getRefApparentStressInMpa() != 0.0) {
+ mdacFiEntry.setSigma(refMw.getRefApparentStressInMpa());
+ mdacFiEntry.setPsi(0.0);
+ weightFunctionMapByEvent.put(evid, this::evenWeights);
+ evidHasSpectra = true;
+ } else if (serviceConfig.isSpectraTruncationEnabled() && hasGtSpectra) {
+ mdacFiEntry.setSigma(ARBITRARY_LOW_STRESS_SIGMA);
+ weightFunctionMapByEvent.put(evid, this::evenWeights);
+ }
+
+ Function mdacFunc = mdac.getCalculateMdacSourceSpectraFunction(psRows, mdacFiEntry, mw);
+ double cornerFreq = 0.0;
+ if (hasGtSpectra && !evidHasSpectra) {
+ cornerFreq = mdac.getCornerFrequency(mdacFunc);
+ }
+
+ for (Entry> freqStaMap : evidFreqMap.getValue().entrySet()) {
+ FrequencyBand freqBand = freqStaMap.getKey();
+ Double lowFreq = freqBand.getLowFrequency();
+ Double highFreq = freqBand.getHighFrequency();
+
+ if (serviceConfig.isSpectraTruncationEnabled() && cornerFreq > 0.0 && highFreq > cornerFreq) {
+ continue;
}
- double[] refSpectra = mdac.calculateMdacSourceSpectra(psRows, mdacFiEntry, centerFreq, mw, UNUSED_DISTANCE);
+ double centerFreq = (highFreq + lowFreq) / 2;
- for (Entry staMwEntry : staMwMap.getValue().entrySet()) {
+ double[] refSpectra = mdacFunc.apply(centerFreq);
- double amp = staMwEntry.getValue().getPathCorrected();
+ for (Entry staMwEntry : freqStaMap.getValue().entrySet()) {
+ double amp = staMwEntry.getValue().getPathCorrected();
if (!staFreqBandSiteCorrectionMapReferenceEvents.containsKey(staMwEntry.getKey())) {
staFreqBandSiteCorrectionMapReferenceEvents.put(staMwEntry.getKey(), new HashMap());
}
@@ -168,16 +188,16 @@ public Map> measureSite
}
}
}
- weightFunctionMapByEvent.putIfAbsent(evid, this::lowerFreqHigherWeights);
}
+ weightFunctionMapByEvent.putIfAbsent(evid, this::lowerFreqHigherWeights);
}
//2) For every station with a site correction measured apply it to every other event and get average site term for every frequency band
- for (Entry>> evidStaMap : freqBandEvidStaMeasurementsMap.entrySet()) {
- FrequencyBand freqBand = evidStaMap.getKey();
- for (Entry> evidStaEntry : evidStaMap.getValue().entrySet()) {
- Event evid = evidStaEntry.getKey();
- for (Entry staMwEntry : evidStaEntry.getValue().entrySet()) {
+ for (Entry>> evidFreqMap : evidFreqBandStaMeasurementsMap.entrySet()) {
+ Event evid = evidFreqMap.getKey();
+ for (Entry> freqStaMap : evidFreqMap.getValue().entrySet()) {
+ FrequencyBand freqBand = freqStaMap.getKey();
+ for (Entry staMwEntry : freqStaMap.getValue().entrySet()) {
if (staFreqBandSiteCorrectionMapReferenceEvents.containsKey(staMwEntry.getKey()) && staFreqBandSiteCorrectionMapReferenceEvents.get(staMwEntry.getKey()).containsKey(freqBand)) {
double amp = staMwEntry.getValue().getPathCorrected();
if (!averageMapByEvent.containsKey(evid)) {
@@ -195,12 +215,12 @@ public Map> measureSite
}
//3) For all measurements offset by the average site term for each station/frequency band to get the final site terms
- for (Entry>> evidStaMap : freqBandEvidStaMeasurementsMap.entrySet()) {
- FrequencyBand freqBand = evidStaMap.getKey();
- for (Entry> evidStaEntry : evidStaMap.getValue().entrySet()) {
- Event evid = evidStaEntry.getKey();
+ for (Entry>> evidFreqMap : evidFreqBandStaMeasurementsMap.entrySet()) {
+ Event evid = evidFreqMap.getKey();
+ for (Entry> freqStaMap : evidFreqMap.getValue().entrySet()) {
+ FrequencyBand freqBand = freqStaMap.getKey();
if (averageMapByEvent.containsKey(evid) && averageMapByEvent.get(evid).containsKey(freqBand)) {
- for (Entry staMwEntry : evidStaEntry.getValue().entrySet()) {
+ for (Entry staMwEntry : freqStaMap.getValue().entrySet()) {
double amp = staMwEntry.getValue().getPathCorrected();
if (!staFreqBandSiteCorrectionMapAverage.containsKey(staMwEntry.getKey())) {
staFreqBandSiteCorrectionMapAverage.put(staMwEntry.getKey(), new HashMap());
@@ -208,15 +228,9 @@ public Map> measureSite
if (!staFreqBandSiteCorrectionMapAverage.get(staMwEntry.getKey()).containsKey(freqBand)) {
staFreqBandSiteCorrectionMapAverage.get(staMwEntry.getKey()).put(freqBand, new SummaryStatistics());
}
- //We want to keep the reference events as-is
- if (staFreqBandSiteCorrectionMapReferenceEvents.containsKey(staMwEntry.getKey())
- && staFreqBandSiteCorrectionMapReferenceEvents.get(staMwEntry.getKey()).containsKey(freqBand)) {
- staFreqBandSiteCorrectionMapAverage.get(staMwEntry.getKey()).put(freqBand, staFreqBandSiteCorrectionMapReferenceEvents.get(staMwEntry.getKey()).get(freqBand));
- } else {
- double refAmp = averageMapByEvent.get(evid).get(freqBand).getMean();
- double ampDiff = refAmp - amp;
- staFreqBandSiteCorrectionMapAverage.get(staMwEntry.getKey()).get(freqBand).addValue(ampDiff);
- }
+ double refAmp = averageMapByEvent.get(evid).get(freqBand).getMean();
+ double ampDiff = refAmp - amp;
+ staFreqBandSiteCorrectionMapAverage.get(staMwEntry.getKey()).get(freqBand).addValue(ampDiff);
}
}
}
@@ -224,11 +238,11 @@ public Map