Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
86040c15
Commit
86040c15
authored
4 years ago
by
Cain, Payton David
Browse files
Options
Downloads
Patches
Plain Diff
Set magnetic_azimuth to shifted azimuth
parent
99a999c7
No related branches found
No related tags found
2 merge requests
!146
Release CMO metadata to production
,
!33
Residual diagnostics
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
geomagio/residual/Calculation.py
+9
-4
9 additions, 4 deletions
geomagio/residual/Calculation.py
with
9 additions
and
4 deletions
geomagio/residual/Calculation.py
+
9
−
4
View file @
86040c15
...
@@ -41,7 +41,7 @@ def calculate(reading: Reading, adjust_reference: bool = True) -> Reading:
...
@@ -41,7 +41,7 @@ def calculate(reading: Reading, adjust_reference: bool = True) -> Reading:
mean
=
mean
,
mean
=
mean
,
reference
=
adjust_reference
and
reference
or
None
,
reference
=
adjust_reference
and
reference
or
None
,
)
)
absoluteD
,
average_mark
,
meridian
,
azimuth
,
ma
rk
_azimuth
=
calculate_D_absolute
(
absoluteD
,
average_mark
,
meridian
,
azimuth
,
ma
gnetic
_azimuth
=
calculate_D_absolute
(
azimuth
=
reading
.
azimuth
,
azimuth
=
reading
.
azimuth
,
h_baseline
=
absoluteH
.
baseline
,
h_baseline
=
absoluteH
.
baseline
,
measurements
=
reading
.
measurements
,
measurements
=
reading
.
measurements
,
...
@@ -59,8 +59,8 @@ def calculate(reading: Reading, adjust_reference: bool = True) -> Reading:
...
@@ -59,8 +59,8 @@ def calculate(reading: Reading, adjust_reference: bool = True) -> Reading:
diagnostics
=
Diagnostics
(
diagnostics
=
Diagnostics
(
meridian
=
meridian
,
meridian
=
meridian
,
mean_mark
=
average_mark
,
mean_mark
=
average_mark
,
magnetic_azimuth
=
azimuth
,
magnetic_azimuth
=
magnetic_
azimuth
,
mark_azimuth
=
mark_
azimuth
,
mark_azimuth
=
azimuth
,
declination
=
absoluteD
.
absolute
,
declination
=
absoluteD
.
absolute
,
inclination
=
inclination
,
inclination
=
inclination
,
h_component
=
absoluteH
.
absolute
,
h_component
=
absoluteH
.
absolute
,
...
@@ -132,6 +132,11 @@ def calculate_D_absolute(
...
@@ -132,6 +132,11 @@ def calculate_D_absolute(
d_b
=
(
meridian
-
average_mark
)
+
azimuth
+
shift
d_b
=
(
meridian
-
average_mark
)
+
azimuth
+
shift
# calculate absolute
# calculate absolute
d_abs
=
d_b
+
np
.
degrees
(
np
.
arctan
(
reference
.
e
/
(
reference
.
h
+
h_baseline
)))
d_abs
=
d_b
+
np
.
degrees
(
np
.
arctan
(
reference
.
e
/
(
reference
.
h
+
h_baseline
)))
# for diagnostics
if
average_mark
>
180
:
average_mark
-=
90
return
(
return
(
Absolute
(
Absolute
(
element
=
"
D
"
,
element
=
"
D
"
,
...
@@ -143,8 +148,8 @@ def calculate_D_absolute(
...
@@ -143,8 +148,8 @@ def calculate_D_absolute(
),
),
average_mark
,
average_mark
,
meridian
,
meridian
,
azimuth
,
mark_azimuth
,
mark_azimuth
,
azimuth
,
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment