diff --git a/bin/prepfiles.py b/bin/prepfiles.py index abc1d631123dad5d28c5f587048c667f29bc47a2..d509d5331a62f723c6ce09d6f5e48197126b6075 100644 --- a/bin/prepfiles.py +++ b/bin/prepfiles.py @@ -1,10 +1,9 @@ -from __future__ import absolute_import +from os import path +import os +import sys from datetime import datetime from dateutil.relativedelta import relativedelta -import sys -from os import path -import os from obspy.core import UTCDateTime # ensure geomag is on the path before importing @@ -14,11 +13,13 @@ except ImportError: script_dir = path.dirname(path.abspath(__file__)) sys.path.append(path.normpath(path.join(script_dir, ".."))) -from geomagio.residual import WebAbsolutesFactory, CalFileFactory -from geomagio.pcdcp.PCDCPFactory import PCDCPFactory, PCDCP_FILE_PATTERN from geomagio.edge.EdgeFactory import EdgeFactory +from geomagio.pcdcp import PCDCPFactory, PCDCP_FILE_PATTERN +from geomagio.residual import WebAbsolutesFactory, CalFileFactory CAL_FILENAME_FORMAT = "{OBSERVATORY}{YEAR}PCD.cal" +MIN_TEMPLATE = "file://c:/USGSDCP/%(OBS)s/" + PCDCP_FILE_PATTERN +RAW_TEMPLATE = "file://c:/RAW/%(OBS)s/" + PCDCP_FILE_PATTERN if len(sys.argv) != 4: cmd = sys.argv[0] @@ -79,9 +80,6 @@ min_timeseries = edge_factory.get_timeseries( type="variation", ) -RAW_TEMPLATE = "file://c:/RAW/%(OBS)s/" + PCDCP_FILE_PATTERN -MIN_TEMPLATE = "file://c:/USGSDCP/%(OBS)s/" + PCDCP_FILE_PATTERN - raw_factory = PCDCPFactory( observatory=OBSERVATORY, channels=channels, diff --git a/geomagio/pcdcp/__init__.py b/geomagio/pcdcp/__init__.py index a391ac9c6f19e68c517f4fee2897a92d2a3bbcf8..fc819c4ab539afd1a2d8c19e3d8abfbb0a550dbb 100644 --- a/geomagio/pcdcp/__init__.py +++ b/geomagio/pcdcp/__init__.py @@ -3,9 +3,16 @@ from __future__ import absolute_import from .PCDCPFactory import PCDCPFactory +from .PCDCPFactory import PCDCP_FILE_PATTERN from .StreamPCDCPFactory import StreamPCDCPFactory from .PCDCPParser import PCDCPParser from .PCDCPWriter import PCDCPWriter -__all__ = ["PCDCPFactory", "StreamPCDCPFactory", "PCDCPParser", "PCDCPWriter"] +__all__ = [ + "PCDCPFactory", + "PCDCP_FILE_PATTERN", + "StreamPCDCPFactory", + "PCDCPParser", + "PCDCPWriter", +]