Update to go back to using Km for the Evdp field specifically based o…

…n user request.
LLNL · Jul 25, 2022 · 11eba63 · 11eba63
1 parent 86bf2b7
commit 11eba63
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 19 deletions.
diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<artifactId>calibration-gui</artifactId>

diff --git a/...tion-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java b/...tion-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java
@@ -106,9 +106,7 @@ public SACHeader sacHeaderFromWaveform(Waveform w) throws IOException {
             header.kevnm = w.getEvent().getEventId();
             header.evla = (float) w.getEvent().getLatitude();
             header.evlo = (float) w.getEvent().getLongitude();
-            //Evdp in meters and we expect Event->Depth to be km so need to convert
-            // back when we save
-            header.evdp = (float) (w.getEvent().getDepth() * 1000.0);
+            header.evdp = (float) (w.getEvent().getDepth());
             String depType = w.getSegmentType();
             if (depType != null && !depType.trim().isEmpty()) {
                 if (depType.toLowerCase(Locale.ENGLISH).startsWith("dis")) {

diff --git a/...ration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java b/...ration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java
@@ -180,9 +180,7 @@ public Result<Waveform> convertSacFileToWaveform(File file) {
             if (SACHeader.isDefault(header.evdp)) {
                 eventDepth = 0;
             } else {
-                //Just going to assume they are following the SAC header standard
-                // and using meters for this field and we want Km
-                eventDepth = header.evdp / 1000.0;
+                eventDepth = header.evdp;
             }
 
             String dataType = StringUtils.trimToEmpty((String) header.getVariableMap().get("depvariabletype")).toLowerCase(Locale.ENGLISH);

diff --git a/calibration-service/calibration-application/pom.xml b/calibration-service/calibration-application/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/calibration-service/calibration-model/pom.xml b/calibration-service/calibration-model/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
         <artifactId>calibration-service</artifactId>
-        <version>1.0.18</version>
+        <version>1.0.18.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/calibration-service/calibration-repository/pom.xml b/calibration-service/calibration-repository/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/calibration-service/calibration-service-api/pom.xml b/calibration-service/calibration-service-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/calibration-service/calibration-service-impl/pom.xml b/calibration-service/calibration-service-impl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/calibration-service/pom.xml b/calibration-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/calibration-standalone/pom.xml b/calibration-standalone/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4
+FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.6
 ARG USER=1001
 ARG JAVA_OPTS="-XX:MaxRAMPercentage=80"
 ENV JAVA_OPTS=${JAVA_OPTS}
@@ -59,4 +59,4 @@ ADD calibration-standalone-*runnable.jar /opt/cct/coda-calibration-standalone.ja
 ADD run.sh /run.sh
 
 EXPOSE 8080
-CMD ["/bin/bash", "/run.sh"]
+CMD ["/bin/bash", "/run.sh"]
diff --git a/externals/pom.xml b/externals/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<artifactId>externals</artifactId>

diff --git a/mapping/pom.xml b/mapping/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.18.1</version>
 	</parent>
 
 	<groupId>gov.llnl.gnem.apps.coda.common</groupId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 	<artifactId>coda-calibration</artifactId>
-	<version>1.0.18</version>
+	<version>1.0.18.1</version>
 	<name>coda-calibration</name>
 
 	<packaging>pom</packaging>