diff --git a/peyote/source.py b/peyote/source.py index f045b81d2072095544076a653c90ca7ac42e0a3d..0a6e354103ef0a81d4cee8ffdd9bc39b189df813 100644 --- a/peyote/source.py +++ b/peyote/source.py @@ -1,11 +1,13 @@ from __future__ import division, print_function -import peyote -import numpy as np + import os -from astropy.table import Table -from peyote.utils import sampling_frequency, nfft + import lal import lalsimulation as lalsim +from astropy.table import Table + +import peyote +from peyote.utils import sampling_frequency, nfft class Source: @@ -63,13 +65,6 @@ class BinaryBlackHole(Source): self.geocent_time = geocent_time self.psi = psi - - - # parameter_keys = ['mass_1', 'mass_2', 'luminosity_distance', 'spin_1', - # 'spin_2', 'iota', 'phase', 'waveform_approximant', - # 'reference_frequency', 'ra', 'dec', 'geocent_time', - # 'psi'] - def copy(self): copy = BinaryBlackHole(self.name, self.sampling_frequency, self.time_duration, self.mass_1, self.mass_2, self.luminosity_distance, self.spin_1, self.spin_2, self.iota, self.phase, @@ -142,15 +137,6 @@ class Supernova(AstrophysicalSource): def __init__(self, name, right_ascension, declination, luminosity_distance): AstrophysicalSource.__init__(self, name, right_ascension, declination, luminosity_distance) - -# class BinaryBlackHole(CompactBinaryCoalescence): -# def __init__(self, name, right_ascension, declination, luminosity_distance, mass_1, mass_2, spin_1, spin_2, -# coalescence_time, inclination_angle, waveform_phase, polarisation_angle, eccentricity): -# CompactBinaryCoalescence.__init__(self, name, right_ascension, declination, luminosity_distance, mass_1, -# mass_2, spin_1, spin_2, coalescence_time, inclination_angle, waveform_phase, -# polarisation_angle, eccentricity) - - class BinaryNeutronStar(CompactBinaryCoalescence): def __init__(self, name, right_ascension, declination, luminosity_distance, mass_1, mass_2, spin_1, spin_2, coalescence_time, inclination_angle, waveform_phase, polarisation_angle, eccentricity,