Commit 61ca3d17 authored by Adam Mercer's avatar Adam Mercer

Merge branch 'lalinference-point-release' into 'pre-o3-release'

Lalinference point release

See merge request lscsoft/lalsuite!631
parents 6903a989 d365dfe3
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.50],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.51],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
AC_PREREQ([2.63])
AC_INIT([LALInference],[1.10.0],[lal-discuss@ligo.org])
AC_INIT([LALInference],[1.10.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALInferenceConfig.h])
AC_CONFIG_SRCDIR([src/LALInference.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -85,7 +85,7 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[15])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
......
lalinference (1.10.1-1) unstable; urgency=low
* Fix spin2 prior
-- Adam Mercer <adam.mercer@ligo.org> Tue, 22 Jan 2019 15:40:19 -0700
lalinference (1.10.0-1) unstable; urgency=low
* Pre O3 release
......
......@@ -203,6 +203,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Tue Jan 22 2019 Adam Mercer <adam.mercer@ligo.org> 1.10.1-1
- Fix spin2 prior
* Thu Sep 13 2018 Adam Mercer <adam.mercer@ligo.org> 1.10.0-1
- Pre O3 release
......
......@@ -572,7 +572,6 @@ REAL8 LALInferenceInspiralPrior(LALInferenceRunState *runState, LALInferenceVari
LALInferenceGetMinMaxPrior(runState->priorArgs,"a_spin1",&a_min,&a_max);
REAL8 V = (4./3.)*LAL_PI * (a_max*a_max*a_max);
logPrior+=log(fabs((3./4.)*(a_max*a_max - a*a)))-log(fabs(V));
}
}
if(LALInferenceCheckVariable(params,"tilt_spin2"))
......@@ -596,12 +595,11 @@ REAL8 LALInferenceInspiralPrior(LALInferenceRunState *runState, LALInferenceVari
if(volumetric_spins)
{
/* Volumetric prior marginalised onto z component */
REAL8 a = LALInferenceGetREAL8Variable(params,"a_spin1");
REAL8 a = LALInferenceGetREAL8Variable(params,"a_spin2");
REAL8 a_max,a_min;
LALInferenceGetMinMaxPrior(runState->priorArgs,"a_spin1",&a_min,&a_max);
LALInferenceGetMinMaxPrior(runState->priorArgs,"a_spin2",&a_min,&a_max);
REAL8 V = (4./3.)*LAL_PI * (a_max*a_max*a_max);
logPrior+=log(fabs((3./4.)*(a_max*a_max - a*a)))-log(fabs(V));
}
}
......
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