From 93d14e4a9ab01bca9524a05563c8297305de3abe Mon Sep 17 00:00:00 2001
From: Guylaine Prat <guylaine.prat@c-s.fr>
Date: Tue, 19 Feb 2019 11:13:41 +0100
Subject: [PATCH] Add informations in dump
---
src/main/java/org/orekit/rugged/api/Rugged.java | 14 +++++++++++---
.../java/org/orekit/rugged/errors/DumpManager.java | 12 ++++++++++++
.../org/orekit/rugged/linesensor/LineSensor.java | 9 ++++++++-
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index be701087..7426efca 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -514,7 +514,7 @@ public class Rugged {
final int minLine, final int maxLine) {
final LineSensor sensor = getLineSensor(sensorName);
- DumpManager.dumpInverseLocation(sensor, point, minLine, maxLine, lightTimeCorrection,
+ DumpManager.dumpInverseLocation(sensor, point, ellipsoid, minLine, maxLine, lightTimeCorrection,
aberrationOfLightCorrection, atmosphericRefraction != null);
final SensorMeanPlaneCrossing planeCrossing = getPlaneCrossing(sensorName, minLine, maxLine);
@@ -713,11 +713,12 @@ public class Rugged {
atmosphericRefraction.deactivateComputation();
final SensorPixel sp0 = inverseLocation(sensorName, point, minLine, maxLine);
atmosphericRefraction.reactivateComputation();
-
// Reactivate the dump
DumpManager.resume(wasSuspended);
if (sp0 == null) {
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
// Impossible to find the point in the given min line and max line (without atmosphere)
throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
}
@@ -725,6 +726,8 @@ public class Rugged {
// set up the starting point of the fixed point method
final double pixel0 = sp0.getPixelNumber();
final double line0 = sp0.getLineNumber();
+ // Needed data for the dump
+ sensor.dumpRate(line0);
// Apply fixed point method until convergence in pixel and line
// ------------------------------------------------------------
@@ -794,6 +797,8 @@ public class Rugged {
sensorPixelGrid[uIndex][vIndex] = inverseLocation(sensorName, currentLat, currentLon, minLine, maxLine);
} catch (RuggedException re) { // This should never happen
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
throw RuggedException.createInternalError(re);
}
@@ -802,7 +807,8 @@ public class Rugged {
(sensorPixelGrid[uIndex][vIndex].getPixelNumber() < (-INVLOC_MARGIN) ||
sensorPixelGrid[uIndex][vIndex].getPixelNumber() > (INVLOC_MARGIN + sensor.getNbPixels() - 1))) ||
(sensorPixelGrid[uIndex][vIndex] == null) ) {
-
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
// Impossible to find the point in the given min line
throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
}
@@ -852,6 +858,8 @@ public class Rugged {
groundGridWithAtmosphere[uIndex][vIndex] = directLocation(date, sensorPosition, los);
} catch (RuggedException re) { // This should never happen
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
throw RuggedException.createInternalError(re);
}
} // end loop vIndex
diff --git a/src/main/java/org/orekit/rugged/errors/DumpManager.java b/src/main/java/org/orekit/rugged/errors/DumpManager.java
index a838ee5e..78e0f2a8 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpManager.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpManager.java
@@ -108,6 +108,15 @@ public class DumpManager {
isSuspended = false;
}
}
+
+ /** In case dump is suspended and an exception is thrown,
+ * allow the dump to end nicely.
+ */
+ public static void endNicely() {
+ isSuspended = false;
+ if (isActive()) deactivate();
+
+ }
/** Check if dump is active for this thread.
* @return true if dump is active for this thread
@@ -187,6 +196,7 @@ public class DumpManager {
/** Dump an inverse location computation.
* @param sensor sensor
* @param point point to localize
+ * @param ellipsoid the used ellipsoid
* @param minLine minimum line number
* @param maxLine maximum line number
* @param lightTimeCorrection flag for light time correction
@@ -194,12 +204,14 @@ public class DumpManager {
* @param refractionCorrection flag for refraction correction
*/
public static void dumpInverseLocation(final LineSensor sensor, final GeodeticPoint point,
+ final ExtendedEllipsoid ellipsoid,
final int minLine, final int maxLine,
final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
final boolean refractionCorrection) {
if (isActive()) {
DUMP.get().dumpInverseLocation(sensor, point, minLine, maxLine,
lightTimeCorrection, aberrationOfLightCorrection, refractionCorrection);
+ DUMP.get().dumpEllipsoid(ellipsoid);
}
}
diff --git a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
index c4ab9a9b..9963174f 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
@@ -183,5 +183,12 @@ public class LineSensor {
public Vector3D getPosition() {
return position;
}
-
+
+ /** Dump the rate for the current line number
+ * @param lineNumber line number
+ */
+ public void dumpRate(final double lineNumber) {
+ final double rate = datationModel.getRate(lineNumber);
+ DumpManager.dumpSensorRate(this, lineNumber, rate);
+ }
}
--
GitLab