From 0cccefe8c732fa4ae80f77039480feb86675ebfe Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Thu, 16 Mar 2023 11:18:11 -0600
Subject: [PATCH] Removed valid requirements, added valid as attribute to
Absolutes
---
.../residual/SpreadsheetSummaryFactory.py | 23 ++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/geomagio/residual/SpreadsheetSummaryFactory.py b/geomagio/residual/SpreadsheetSummaryFactory.py
index 7a1f5082c..fe6b4fdf1 100644
--- a/geomagio/residual/SpreadsheetSummaryFactory.py
+++ b/geomagio/residual/SpreadsheetSummaryFactory.py
@@ -101,6 +101,7 @@ class SpreadsheetSummaryFactory(object):
endtime=parse_relative_time(
base_date, "{0:04d}".format(sheet[f"B{d_n}"].value)
),
+ valid=not bool(sheet[f"J{d_n}"].value),
),
Absolute(
element="H",
@@ -112,6 +113,7 @@ class SpreadsheetSummaryFactory(object):
endtime=parse_relative_time(
base_date, "{0:04d}".format(sheet[f"B{h_n}"].value)
),
+ valid=not bool(sheet[f"J{h_n}"].value),
),
Absolute(
element="Z",
@@ -123,19 +125,14 @@ class SpreadsheetSummaryFactory(object):
endtime=parse_relative_time(
base_date, "{0:04d}".format(sheet[f"B{v_n}"].value)
),
+ valid=not bool(sheet[f"J{d_n}"].value),
),
]
- valid = [
- sheet[f"J{d_n}"].value,
- sheet[f"J{h_n}"].value,
- sheet[f"J{d_n}"].value,
- ]
- if valid == [None, None, None]:
- readings.append(
- Reading(
- metadata=metadata,
- absolutes=absolutes,
- pier_correction=metadata["pier_correction"],
- ),
- )
+ readings.append(
+ Reading(
+ metadata=metadata,
+ absolutes=absolutes,
+ pier_correction=metadata["pier_correction"],
+ ),
+ )
return readings
--
GitLab