From 4ba5ebb2f4ed1f93f67368bc9978afbcf133f6c0 Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Tue, 13 Jun 2023 16:10:21 -0600
Subject: [PATCH] Removed trimming of base_directory in spreadsheet factories.
Caused a critical error.
---
geomagio/residual/SpreadsheetAbsolutesFactory.py | 2 +-
geomagio/residual/SpreadsheetSummaryFactory.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/geomagio/residual/SpreadsheetAbsolutesFactory.py b/geomagio/residual/SpreadsheetAbsolutesFactory.py
index e9cbc860..f1c42aaa 100644
--- a/geomagio/residual/SpreadsheetAbsolutesFactory.py
+++ b/geomagio/residual/SpreadsheetAbsolutesFactory.py
@@ -304,7 +304,7 @@ class SpreadsheetAbsolutesFactory(object):
def __init__(self, base_directory="/Volumes/geomag/pub/observatories"):
# trim filename off base_directory
- self.base_directory = os.path.dirname(base_directory)
+ self.base_directory = base_directory
def get_readings(
self,
diff --git a/geomagio/residual/SpreadsheetSummaryFactory.py b/geomagio/residual/SpreadsheetSummaryFactory.py
index ba3b6c98..11a356f1 100644
--- a/geomagio/residual/SpreadsheetSummaryFactory.py
+++ b/geomagio/residual/SpreadsheetSummaryFactory.py
@@ -40,7 +40,7 @@ class SpreadsheetSummaryFactory(object):
"""Read absolutes from summary spreadsheets"""
def __init__(self, base_directory: str):
- self.base_directory = os.path.dirname(base_directory)
+ self.base_directory = base_directory
def get_readings(
self, observatory: str, starttime: UTCDateTime, endtime: UTCDateTime
--
GitLab