From 9c7231aba79a5ef51fdcf1c422e98bc8f6765dff Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Fri, 5 Feb 2021 11:06:07 -0700
Subject: [PATCH] Get observatory name from sheet
---
geomagio/residual/SpreadsheetSummaryFactory.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geomagio/residual/SpreadsheetSummaryFactory.py b/geomagio/residual/SpreadsheetSummaryFactory.py
index d27d439df..9d1e1f718 100644
--- a/geomagio/residual/SpreadsheetSummaryFactory.py
+++ b/geomagio/residual/SpreadsheetSummaryFactory.py
@@ -50,7 +50,7 @@ class SpreadsheetSummaryFactory(object):
readings = self._parse_readings(sheet, path)
return readings
- def _parse_metadata(self, sheet: openpyxl.worksheet, observatory: str) -> dict:
+ def _parse_metadata(self, sheet: openpyxl.worksheet) -> dict:
"""gather metadata from spreadsheet
Attributes
@@ -61,7 +61,7 @@ class SpreadsheetSummaryFactory(object):
date = sheet["I1"].value
date = f"{date.year}{date.month:02}{date.day:02}"
return {
- "observatory": observatory,
+ "observatory": sheet["D49"].value[0:3],
"pier_correction": sheet["C5"].value,
"instrument": sheet["B3"].value,
"date": date,
@@ -81,7 +81,7 @@ class SpreadsheetSummaryFactory(object):
List of valid readings from spreadsheet.
If all readings are valid, 4 readings are returned
"""
- metadata = self._parse_metadata(sheet, path.split("/")[-1][0:3])
+ metadata = self._parse_metadata(sheet)
date = sheet["I1"].value
base_date = f"{date.year}{date.month:02}{date.day:02}"
readings = []
--
GitLab