Fix comments, imports, and spacing. Add diagnostics to testing

Calculation_test.py

@@ -43,3 +43,30 @@ for filename in os.listdir("etc/residual"):
             err_msg="Baselines not within 4 decimals",
             verbose=True,
         )
+    # gather original and resulting diagnostics
+    o_diagnostics = original.diagnostics
+    r_diagnostics = original.diagnostics
+    # test mean mark values
+    assert_almost_equal(
+        o_diagnostics.mean_mark,
+        r_diagnostics.mean_mark,
+        decimal=2,
+        err_msg="Baselines not within 4 decimals",
+        verbose=True,
+    )
+    # test magnetic azimuth values
+    assert_almost_equal(
+        o_diagnostics.magnetic_azimuth,
+        r_diagnostics.magnetic_azimuth,
+        decimal=2,
+        err_msg="Baselines not within 4 decimals",
+        verbose=True,
+    )
+    # test meridian values
+    assert_almost_equal(
+        o_diagnostics.meridian,
+        r_diagnostics.meridian,
+        decimal=2,
+        err_msg="Baselines not within 4 decimals",
+        verbose=True,
+    )

geomagio/residual/Diagnostics.py

@@ -8,14 +8,9 @@ class Diagnostics(BaseModel):
 
     Attributes
     ----------
-    meridian: claculated from declination measurements
+    meridian: calculated from declination measurements
     mean_mark: average mark angles from measurements
     magnetic_azimuh: after adjustment
-    mark_azimuth: from metadata
-    declination: from declination measurements
-    inclination: from inclination measurements
-    h_component: H baseline from calculations
-    z_component: Z baseline from calculations
     """
 
     meridian: float = None

geomagio/residual/SpreadsheetAbsolutesFactory.py

@@ -6,11 +6,11 @@ from obspy.core import UTCDateTime
 import openpyxl
 
 from .Absolute import Absolute
+from .Calculation import DECLINATION_TYPES, MARK_TYPES, average_measurement
+from .Diagnostics import Diagnostics
 from .Measurement import Measurement
 from .MeasurementType import MeasurementType as mt
 from .Reading import Reading
-from .Diagnostics import Diagnostics
-from .Calculation import DECLINATION_TYPES, MARK_TYPES, average_measurement
 from . import Angle
 
 
@@ -411,7 +411,6 @@ class SpreadsheetAbsolutesFactory(object):
         meridian = average_measurement(measurements, DECLINATION_TYPES).angle
 
         magnetic_azimuth = mean_mark - meridian
-
         if meridian > 180:
             magnetic_azimuth = mean_mark - (meridian - 90)
         if mean_mark > 180: