Skip to content
Snippets Groups Projects
Commit 558374cf authored by Moritz's avatar Moritz
Browse files

Removed a not very useful setting method

parent 6e15c362
No related branches found
No related tags found
1 merge request!474Refactor strain data
Pipeline #60731 passed
...@@ -408,9 +408,9 @@ class InterferometerStrainData(object): ...@@ -408,9 +408,9 @@ class InterferometerStrainData(object):
else: else:
raise ValueError( raise ValueError(
"Insufficient information given to set arrays") "Insufficient information given to set arrays")
self._set_time_and_frequency_array_parameters(duration=duration, self._times_and_frequencies = CoupledTimeAndFrequencySeries(duration=duration,
sampling_frequency=sampling_frequency, sampling_frequency=sampling_frequency,
start_time=start_time) start_time=start_time)
def set_from_time_domain_strain( def set_from_time_domain_strain(
self, time_domain_strain, sampling_frequency=None, duration=None, self, time_domain_strain, sampling_frequency=None, duration=None,
...@@ -463,9 +463,10 @@ class InterferometerStrainData(object): ...@@ -463,9 +463,10 @@ class InterferometerStrainData(object):
logger.debug('Setting data using provided gwpy TimeSeries object') logger.debug('Setting data using provided gwpy TimeSeries object')
if type(time_series) != gwpy.timeseries.TimeSeries: if type(time_series) != gwpy.timeseries.TimeSeries:
raise ValueError("Input time_series is not a gwpy TimeSeries") raise ValueError("Input time_series is not a gwpy TimeSeries")
self._set_time_and_frequency_array_parameters(duration=time_series.duration.value, self._times_and_frequencies = \
sampling_frequency=time_series.sample_rate.value, CoupledTimeAndFrequencySeries(duration=time_series.duration.value,
start_time=time_series.epoch.value) sampling_frequency=time_series.sample_rate.value,
start_time=time_series.epoch.value)
self._time_domain_strain = time_series.value self._time_domain_strain = time_series.value
self._frequency_domain_strain = None self._frequency_domain_strain = None
self._channel = time_series.channel self._channel = time_series.channel
...@@ -570,10 +571,9 @@ class InterferometerStrainData(object): ...@@ -570,10 +571,9 @@ class InterferometerStrainData(object):
""" """
self._set_time_and_frequency_array_parameters(duration=duration, self._times_and_frequencies = CoupledTimeAndFrequencySeries(duration=duration,
sampling_frequency=sampling_frequency, sampling_frequency=sampling_frequency,
start_time=start_time) start_time=start_time)
logger.debug( logger.debug(
'Setting data using noise realization from provided' 'Setting data using noise realization from provided'
'power_spectal_density') 'power_spectal_density')
...@@ -600,10 +600,9 @@ class InterferometerStrainData(object): ...@@ -600,10 +600,9 @@ class InterferometerStrainData(object):
""" """
self._set_time_and_frequency_array_parameters(duration=duration, self._times_and_frequencies = CoupledTimeAndFrequencySeries(duration=duration,
sampling_frequency=sampling_frequency, sampling_frequency=sampling_frequency,
start_time=start_time) start_time=start_time)
logger.debug('Setting zero noise data') logger.debug('Setting zero noise data')
self._frequency_domain_strain = np.zeros_like(self.frequency_array, self._frequency_domain_strain = np.zeros_like(self.frequency_array,
dtype=np.complex) dtype=np.complex)
...@@ -631,9 +630,9 @@ class InterferometerStrainData(object): ...@@ -631,9 +630,9 @@ class InterferometerStrainData(object):
""" """
self._set_time_and_frequency_array_parameters(duration=duration, self._times_and_frequencies = CoupledTimeAndFrequencySeries(duration=duration,
sampling_frequency=sampling_frequency, sampling_frequency=sampling_frequency,
start_time=start_time) start_time=start_time)
logger.info('Reading data from frame file {}'.format(frame_file)) logger.info('Reading data from frame file {}'.format(frame_file))
strain = gwutils.read_frame_file( strain = gwutils.read_frame_file(
...@@ -642,8 +641,3 @@ class InterferometerStrainData(object): ...@@ -642,8 +641,3 @@ class InterferometerStrainData(object):
resample=sampling_frequency) resample=sampling_frequency)
self.set_from_gwpy_timeseries(strain) self.set_from_gwpy_timeseries(strain)
def _set_time_and_frequency_array_parameters(self, duration, sampling_frequency, start_time):
self._times_and_frequencies = CoupledTimeAndFrequencySeries(duration=duration,
sampling_frequency=sampling_frequency,
start_time=start_time)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment