Skip to content
Snippets Groups Projects
Commit efb585f3 authored by Colm Talbot's avatar Colm Talbot Committed by Gregory Ashton
Browse files

make frequency mask caching work

parent b2f00873
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,7 @@ class InterferometerStrainData(object): ...@@ -56,7 +56,7 @@ class InterferometerStrainData(object):
self._times_and_frequencies = CoupledTimeAndFrequencySeries() self._times_and_frequencies = CoupledTimeAndFrequencySeries()
self._freq_mask_updated = False self._frequency_mask_updated = False
self._frequency_mask = None self._frequency_mask = None
self._frequency_domain_strain = None self._frequency_domain_strain = None
self._time_domain_strain = None self._time_domain_strain = None
...@@ -107,7 +107,7 @@ class InterferometerStrainData(object): ...@@ -107,7 +107,7 @@ class InterferometerStrainData(object):
@minimum_frequency.setter @minimum_frequency.setter
def minimum_frequency(self, minimum_frequency): def minimum_frequency(self, minimum_frequency):
self._minimum_frequency = minimum_frequency self._minimum_frequency = minimum_frequency
self._freq_mask_updated = False self._frequency_mask_updated = False
@property @property
def maximum_frequency(self): def maximum_frequency(self):
...@@ -120,7 +120,7 @@ class InterferometerStrainData(object): ...@@ -120,7 +120,7 @@ class InterferometerStrainData(object):
@maximum_frequency.setter @maximum_frequency.setter
def maximum_frequency(self, maximum_frequency): def maximum_frequency(self, maximum_frequency):
self._maximum_frequency = maximum_frequency self._maximum_frequency = maximum_frequency
self.__freq_mask_updated = False self._frequency_mask_updated = False
@property @property
def frequency_mask(self): def frequency_mask(self):
...@@ -130,11 +130,12 @@ class InterferometerStrainData(object): ...@@ -130,11 +130,12 @@ class InterferometerStrainData(object):
------- -------
array_like: An array of boolean values array_like: An array of boolean values
""" """
if not self.__freq_mask_updated: if not self._frequency_mask_updated:
frequency_array = self._times_and_frequencies.frequency_array frequency_array = self._times_and_frequencies.frequency_array
mask = ((frequency_array >= self.minimum_frequency) & mask = ((frequency_array >= self.minimum_frequency) &
(frequency_array <= self.maximum_frequency)) (frequency_array <= self.maximum_frequency))
self._frequency_mask = mask self._frequency_mask = mask
self._frequency_mask_updated = True
return self._frequency_mask return self._frequency_mask
@property @property
......
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