From 6a9ef3085504086202bd8b8c33a182d493803cf5 Mon Sep 17 00:00:00 2001
From: moritz <email@moritz-huebner.de>
Date: Tue, 10 Apr 2018 18:17:59 +1000
Subject: [PATCH] Moritz Huebner: Did some more code cleanup
---
peyote/source.py | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/peyote/source.py b/peyote/source.py
index f045b81d2..0a6e35410 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,
--
GitLab