diff --git a/minke/mdctools.py b/minke/mdctools.py index 52cdcd7e381c643a4ae993e0143bff3d16c45b43..f7fabbf4c8ce95b15e7059d5eff0940154df012a 100644 --- a/minke/mdctools.py +++ b/minke/mdctools.py @@ -77,6 +77,7 @@ table_types = { "ga" : lsctables.SimBurstTable, "sg" : lsctables.SimBurstTable, "wnb" : lsctables.SimBurstTable, + "sc" : lsctables.SimBurstTable, # Supernova Families "d08" : lsctables.SimBurstTable, "s10" : lsctables.SimBurstTable, @@ -120,6 +121,7 @@ class MDCSet(): inj_families_names = {'ga' : 'Gaussian', 'sg' : 'SineGaussian', 'wnb': 'BTLWNB', + "sc" : "StringCusp", # Supernova families 'd08' : 'Dimmelmeier+08', 's10' : 'Scheidegger+10', @@ -135,6 +137,7 @@ class MDCSet(): inj_families_abb = dict((v,k) for k,v in inj_families_names.iteritems()) hist_parameters = { + "StringCusp": ["amplitude", "ra", "dec"], "SineGaussian": ["hrss", "psi", "ra", "dec"], "Gaussian": ["hrss", "psi", "ra", "dec"], "BTLWNB": ["hrss", "ra", "dec"], diff --git a/tests/test_sources.py b/tests/test_sources.py index 298aee66d142d95645b3c3fc063d5817128ac5e6..0cbfb460acf5ea483b914f3505cb6f895dfff5a6 100755 --- a/tests/test_sources.py +++ b/tests/test_sources.py @@ -129,6 +129,27 @@ class TestMinkeAdHocSources(unittest.TestCase): np.testing.assert_array_almost_equal(data[0].data.data[::5000], sgdata) + def test_SC_Waveform_generation(self): + """ + Regression test for StringCusp waveforms + """ + + sc = sources.StringCusp(1e-23, 150, 100) + data = sc._generate() + + scdata = np.array([ 5.70001763e-63, 5.92586457e-32, 2.59625621e-31, + 1.29668495e-30, 4.86418685e-30, 1.25517562e-29, + 1.95684680e-29, -2.79296626e-29, -3.97865144e-28, + -1.98228555e-27, -5.83672705e-27, -1.84365082e-27, + 7.98894273e-26, 2.10292180e-25, -2.26513533e-24, + -1.58525748e-24, -2.79263187e-25, 1.76952837e-25, + 2.03163416e-26, -6.90900890e-27, -3.64716334e-27, + -9.34585595e-28, -1.33656482e-28, 1.26838192e-29, + 1.67225169e-29, 7.30560692e-30, 2.67365656e-30, + 8.41779831e-31, 1.43679337e-31, 6.07001624e-33]) + + np.testing.assert_array_almost_equal(data[0].data.data[::5000], scdata) + class TestMinkeADISources(unittest.TestCase): def setUp(self): """