Skip to content
Snippets Groups Projects
Commit 86040c15 authored by Cain, Payton David's avatar Cain, Payton David
Browse files

Set magnetic_azimuth to shifted azimuth

parent 99a999c7
No related branches found
No related tags found
2 merge requests!146Release CMO metadata to production,!33Residual diagnostics
...@@ -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, mark_azimuth = calculate_D_absolute( absoluteD, average_mark, meridian, azimuth, magnetic_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,
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment