From 694a971facfe65af18b6c86546da772ec20e3089 Mon Sep 17 00:00:00 2001
From: MoritzThomasHuebner <email@moritz-huebner.de>
Date: Fri, 27 Jul 2018 11:51:57 +1000
Subject: [PATCH] Reverted to the last functioning version
---
tupak/gw/waveform_generator.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tupak/gw/waveform_generator.py b/tupak/gw/waveform_generator.py
index a7a43b901..507f520e5 100644
--- a/tupak/gw/waveform_generator.py
+++ b/tupak/gw/waveform_generator.py
@@ -7,8 +7,7 @@ import numpy as np
class WaveformGenerator(object):
def __init__(self, duration=None, sampling_frequency=None, start_time=0, frequency_domain_source_model=None,
- time_domain_source_model=None, parameters=None,
- parameter_conversion=lambda parameters, search_keys: (parameters, []),
+ time_domain_source_model=None, parameters=None, parameter_conversion=None,
non_standard_sampling_parameter_keys=None,
waveform_arguments=None):
""" A waveform generator
@@ -109,8 +108,7 @@ class WaveformGenerator(object):
def _calculate_strain(self, model, model_data_points, transformation_function, transformed_model,
transformed_model_data_points):
- self.parameters, added_keys = self.parameter_conversion(self.parameters,
- self.non_standard_sampling_parameter_keys)
+ added_keys = self._setup_conversion()
if model is not None:
model_strain = self._strain_from_model(model_data_points, model)
elif transformed_model is not None:
@@ -121,6 +119,13 @@ class WaveformGenerator(object):
self._remove_added_keys(added_keys)
return model_strain
+ def _setup_conversion(self):
+ added_keys = []
+ if self.parameter_conversion is not None:
+ self.parameters, added_keys = self.parameter_conversion(self.parameters,
+ self.non_standard_sampling_parameter_keys)
+ return added_keys
+
def _strain_from_model(self, model_data_points, model):
self.__full_source_model_keyword_arguments.update(self.parameters)
return model(model_data_points, **self.__full_source_model_keyword_arguments)
--
GitLab