From 840e45d727f86d5811f705a3438480dca37ea921 Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Thu, 7 Mar 2019 16:41:55 +0100
Subject: [PATCH] Removed method not yet implemented.
---
.../refraction/AtmosphericRefraction.java | 26 +++++--------------
.../rugged/refraction/MultiLayerModel.java | 13 ----------
2 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
index b2bf1bc9..16c3c9c4 100644
--- a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
+++ b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
@@ -37,7 +37,7 @@ public abstract class AtmosphericRefraction {
* By default: computation is set up.
* @since 2.1
*/
- private boolean mustBeComputed = true;
+ private boolean mustBeComputed;
/** The current atmospheric parameters.
* @since 2.1
@@ -47,12 +47,12 @@ public abstract class AtmosphericRefraction {
/** Bilinear interpolating function for pixel (used by inverse location).
* @since 2.1
*/
- private BilinearInterpolatingFunction bifPixel = null;
+ private BilinearInterpolatingFunction bifPixel;
/** Bilinear interpolating function of line (used by inverse location).
* @since 2.1
*/
- private BilinearInterpolatingFunction bifLine = null;
+ private BilinearInterpolatingFunction bifLine;
/**
* Default constructor.
@@ -60,6 +60,9 @@ public abstract class AtmosphericRefraction {
protected AtmosphericRefraction() {
// Set up the atmospheric parameters ... with lazy evaluation of the grid (done only if necessary)
this.atmosphericParams = new AtmosphericComputationParameters();
+ this.mustBeComputed = true;
+ this.bifPixel = null;
+ this.bifLine = null;
}
/** Apply correction to the intersected point with an atmospheric refraction model.
@@ -74,23 +77,6 @@ public abstract class AtmosphericRefraction {
public abstract NormalizedGeodeticPoint applyCorrection(Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
IntersectionAlgorithm algorithm);
- /** Apply correction to the intersected point with an atmospheric refraction model,
- * using a time optimized algorithm.
- * @param lineSensor the line sensor
- * @param sensorPixel the sensor pixel (must be defined)
- * @param satPos satellite position, in <em>body frame</em>
- * @param satLos sensor pixel line of sight, in <em>body frame</em>
- * @param rawIntersection intersection point before refraction correction
- * @param algorithm intersection algorithm
- * @return corrected point with the effect of atmospheric refraction
- * {@link org.orekit.rugged.utils.ExtendedEllipsoid#pointAtAltitude(Vector3D, Vector3D, double)} or see
- * {@link org.orekit.rugged.intersection.IntersectionAlgorithm#refineIntersection(org.orekit.rugged.utils.ExtendedEllipsoid, Vector3D, Vector3D, NormalizedGeodeticPoint)}
- * @since 2.1
- */
- public abstract NormalizedGeodeticPoint applyCorrection(LineSensor lineSensor, SensorPixel sensorPixel,
- Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
- IntersectionAlgorithm algorithm);
-
/** Deactivate computation (needed for the inverse location computation).
* @since 2.1
*/
diff --git a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
index 547c8ec0..2c1f1918 100644
--- a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
+++ b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
@@ -26,8 +26,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
-import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
@@ -248,17 +246,6 @@ public class MultiLayerModel extends AtmosphericRefraction {
return algorithm.refineIntersection(ellipsoid, pos, los, rawIntersection);
}
- /** {@inheritDoc} */
- @Override
- public NormalizedGeodeticPoint applyCorrection(final LineSensor lineSensor, final SensorPixel sensorPixel,
- final Vector3D satPos, final Vector3D satLos,
- final NormalizedGeodeticPoint rawIntersection,
- final IntersectionAlgorithm algorithm) {
-
- // TODO to be done
- throw new RuggedException(RuggedMessages.UNINITIALIZED_CONTEXT, "Atmospheric optimization for direct loc");
- }
-
} // end of class MultiLayerModel
/** Container for the (position, LOS) of the intersection with the lowest atmospheric layer.
--
GitLab