Update daignostics for calculation and spreadsheets

geomagio/residual/Calculation.py

@@ -43,18 +43,14 @@ def calculate(reading: Reading, adjust_reference: bool = True) -> Reading:
         mean=i_mean,
         reference=adjust_reference and reference or None,
     )
-    absoluteD, d_mean, m_mean = calculate_D_absolute(
+    absoluteD, meridian = calculate_D_absolute(
         azimuth=reading.azimuth,
         h_baseline=absoluteH.baseline,
         measurements=reading.measurements,
         reference=adjust_reference and reference or None,
     )
     # populate diagnostics object with averaged measurements
-    diagnostics = Diagnostics(
-        inclination_measurement=i_mean,
-        declination_measurement=d_mean,
-        mark_measurement=m_mean,
-    )
+    diagnostics = Diagnostics(inclination=inclination, meridian=meridian,)
     # calculate scale
     scale_value = None
     scale_measurements = reading[mt.NORTH_DOWN_SCALE]
@@ -139,8 +135,7 @@ def calculate_D_absolute(
             starttime=mean.time,
             endtime=mean.endtime,
         ),
-        mean,
-        average_mark,
+        meridian,
     )
 
 

geomagio/residual/Diagnostics.py

@@ -9,11 +9,9 @@ class Diagnostics(BaseModel):
 
     Attributes
     ----------
-    inclination_measurement: Average of inclination measurements
-    declination_measurement: Average of declination measurements
-    mark_measurement: Average of mark measurements
+    inclination: Average of inclination measurements
+    meridian: Calculated meridian value
     """
 
-    inclination_measurement: Measurement
-    declination_measurement: Measurement
-    mark_measurement: Measurement
+    inclination: float
+    meridian: float

geomagio/residual/SpreadsheetAbsolutesFactory.py

@@ -303,7 +303,7 @@ class SpreadsheetAbsolutesFactory(object):
             metadata=metadata,
             pier_correction=metadata["pier_correction"],
             scale_value=numpy.degrees(metadata["scale_value"]),
-            diagnostics=self._parse_diagnostics(measurements),
+            diagnostics=self._parse_diagnostics(calculation_sheet),
         )
 
     def _parse_absolutes(
@@ -407,19 +407,11 @@ class SpreadsheetAbsolutesFactory(object):
             "precision": measurement_sheet["H8"].value,
         }
 
-    def _parse_diagnostics(self, measurements: List[Measurement],) -> Diagnostics:
+    def _parse_diagnostics(self, sheet: openpyxl.worksheet,) -> Diagnostics:
         """
         Gather diagnostics from list of measurements
         """
-        return Diagnostics(
-            inclination_measurement=average_measurement(
-                measurements, INCLINATION_TYPES
-            ),
-            declination_measurement=average_measurement(
-                measurements, DECLINATION_TYPES
-            ),
-            mark_measurement=average_measurement(measurements, MARK_TYPES),
-        )
+        return Diagnostics(inclination=sheet["H40"].value, meridian=sheet["E36"].value,)
 
 
 def convert_precision(angle, precision="DMS"):