Merge branch 'master' into 'change_sampled_parameters'

# Conflicts:
#   tupak/__init__.py
#   tupak/result.py
#   tupak/sampler.py

examples/injection_examples/injection.py

@@ -42,7 +42,7 @@ def main():
     injection_polarizations = waveform_generator.frequency_domain_strain()
 
     # Create interferometers and inject signal
-    interferometers = [tupak.detector.get_inteferometer_with_fake_noise_and_injection(
+    interferometers = [tupak.detector.get_interferometer_with_fake_noise_and_injection(
             name, injection_polarizations=injection_polarizations, injection_parameters=injection_parameters,
             sampling_frequency=2048, time_duration=4, outdir=outdir) for name in ['H1', 'L1', 'V1']]
 

tupak/__init__.py

@@ -7,5 +7,6 @@ from . import prior
 from . import source
 from . import likelihood
 from . import waveform_generator
+from . import result
 from . import sampler
 from . import conversion

tupak/sampler.py

@@ -70,6 +70,7 @@ class Sampler(object):
         if result is None:
             self.__result = Result()
             self.__result.search_parameter_keys = self.__search_parameter_keys
+            self.__result.fixed_parameter_keys = self.__fixed_parameter_keys
             self.__result.parameter_labels = [
                 self.priors[k].latex_label for k in
                 self.__search_parameter_keys]