Commit db65485e authored by John Douglas Veitch's avatar John Douglas Veitch

Merge branch 'master' into dist_marg_bayestar

parents 176d62ca 4c8f221c
......@@ -19,6 +19,7 @@ BuildRequires: hdf5-devel
BuildRequires: healpy >= 1.9.1
BuildRequires: python-astropy >= 1.1.1
BuildRequires: python-matplotlib >= 1.2.0
BuildRequires: python-h5py
BuildRequires: python-shapely
BuildRequires: pytest
BuildRequires: libmetaio-devel
......@@ -86,6 +87,7 @@ Summary: Python Bindings for LALInference
Group: LAL
Requires: %{name} = %{version}
Requires: healpy >= 1.9.1
Requires: python-h5py
Requires: python-shapely
Requires: numpy >= 1.7
Requires: python
......
......@@ -645,6 +645,11 @@ static REAL8 LALInferenceFusedFreqDomainLogLikelihood(LALInferenceVariables *cur
switch(errnum)
{
case XLAL_EUSR0: /* Template generation failed in a known way, set -Inf likelihood */
/* Free up allocated vectors */
if(dh_S_tilde) XLALDestroyCOMPLEX16Vector(dh_S_tilde);
if(dh_S) XLALDestroyREAL8Vector(dh_S);
if(dh_S_phase_tilde) XLALDestroyCOMPLEX16Vector(dh_S_phase_tilde);
if(dh_S_phase) XLALDestroyREAL8Vector(dh_S_phase);
if(model->roq_flag)
{
if ( model->roq->hptildeLinear ) XLALDestroyCOMPLEX16FrequencySeries(model->roq->hptildeLinear);
......
......@@ -155,9 +155,12 @@ def test_detector_disabled():
assert len(event.singles) == 1
assert event.singles[0].detector == 'L1'
# py2 and py3 differ in the ordering of set elements, so build upfront:
ifoset = '{%s}' % ' '.join({'H1', 'L1'})
# Now test that exceptions are raised when they are called for.
expected_message = ('Disabling detectors {H1, L1} would have no effect on '
'this event with detectors {H1 L1}')
'this event with detectors %s' % ifoset)
nonraising_source = events.detector_disabled.open(
base_source, ['H1, L1'], raises=False)
raising_source = events.detector_disabled.open(
......@@ -170,7 +173,7 @@ def test_detector_disabled():
# Now test that exceptions are raised when they are called for.
expected_message = ('Disabling detectors {V1} would have no effect on '
'this event with detectors {H1 L1}')
'this event with detectors %s' % ifoset)
nonraising_source = events.detector_disabled.open(
base_source, ['V1'], raises=False)
raising_source = events.detector_disabled.open(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment