diff --git a/IMRPDT_waveform/IMRPhenomDNRTparity.py b/IMRPDT_waveform/IMRPhenomDNRTparity.py
deleted file mode 100644
index 4e7e203be061605a10cae12d2f4be90f93ea3efc..0000000000000000000000000000000000000000
--- a/IMRPDT_waveform/IMRPhenomDNRTparity.py
+++ /dev/null
@@ -1,22 +0,0 @@
-def gen(**kwds):
- from pycbc.waveform import get_fd_waveform
- import lal
-
- if 'approximant' in kwds:
- kwds.pop("approximant")
- hp, hc = get_fd_waveform(approximant="IMRPhenomD_NRTidal", **kwds)
-
- temp = kwds['parity_amu'] / 1e9 / lal.QE_SI * lal.H_SI * lal.PI * lal.PI / lal.H0_SI
-
- hp_parity = hp + hc * temp * hp.sample_frequencies **2
- hc_parity = hc - hp * temp * hp.sample_frequencies **2
-
- return hp_parity, hc_parity
-
-
-#pycbc.waveform.add_custom_waveform('IMRPhenomParity', IMRPhenomParity, 'frequency', force=True)
-
-def add_me(**kwds):
- kwds['cpu_fd']['IMRPhenomD_NRTidal_Parity'] = gen
- kwds['filter_time_lengths']['IMRPhenomD_NRTidal_Parity'] = kwds['filter_time_lengths']['IMRPhenomD']
-
diff --git a/NRSur7dq4Parity/parity_NR.py b/NRSur7dq4Parity/parity_NR.py
deleted file mode 100644
index 52f1c9ad640acce6d762b1f08d766d383e5b8d1e..0000000000000000000000000000000000000000
--- a/NRSur7dq4Parity/parity_NR.py
+++ /dev/null
@@ -1,19 +0,0 @@
-def gen(**kwds):
- from pycbc.waveform import get_fd_waveform
- import lal
-
- if 'approximant' in kwds:
- kwds.pop("approximant")
- hp, hc = get_fd_waveform(approximant="NRSur7dq4", **kwds)
-
- temp = kwds['parity_amu'] / 1e9 / lal.QE_SI * lal.H_SI * lal.PI * lal.PI / lal.H0_SI
-
- hp_parity = hp + hc * temp * hp.sample_frequencies **2
- hc_parity = hc - hp * temp * hp.sample_frequencies **2
-
- return hp_parity, hc_parity
-
-def add_me(**kwds):
- kwds['cpu_fd']['NRSur7dq4Parity'] = gen
-# kwds['filter_time_lengths']['IMRPhenomPv2Parity'] = kwds['filter_time_lengths']['IMRPhenomPv2']
-
diff --git a/NRSur7dq4Parity/setup.py b/NRSur7dq4Parity/setup.py
deleted file mode 100644
index b8005011d061a9e828d7004956430f26d404a433..0000000000000000000000000000000000000000
--- a/NRSur7dq4Parity/setup.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-setup.py file for testing birefringence pycbc waveform plugin package
-"""
-
-from setuptools import Extension, setup, Command
-from setuptools import find_packages
-
-VERSION = '0.0.dev0'
-
-setup (
- name = 'pycbc-birefringence-NR',
- version = VERSION,
- description = 'An waveform plugin for PyCBC',
- author = 'Yifan Wang',
- author_email = 'yifan.wang@aei.mpg.de',
- url = 'http://www.pycbc.org/',
- #download_url = 'https://github.com/gwastro/revchirp/tarball/v%s' % VERSION,
- keywords = ['pycbc', 'signal processing', 'gravitational waves'],
- py_modules = ['parity_NR'],
- entry_points = {"pycbc.waveform.fd":"NRSur7dq4Parity=parity_NR:gen"},
- classifiers=[
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.6',
- 'Intended Audience :: Science/Research',
- 'Natural Language :: English',
- 'Topic :: Scientific/Engineering',
- 'Topic :: Scientific/Engineering :: Astronomy',
- 'Topic :: Scientific/Engineering :: Physics',
- 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
- ],
-)
diff --git a/testwaveform/README b/test/README
similarity index 100%
rename from testwaveform/README
rename to test/README
diff --git a/testwaveform/setup.py b/test/setup.py
similarity index 100%
rename from testwaveform/setup.py
rename to test/setup.py
diff --git a/testwaveform/waveform.py b/test/waveform.py
similarity index 100%
rename from testwaveform/waveform.py
rename to test/waveform.py
diff --git a/waveform/__init__.py b/waveform/__init__.py
deleted file mode 100644
index 3943644cbd5d2373079f43478260c7a25b2de90d..0000000000000000000000000000000000000000
--- a/waveform/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .IMRPhenomParity import *
diff --git a/waveform/parity_XPHM.py b/waveform/addme_parityamu/parity_XPHM.py
similarity index 100%
rename from waveform/parity_XPHM.py
rename to waveform/addme_parityamu/parity_XPHM.py
diff --git a/waveform/setup.py b/waveform/wrapper_amudistance_waveform/setup.py
similarity index 86%
rename from waveform/setup.py
rename to waveform/wrapper_amudistance_waveform/setup.py
index 9156c867e73404ec68c81f01e605bef656fb28b4..5206a9429c5576335856c6629e06c9c66658c386 100644
--- a/waveform/setup.py
+++ b/waveform/wrapper_amudistance_waveform/setup.py
@@ -8,7 +8,7 @@ from setuptools import find_packages
VERSION = '0.0.dev0'
setup (
- name = 'pycbc-birefringence-XPHM',
+ name = 'pycbc-birefringence-amudistance',
version = VERSION,
description = 'A waveform plugin for PyCBC',
author = 'Yifan Wang',
@@ -16,8 +16,8 @@ setup (
url = 'http://www.pycbc.org/',
#download_url = 'https://github.com/gwastro/revchirp/tarball/v%s' % VERSION,
keywords = ['pycbc', 'signal processing', 'gravitational waves'],
- py_modules = ['parity_XPHM'],
- entry_points = {"pycbc.waveform.fd":"IMRPhenomXPHMParity=parity_XPHM:gen"},
+ py_modules = ['amudistance'],
+ entry_points = {"pycbc.waveform.fd":"amudistance=waveform:gen"},
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
diff --git a/waveform/wrapper_amudistance_waveform/waveform.py b/waveform/wrapper_amudistance_waveform/waveform.py
new file mode 100644
index 0000000000000000000000000000000000000000..084b43e6845552eaaefedac8366368c416cb1f8e
--- /dev/null
+++ b/waveform/wrapper_amudistance_waveform/waveform.py
@@ -0,0 +1,16 @@
+def gen(**kwds):
+ from pycbc.waveform import get_fd_waveform
+ import lal
+ #print(kwds)
+
+ if 'approximant' in kwds:
+ kwds.pop("approximant")
+ if kwds['baseapprox'] is None:
+ raise ValueError("A base waveform approximant is required.")
+
+ hp, hc = get_fd_waveform(approximant=kwds['baseapprox'], **kwds)
+ temp = kwds['parity_amudistance'] * kwds['distance'] / 1e9 / lal.QE_SI * lal.H_SI * lal.PI * lal.PI / lal.H0_SI
+ hp_parity = hp + hc * temp * hp.sample_frequencies **2
+ hc_parity = hc - hp * temp * hp.sample_frequencies **2
+
+ return hp_parity, hc_parity