revert

Author: ahnitz

pycbc/types/timeseries.py

@@ -19,14 +19,18 @@
 """
 import os as _os
 import h5py
+
+import numpy as _numpy
+from scipy.io.wavfile import write as write_wav
+
 from pycbc.types.array import Array, _convert, complex_same_precision_as, zeros
+from pycbc.types.utils import determine_epoch
 from pycbc.types.array import _nocomplex
 from pycbc.types.frequencyseries import FrequencySeries
 from pycbc.types import float32, float64
-import lal as _lal
-import numpy as _numpy
-from scipy.io.wavfile import write as write_wav
+from pycbc.libutils import import_optional
 
+_lal = import_optional('lal')
 
 class TimeSeries(Array):
     """Models a time series consisting of uniformly sampled scalar values.
@@ -46,7 +50,7 @@ class TimeSeries(Array):
     """
 
     def __init__(self, initial_array, delta_t=None,
-                 epoch=None, dtype=None, copy=True):
+                 epoch="", dtype=None, copy=True):
         if len(initial_array) < 1:
             raise ValueError('initial_array must contain at least one sample.')
         if delta_t is None:
@@ -57,20 +61,7 @@ def __init__(self, initial_array, delta_t=None,
         if not delta_t > 0:
             raise ValueError('delta_t must be a positive number')
 
-        # Get epoch from initial_array if epoch not given (or is None)
-        # If initialy array has no epoch, set epoch to 0.
-        # If epoch is provided, use that.
-        if not isinstance(epoch, _lal.LIGOTimeGPS):
-            if epoch is None:
-                if isinstance(initial_array, TimeSeries):
-                    epoch = initial_array._epoch
-                else:
-                    epoch = _lal.LIGOTimeGPS(0)
-            elif epoch is not None:
-                try:
-                    epoch = _lal.LIGOTimeGPS(epoch)
-                except:
-                    raise TypeError('epoch must be either None or a lal.LIGOTimeGPS')
+        self._epoch = determine_epoch(epoch, initial_array)
         Array.__init__(self, initial_array, dtype=dtype, copy=copy)
         self._delta_t = delta_t
         self._epoch = epoch
@@ -91,6 +82,8 @@ def to_astropy(self, name='pycbc'):
 
     def epoch_close(self, other):
         """ Check if the epoch is close enough to allow operations """
+        if self._epoch is None or other._epoch is None:
+                    return False
         dt = abs(float(self.start_time - other.start_time))
         return dt <= 1e-7
 
@@ -125,8 +118,8 @@ def _typecheck(self, other):
                     self.start_time, other.start_time))
 
     def _getslice(self, index):
-        # Set the new epoch---note that index.start may also be None
-        if index.start is None:
+        # Set the new epoch - index.start or self._epoch may be None
+        if index.start is None or self._epoch is None:
             new_epoch = self._epoch
         else:
             if index.start < 0:
@@ -209,7 +202,7 @@ def time_slice(self, start, end, mode='floor'):
 
     @property
     def delta_f(self):
-        """Return the delta_f this ts would have in the frequency domain
+        """Return time series start time.
         """
         return 1.0 / self.duration
 
@@ -223,14 +216,14 @@ def start_time(self):
     def start_time(self, time):
         """ Set the start time
         """
-        self._epoch = _lal.LIGOTimeGPS(time)
+        self._epoch = float64(time)
 
     def get_end_time(self):
-        """Return time series end time as a LIGOTimeGPS.
+        """Return time series end time.
         """
         return self._epoch + self.get_duration()
     end_time = property(get_end_time,
-                        doc="Time series end time as a LIGOTimeGPS.")
+                        doc="Time series end time.")
 
     def get_sample_times(self):
         """Return an Array containing the sample times.
@@ -491,7 +484,7 @@ def lal(self):
             If time series is stored in GPU memory.
         """
         lal_data = None
-        ep = self._epoch
+        ep = _lal.LIGOTimeGPS(self._epoch)
 
         if self._data.dtype == _numpy.float32:
             lal_data = _lal.CreateREAL4TimeSeries("",ep,0,self.delta_t,_lal.SecondUnit,len(self))