Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
common
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Alexander Lapshin
common
Commits
b34ad36c
Commit
b34ad36c
authored
Sep 29, 2020
by
Alexander Lapshin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aberration method
parent
afdd399e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
22 deletions
+9
-22
OpticMeasurement.cpp
bnolib/OpticMeasurement.cpp
+3
-8
OpticMeasurement.h
bnolib/OpticMeasurement.h
+6
-14
No files found.
bnolib/OpticMeasurement.cpp
View file @
b34ad36c
...
...
@@ -178,7 +178,7 @@ CAA2DCoordinate EquatorialAberration(double Alpha, double Delta, double JD)
OpticMeasurement
::
OpticMeasurement
()
:
AFreeMeasurement
()
{
Type
=
mtOptic
;
IsCorrected
=
true
;
m_aberation_method
=
aberration_method
::
NONE
;
m_isBad
=
false
;
RecPosFrInit
=
false
;
VAlpha
=
0
;
...
...
@@ -410,15 +410,10 @@ void OpticMeasurement::AberrationCorrect(double alpha, double delta, TimeJD date
//-----------------------------------------------------------------------------
// Коррекция с учетом звездной аберрации
//-----------------------------------------------------------------------------
void
OpticMeasurement
::
Correct
(
aberration_method
ab
)
void
OpticMeasurement
::
Correct
(
const
aberration_method
&
ab
)
{
if
(
IsCorrected
||
ab
==
aberration_method
::
NONE
)
{
return
;
}
AberrationCorrect
(
Alpha
,
Delta
,
MTime
,
false
,
ab
,
Alpha
,
Delta
);
IsCorrected
=
true
;
m_aberation_method
=
ab
;
}
/////////////////////////////////////////////////////////////////////////////////
...
...
bnolib/OpticMeasurement.h
View file @
b34ad36c
...
...
@@ -80,18 +80,11 @@ public:
// bool SimulateEx(int matrixSize, ITraject &trj, TimeJD &t, Vect6 &f, double* v, double *del) const;
virtual
bool
DetectPositionEx
(
ITraject
&
trj
,
TimeJD
&
t
,
Vect6
&
f
)
const
{
return
false
;
};
// Установка флага коррекции аберрации
void
SetCorrectFlag
(
bool
f
)
{
IsCorrected
=
f
;
};
// Получение флага коррекции аберрации
bool
GetCorrectFlag
()
const
{
return
IsCorrected
;
};
const
aberration_method
&
get_aberation_method
()
const
{
return
m_aberation_method
;
}
// Коррекция с учетом звездной аберрации
void
Correct
(
aberration_method
ab
);
void
Correct
(
const
aberration_method
&
ab
);
// Получение координат станции в Гринвиче
virtual
const
Vect3
&
GetStationCoord
()
const
=
0
;
...
...
@@ -109,13 +102,12 @@ public:
static
void
AberrationCorrect
(
double
alpha
,
double
delta
,
TimeJD
date
,
bool
backwardCorrection
,
aberration_method
ab
,
double
&
correctedAlpha
,
double
&
correctedDelta
);
protected
:
// Флаг учета аберрации
bool
IsCorrected
;
Vect3
RecPosFr
;
bool
RecPosFrInit
;
bool
m_isBad
;
// Флаг учета аберрации
aberration_method
m_aberation_method
;
};
///////////////////////////////////////////////////////////////////////////////
...
...
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