Moritz Huebner: Renamed source_model -> frequency_domain_source_model

peyote/waveform_generator.py

@@ -23,11 +23,11 @@ class WaveformGenerator(object):
 
     """
 
-    def __init__(self, source_model, sampling_frequency=4096, time_duration=1,
+    def __init__(self, frequency_domain_source_model, sampling_frequency=4096, time_duration=1,
                  parameters=None):
         self.time_duration = time_duration
         self.sampling_frequency = sampling_frequency
-        self.source_model = source_model
+        self.source_model = frequency_domain_source_model
         self.parameters = parameters
         self.__frequency_array_updated = False
         self.__time_array_updated = False

test/waveform_generator_tests.py

@@ -17,7 +17,8 @@ def gaussian_frequency_domain_strain_2(frequency_array, a, m, s, ra, dec, geocen
 class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestCase):
 
     def setUp(self):
-        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(source_model=gaussian_frequency_domain_strain)
+        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(
+            frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.simulation_parameters = dict(amplitude=1e-21, mu=100, sigma=1,
                                      ra=1.375,
                                      dec=-1.2108,
@@ -51,7 +52,8 @@ class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestC
 class TestParameterSetter(unittest.TestCase):
 
     def setUp(self):
-        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(source_model=gaussian_frequency_domain_strain)
+        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(
+            frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.simulation_parameters = dict(amplitude=1e-21, mu=100, sigma=1,
                                      ra=1.375,
                                      dec=-1.2108,
@@ -89,7 +91,8 @@ class TestParameterSetter(unittest.TestCase):
 class TestSourceModelSetter(unittest.TestCase):
 
     def setUp(self):
-        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(source_model=gaussian_frequency_domain_strain)
+        self.waveform_generator = peyote.waveform_generator.WaveformGenerator(
+            frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.waveform_generator.source_model = gaussian_frequency_domain_strain_2
         self.simulation_parameters = dict(a=1e-21, m=100, s=1,
                                      ra=1.375,

tutorials/BasicTutorial.py

@@ -32,7 +32,7 @@ injection_parameters = dict(
 waveform_generator = peyote.waveform_generator.WaveformGenerator(
     sampling_frequency=sampling_frequency,
     time_duration=time_duration,
-    source_model=peyote.source.lal_binary_black_hole,
+    frequency_domain_source_model=peyote.source.lal_binary_black_hole,
     parameters=injection_parameters)
 hf_signal = waveform_generator.frequency_domain_strain()
 

tutorials/custom_source_tutorial.py

@@ -73,7 +73,7 @@ injection_parameters = dict(amplitude=1e-21,
 sampling_parameters = peyote.prior.parse_floats_to_fixed_priors(injection_parameters)
 
 wg = peyote.waveform_generator.WaveformGenerator(
-     source_model=gaussian_frequency_domain_strain,
+     frequency_domain_source_model=gaussian_frequency_domain_strain,
      parameters=injection_parameters
      )
 

tutorials/make_standard_data.py

@@ -32,7 +32,7 @@ simulation_parameters = dict(
     psi=2.659
 )
 #sampling_parameters = peyote.parameter.Parameter.parse_floats_to_parameters(simulation_parameters)
-waveform_generator = WaveformGenerator(source_model=peyote.source.lal_binary_black_hole,
+waveform_generator = WaveformGenerator(frequency_domain_source_model=peyote.source.lal_binary_black_hole,
                                        sampling_frequency=sampling_frequency,
                                        time_duration=time_duration,
                                        parameters=simulation_parameters)