Update time window to use UTCDateTime internally, since ObsPy requires it in more places #115

Author: aclark73

pyweed/pyweed_utils.py

@@ -16,6 +16,7 @@
 import logging
 import re
 from pyproj import Geod
+from obspy import UTCDateTime
 from obspy.taup.tau import TauPyModel
 from urllib.parse import urlencode
 
@@ -259,11 +260,13 @@ def calculate_window(self, event_time, arrivals):
         Given an event time and a dictionary of arrival times (see Distances below)
         calculate the full time window
         """
+        start_offset = arrivals.get(self.start_phase, 0) - self.start_offset
+        end_offset = arrivals.get(self.end_phase, 0) + self.end_offset
         return (
             # Start time
-            event_time + arrivals.get(self.start_phase, 0) - self.start_offset,
+            UTCDateTime(event_time + start_offset),
             # End time
-            event_time + arrivals.get(self.end_phase, 0) + self.end_offset,
+            UTCDateTime(event_time + end_offset),
         )
 
     def __eq__(self, other):

pyweed/waveforms_handler.py

@@ -121,8 +121,8 @@ def prepare(self):
 
         (self.start_time, self.end_time) = self.time_window.calculate_window(
             self.event_time, self.arrivals)
-        self.start_string = UTCDateTime(self.start_time).format_iris_web_service().replace(':', '_')
-        self.end_string = UTCDateTime(self.end_time).format_iris_web_service().replace(':', '_')
+        self.start_string = self.start_time.format_iris_web_service().replace(':', '_')
+        self.end_string = self.end_time.format_iris_web_service().replace(':', '_')
 
         self.base_filename = "%s_%s_%s" % (self.sncl, self.start_string, self.end_string)
         self.mseed_path = os.path.join(self.download_dir, "%s.mseed" % self.base_filename)
@@ -185,7 +185,7 @@ def load_waveform(client, waveform):
             })
             LOGGER.info("Retrieving waveform data for %s from %s", waveform_id, service_url)
             st = client.get_waveforms(
-                network, station, location, channel, waveform.start_string, waveform.end_string)
+                network, station, location, channel, waveform.start_time, waveform.end_time)
             # Write to file
             st.write(mseedFile, format="MSEED")