Commit 024d6f76 authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Fixed wrong index in multi-satellite orbit determination.

parent 01c80893
......@@ -108,7 +108,7 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> {
final SpacecraftState[] states)
throws OrekitException {
final SpacecraftState state = states[0];
final SpacecraftState state = states[getPropagatorsIndices().get(0)];
// Azimuth/elevation derivatives are computed with respect to spacecraft state in inertial frame
// and station parameters
......
......@@ -123,7 +123,7 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> {
final SpacecraftState[] states)
throws OrekitException {
final SpacecraftState state = states[0];
final SpacecraftState state = states[getPropagatorsIndices().get(0)];
// Right Ascension/elevation (in reference frame )derivatives are computed with respect to spacecraft state in inertial frame
// and station parameters
......
......@@ -74,9 +74,9 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan
* name conflict occurs
*/
public InterSatellitesRange(final int satellite1Index, final int satellite2Index,
final boolean twoWay,
final AbsoluteDate date, final double range,
final double sigma, final double baseWeight)
final boolean twoWay,
final AbsoluteDate date, final double range,
final double sigma, final double baseWeight)
throws OrekitException {
super(date, range, sigma, baseWeight, Arrays.asList(satellite1Index, satellite2Index));
this.twoway = twoWay;
......@@ -109,8 +109,10 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan
final Field<DerivativeStructure> field = factory.getDerivativeField();
// coordinates of both satellites
final TimeStampedFieldPVCoordinates<DerivativeStructure> pva1 = getCoordinates(states[0], 0, factory);
final TimeStampedFieldPVCoordinates<DerivativeStructure> pva2 = getCoordinates(states[1], 6, factory);
final TimeStampedFieldPVCoordinates<DerivativeStructure> pva1 =
getCoordinates(states[getPropagatorsIndices().get(0)], 0, factory);
final TimeStampedFieldPVCoordinates<DerivativeStructure> pva2 =
getCoordinates(states[getPropagatorsIndices().get(1)], 6, factory);
// compute propagation times
// (if state has already been set up to pre-compensate propagation delay,
......
......@@ -120,7 +120,7 @@ public class PV extends AbstractMeasurement<PV> {
throws OrekitException {
// PV value
final TimeStampedPVCoordinates pv = states[0].getPVCoordinates();
final TimeStampedPVCoordinates pv = states[getPropagatorsIndices().get(0)].getPVCoordinates();
// prepare the evaluation
final EstimatedMeasurement<PV> estimated =
......
......@@ -117,7 +117,7 @@ public class Range extends AbstractMeasurement<Range> {
final SpacecraftState[] states)
throws OrekitException {
final SpacecraftState state = states[0];
final SpacecraftState state = states[getPropagatorsIndices().get(0)];
// Range derivatives are computed with respect to spacecraft state in inertial frame
// and station parameters
......
......@@ -132,7 +132,7 @@ public class RangeRate extends AbstractMeasurement<RangeRate> {
final SpacecraftState[] states)
throws OrekitException {
final SpacecraftState state = states[0];
final SpacecraftState state = states[getPropagatorsIndices().get(0)];
// Range-rate derivatives are computed with respect to spacecraft state in inertial frame
// and station position in station's offset frame
......
......@@ -147,7 +147,7 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> {
final SpacecraftState[] states)
throws OrekitException {
final SpacecraftState state = states[0];
final SpacecraftState state = states[getPropagatorsIndices().get(0)];
// Turn around range derivatives are computed with respect to:
// - Spacecraft state in inertial frame
......
......@@ -41,7 +41,7 @@
thought to be related to a radiator thermal radiation.
</action>
<action dev="luc" type="remove">
Removed obsoletes Cunningham and Droziner attraction models. These models have
Removed obsolete Cunningham and Droziner attraction models. These models have
been superseded by Holmes-Featherstone attraction model available since 2013
in Orekit.
</action>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment