Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Orekit
Rugged
Commits
5b2ba4a1
Commit
5b2ba4a1
authored
Oct 21, 2022
by
Guylaine Prat
Browse files
In tutorial, rename unappropriate "incidence" angle into roll angle
parent
55da100d
Pipeline
#2634
passed with stages
in 5 minutes and 7 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
View file @
5b2ba4a1
...
...
@@ -84,9 +84,9 @@ public class InitGroundRefiningTest {
// Initialize refining context
// ---------------------------
final
String
sensorName
=
"line"
;
final
double
incidence
Angle
=
-
5.0
;
final
double
roll
Angle
=
-
5.0
;
final
String
date
=
"2016-01-01T11:59:50.0"
;
this
.
pleiadesViewingModel
=
new
PleiadesViewingModel
(
sensorName
,
incidence
Angle
,
date
);
this
.
pleiadesViewingModel
=
new
PleiadesViewingModel
(
sensorName
,
roll
Angle
,
date
);
PleiadesOrbitModel
orbitmodel
=
new
PleiadesOrbitModel
();
...
...
src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
View file @
5b2ba4a1
...
...
@@ -110,14 +110,14 @@ public class InitInterRefiningTest {
// Initialize refining context
// ---------------------------
final
String
sensorNameA
=
"SensorA"
;
final
double
incidence
AngleA
=
-
5.0
;
final
double
roll
AngleA
=
-
5.0
;
final
String
dateA
=
"2016-01-01T11:59:50.0"
;
this
.
pleiadesViewingModelA
=
new
PleiadesViewingModel
(
sensorNameA
,
incidence
AngleA
,
dateA
);
this
.
pleiadesViewingModelA
=
new
PleiadesViewingModel
(
sensorNameA
,
roll
AngleA
,
dateA
);
final
String
sensorNameB
=
"SensorB"
;
final
double
incidence
AngleB
=
0.0
;
final
double
roll
AngleB
=
0.0
;
final
String
dateB
=
"2016-01-01T12:02:50.0"
;
this
.
pleiadesViewingModelB
=
new
PleiadesViewingModel
(
sensorNameB
,
incidence
AngleB
,
dateB
);
this
.
pleiadesViewingModelB
=
new
PleiadesViewingModel
(
sensorNameB
,
roll
AngleB
,
dateB
);
PleiadesOrbitModel
orbitmodelA
=
new
PleiadesOrbitModel
();
PleiadesOrbitModel
orbitmodelB
=
new
PleiadesOrbitModel
();
...
...
src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
View file @
5b2ba4a1
...
...
@@ -28,21 +28,21 @@ public class PleiadesViewingModel {
private
static
final
int
DIMENSION
=
40000
;
private
static
final
double
LINE_PERIOD
=
1
.
e
-
4
;
private
double
incidence
Angle
;
private
double
roll
Angle
;
private
LineSensor
lineSensor
;
private
String
referenceDate
;
private
String
sensorName
;
/** PleiadesViewingModel constructor.
* @param sensorName sensor name
* @param
incidenceAngle incidence
angle
* @param
rollAngle roll
angle
* @param referenceDate reference date
*/
public
PleiadesViewingModel
(
final
String
sensorName
,
final
double
incidence
Angle
,
final
String
referenceDate
)
{
public
PleiadesViewingModel
(
final
String
sensorName
,
final
double
roll
Angle
,
final
String
referenceDate
)
{
this
.
sensorName
=
sensorName
;
this
.
referenceDate
=
referenceDate
;
this
.
incidenceAngle
=
incidence
Angle
;
this
.
rollAngle
=
roll
Angle
;
this
.
createLineSensor
();
}
...
...
@@ -63,10 +63,12 @@ public class PleiadesViewingModel {
*/
public
TimeDependentLOS
buildLOS
()
{
final
LOSBuilder
losBuilder
=
rawLOS
(
new
Rotation
(
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
incidenceAngle
),
RotationConvention
.
VECTOR_OPERATOR
).
applyTo
(
Vector3D
.
PLUS_K
),
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
FOV
/
2
),
DIMENSION
);
// Roll angle applied to the LOS
// Compute the transformation of vector K (Z axis) through the rotation around I (X axis) with the roll angle
// If roll angle = 0: vector center = vector K (Z axis)
final
LOSBuilder
losBuilder
=
rawLOS
(
new
Rotation
(
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
rollAngle
),
RotationConvention
.
VECTOR_OPERATOR
).
applyTo
(
Vector3D
.
PLUS_K
),
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
FOV
/
2
),
DIMENSION
);
losBuilder
.
addTransform
(
new
FixedRotation
(
sensorName
+
InitInterRefiningTest
.
rollSuffix
,
Vector3D
.
MINUS_I
,
0.00
));
losBuilder
.
addTransform
(
new
FixedRotation
(
sensorName
+
InitInterRefiningTest
.
pitchSuffix
,
Vector3D
.
MINUS_J
,
0.00
));
...
...
src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
View file @
5b2ba4a1
...
...
@@ -305,16 +305,16 @@ public class InterRefining extends Refining {
private
InterRefining
()
{
sensorNameA
=
"SensorA"
;
final
double
incidence
AngleA
=
-
5.0
;
final
double
roll
AngleA
=
-
5.0
;
final
String
dateA
=
"2016-01-01T11:59:50.0"
;
pleiadesViewingModelA
=
new
PleiadesViewingModel
(
sensorNameA
,
incidence
AngleA
,
dateA
);
pleiadesViewingModelA
=
new
PleiadesViewingModel
(
sensorNameA
,
roll
AngleA
,
dateA
);
sensorNameB
=
"SensorB"
;
final
double
incidence
AngleB
=
0.0
;
final
double
roll
AngleB
=
0.0
;
final
String
dateB
=
"2016-01-01T12:02:50.0"
;
pleiadesViewingModelB
=
new
PleiadesViewingModel
(
sensorNameB
,
incidence
AngleB
,
dateB
);
pleiadesViewingModelB
=
new
PleiadesViewingModel
(
sensorNameB
,
roll
AngleB
,
dateB
);
}
...
...
src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
View file @
5b2ba4a1
...
...
@@ -52,7 +52,7 @@ public class PleiadesViewingModel {
private
static
final
int
DIMENSION
=
40000
;
private
static
final
double
LINE_PERIOD
=
1
.
e
-
4
;
private
double
a
ngle
;
private
double
rollA
ngle
;
private
LineSensor
lineSensor
;
private
String
date
;
...
...
@@ -62,7 +62,7 @@ public class PleiadesViewingModel {
/** Simple constructor.
* <p>
* initialize PleiadesViewingModel with
* sensorName="line",
incidence
Angle = 0.0, date = "2016-01-01T12:00:00.0"
* sensorName="line",
roll
Angle = 0.0, date = "2016-01-01T12:00:00.0"
* </p>
*/
public
PleiadesViewingModel
(
final
String
sensorName
)
{
...
...
@@ -72,14 +72,14 @@ public class PleiadesViewingModel {
/** PleiadesViewingModel constructor.
* @param sensorName sensor name
* @param
incidenceAngle incidence
angle
* @param
rollAngle roll
angle
* @param referenceDate reference date
*/
public
PleiadesViewingModel
(
final
String
sensorName
,
final
double
incidence
Angle
,
final
String
referenceDate
)
{
public
PleiadesViewingModel
(
final
String
sensorName
,
final
double
roll
Angle
,
final
String
referenceDate
)
{
this
.
sensorName
=
sensorName
;
this
.
date
=
referenceDate
;
this
.
a
ngle
=
incidence
Angle
;
this
.
rollA
ngle
=
roll
Angle
;
this
.
createLineSensor
();
}
...
...
@@ -99,9 +99,12 @@ public class PleiadesViewingModel {
/** Build a LOS provider
*/
public
TimeDependentLOS
buildLOS
()
{
// Roll angle applied to the LOS
// Compute the transformation of vector K (Z axis) through the rotation around I (X axis) with the roll angle
// If roll angle = 0: vector center = vector K (Z axis)
final
LOSBuilder
losBuilder
=
rawLOS
(
new
Rotation
(
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
this
.
a
ngle
),
FastMath
.
toRadians
(
this
.
rollA
ngle
),
RotationConvention
.
VECTOR_OPERATOR
).
applyTo
(
Vector3D
.
PLUS_K
),
Vector3D
.
PLUS_I
,
FastMath
.
toRadians
(
FOV
/
2
),
DIMENSION
);
...
...
Write
Preview
Supports
Markdown
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