Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Orekit
Orekit tutorials
Commits
3bdc5f1a
Commit
3bdc5f1a
authored
Oct 29, 2020
by
Bryan Cazabonne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated tutorial after a change in Orekit.
parent
f83522b5
Pipeline
#682
passed with stages
in 2 minutes and 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
14 deletions
+8
-14
src/main/java/org/orekit/tutorials/estimation/common/AbstractOrbitDetermination.java
...torials/estimation/common/AbstractOrbitDetermination.java
+8
-14
No files found.
src/main/java/org/orekit/tutorials/estimation/common/AbstractOrbitDetermination.java
View file @
3bdc5f1a
...
...
@@ -82,6 +82,7 @@ import org.orekit.estimation.sequential.KalmanEstimator;
import
org.orekit.estimation.sequential.KalmanEstimatorBuilder
;
import
org.orekit.files.ilrs.CRDFile
;
import
org.orekit.files.ilrs.CRDFile.CRDDataBlock
;
import
org.orekit.files.ilrs.CRDFile.Meteo
;
import
org.orekit.files.ilrs.CRDFile.MeteorologicalMeasurement
;
import
org.orekit.files.ilrs.CRDFile.RangeMeasurement
;
import
org.orekit.files.ilrs.CRDHeader
;
...
...
@@ -141,8 +142,6 @@ import org.orekit.propagation.conversion.DormandPrince853IntegratorBuilder;
import
org.orekit.propagation.conversion.IntegratedPropagatorBuilder
;
import
org.orekit.propagation.conversion.ODEIntegratorBuilder
;
import
org.orekit.time.AbsoluteDate
;
import
org.orekit.time.DateComponents
;
import
org.orekit.time.TimeComponents
;
import
org.orekit.time.TimeScale
;
import
org.orekit.time.TimeScalesFactory
;
import
org.orekit.tutorials.yaml.TutorialBatchLSEstimator
;
...
...
@@ -2109,18 +2108,11 @@ public abstract class AbstractOrbitDetermination<T extends IntegratedPropagatorB
// Header
final
CRDHeader
header
=
block
.
getHeader
();
// Measurement year ; month and day component
final
DateComponents
rangeDateC
=
header
.
getStartEpoch
().
getComponents
(
parser
.
getTimeScale
()).
getDate
();
// Wavelength (meters)
final
double
wavelength
=
block
.
getConfigurationRecords
().
getSystemRecord
().
getWavelength
();
// Meteo data
final
List
<
MeteorologicalMeasurement
>
meteoData
=
block
.
getMeteoData
();
MeteorologicalMeasurement
meteo
=
null
;
if
(
meteoData
.
size
()
>
0
)
{
meteo
=
meteoData
.
get
(
0
);
}
final
Meteo
meteo
=
block
.
getMeteoData
();
// Station data
final
StationData
stationData
=
stations
.
get
(
String
.
valueOf
(
header
.
getSystemIdentifier
()));
...
...
@@ -2132,8 +2124,8 @@ public abstract class AbstractOrbitDetermination<T extends IntegratedPropagatorB
final
double
timeOfFlight
=
range
.
getTimeOfFlight
();
// Transmit time
final
AbsoluteDate
transmitTime
=
new
AbsoluteDate
(
rangeDateC
,
new
TimeComponents
(
range
.
getSecOfDay
()),
parser
.
getTimeScale
());
final
AbsoluteDate
transmitTime
=
range
.
getDate
();
// If epoch corresponds to bounce time, take into consideration the time of flight to compute the transmit time
if
(
range
.
getEpochEvent
()
==
1
)
{
transmitTime
.
shiftedBy
(-
0.5
*
timeOfFlight
);
...
...
@@ -2155,10 +2147,12 @@ public abstract class AbstractOrbitDetermination<T extends IntegratedPropagatorB
final
Range
measurement
=
new
Range
(
stationData
.
getStation
(),
twoWays
,
receivedTime
,
rangeValue
,
stationData
.
getRangeSigma
(),
weights
.
getRangeBaseWeight
(),
satellite
);
// Meteo record for the current epoch
final
MeteorologicalMeasurement
meteoData
=
meteo
.
getMeteo
(
receivedTime
);
// Tropospheric model
final
DiscreteTroposphericModel
model
;
if
(
meteo
!=
null
)
{
model
=
new
MendesPavlisModel
(
meteo
.
getTemperature
(),
meteo
.
getPressure
()
*
1000.0
,
0.01
*
meteo
.
getHumidity
(),
if
(
meteo
Data
!=
null
)
{
model
=
new
MendesPavlisModel
(
meteo
Data
.
getTemperature
(),
meteo
Data
.
getPressure
()
*
1000.0
,
0.01
*
meteo
Data
.
getHumidity
(),
stationData
.
getStation
().
getBaseFrame
().
getPoint
().
getLatitude
(),
wavelength
*
1.0e6
);
}
else
{
model
=
MendesPavlisModel
.
getStandardModel
(
stationData
.
getStation
().
getBaseFrame
().
getPoint
().
getLatitude
(),
wavelength
*
1.0e6
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment