From 562b6d7cea38e5da58b7bb0265c8488ff5d788e7 Mon Sep 17 00:00:00 2001
From: moritz <email@moritz-huebner.de>
Date: Tue, 1 May 2018 11:08:46 +1000
Subject: [PATCH] Moritz Huebner: Renamed source_model ->
frequency_domain_source_model
---
peyote/waveform_generator.py | 4 ++--
test/waveform_generator_tests.py | 9 ++++++---
tutorials/BasicTutorial.py | 2 +-
tutorials/custom_source_tutorial.py | 2 +-
tutorials/make_standard_data.py | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/peyote/waveform_generator.py b/peyote/waveform_generator.py
index 5694be289..ed79b6607 100644
--- a/peyote/waveform_generator.py
+++ b/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
diff --git a/test/waveform_generator_tests.py b/test/waveform_generator_tests.py
index 26fed1a83..3ab64e404 100644
--- a/test/waveform_generator_tests.py
+++ b/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,
diff --git a/tutorials/BasicTutorial.py b/tutorials/BasicTutorial.py
index 8bc4c195d..bc250d9e1 100644
--- a/tutorials/BasicTutorial.py
+++ b/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()
diff --git a/tutorials/custom_source_tutorial.py b/tutorials/custom_source_tutorial.py
index 876537deb..982c550f4 100644
--- a/tutorials/custom_source_tutorial.py
+++ b/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
)
diff --git a/tutorials/make_standard_data.py b/tutorials/make_standard_data.py
index 8bdd58516..eeee0ebdc 100644
--- a/tutorials/make_standard_data.py
+++ b/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)
--
GitLab