Commit 8fe66aea authored by Adam Mercer's avatar Adam Mercer

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

Lalsimulation point release

See merge request lscsoft/lalsuite!633
parents 61ca3d17 b8b77c10
AC_PREREQ([2.63])
AC_INIT([LALSimulation],[1.8.0],[lal-discuss@ligo.org])
AC_INIT([LALSimulation],[1.8.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALSimulationConfig.h])
AC_CONFIG_SRCDIR([src/LALSimulation.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -62,9 +62,9 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[17])
AC_SUBST([LIBCURRENT],[18])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# nightly build
......
lalsimulation (1.8.1-1) unstable; urgency=low
* added noise PSD files from LIGO-T1800545
-- Adam Mercer <adam.mercer@ligo.org> Wed, 23 Jan 2019 10:28:59 -0700
lalsimulation (1.8.0-1) unstable; urgency=low
* pre O3 release
......
......@@ -8,4 +8,6 @@ usr/share/lalsimulation/LIGO-P1600143*
usr/share/lalsimulation/LIGO-T0900288*
usr/share/lalsimulation/LIGO-T1600593*
usr/share/lalsimulation/LIGO-T1800042*
usr/share/lalsimulation/LIGO-T1800044*
usr/share/lalsimulation/LIGO-T1800545*
usr/share/man/*
......@@ -102,6 +102,8 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_datarootdir}/lalsimulation/LIGO-T0900288*
%{_datarootdir}/lalsimulation/LIGO-T1600593*
%{_datarootdir}/lalsimulation/LIGO-T1800042*
%{_datarootdir}/lalsimulation/LIGO-T1800044*
%{_datarootdir}/lalsimulation/LIGO-T1800545*
%{_libdir}/*.so.*
%{_sysconfdir}/*
......@@ -125,6 +127,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Wed Jan 23 2019 Adam Mercer <adam.mercer@ligo.org> 1.8.1-1
- added noise PSD files from LIGO-T1800545
* Thu Sep 13 2018 Adam Mercer <adam.mercer@ligo.org> 1.8.0-1
- Pre O3 release
......
......@@ -197,6 +197,20 @@ int XLALSimNoisePSDaLIGOAPlusDesignSensitivityT1800042(REAL8FrequencySeries *psd
int XLALSimNoisePSDaLIGOaLIGODesignSensitivityT1800044(REAL8FrequencySeries *psd, double flow);
/*
* NOISE PSDs FROM LIGO-P1800545
*/
int XLALSimNoisePSDaLIGOaLIGOO3LowT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOaLIGO140MpcT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOaLIGO175MpcT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOAdVO4IntermediateT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOAdVO4T1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOAdVO3LowT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOKAGRA128MpcT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOKAGRA25MpcT1800545(REAL8FrequencySeries *psd, double flow);
int XLALSimNoisePSDaLIGOKAGRA80MpcT1800545(REAL8FrequencySeries *psd, double flow);
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
......
......@@ -84,6 +84,9 @@ static LALUnit strainSquaredPerHertzUnit = { 0, { 0, 0, 1, 0, 0, 2, 0}, { 0, 0,
/* prefix for noise psd files provided by LIGO-T1800044 */
#define T1800044 "LIGO-T1800044-v5-"
/* prefix for noise psd files provided by LIGO-T1800044 */
#define T1800545 "LIGO-T1800545-v1-"
/**
* @addtogroup LALSimNoisePSD_c
* @brief Routines to compute noise power spectral densities for
......@@ -1574,6 +1577,139 @@ int XLALSimNoisePSDaLIGOaLIGODesignSensitivityT1800044(
/** @} */
/**
* @name Noise PSDs from LIGO-P1800545
* @{
*/
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to aLIGO O3 low 120 Mpc range in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOaLIGOO3LowT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "aLIGO_O3low.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to aLIGO 140 Mpc range in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOaLIGO140MpcT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "aLIGO_140Mpc.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to aLIGO 175 Mpc range (design) in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOaLIGO175MpcT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "aLIGO_175Mpc.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced Virgo 100 Mpc range (O4 intermediate) in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOAdVO4IntermediateT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "AdV_O4intermediate.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced Virgo 120 Mpc range (O4 design) in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOAdVO4T1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "AdV_O4.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced Virgo 65 Mpc range (O3 low) in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOAdVO3LowT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "AdV_O3low.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced KAGRA 128 Mpc range in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOKAGRA128MpcT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "KAGRA_128Mpc.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced KAGRA 25 Mpc range in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOKAGRA25MpcT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "KAGRA_25Mpc.txt");
}
/**
* Returns a frequency series psd with low frequency cutoff flow corresponding
* to advanced KAGRA 80 Mpc range in LIGO-P1800545.
*/
int XLALSimNoisePSDaLIGOKAGRA80MpcT1800545(
REAL8FrequencySeries *psd, /**< frequency series to be computed */
double flow /**< low frequency cutoff (Hz) */
)
{
return XLALSimNoisePSDFromFile(psd, flow,
T1800545 "KAGRA_80Mpc.txt");
}
/** @} */
/** @} */
/*
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -20,7 +20,6 @@ NOISEPSDFILES = \
LIGO-P1200087-v18-AdV_MID_LOW.txt \
LIGO-P1200087-v18-aLIGO_BNS_OPTIMIZED.txt \
LIGO-P1200087-v18-aLIGO_DESIGN.txt \
LIGO-T1800042-v5-aLIGO_APLUS.txt \
LIGO-P1200087-v18-aLIGO_EARLY_HIGH.txt \
LIGO-P1200087-v18-aLIGO_EARLY_LOW.txt \
LIGO-P1200087-v18-aLIGO_LATE_HIGH.txt \
......@@ -37,11 +36,22 @@ NOISEPSDFILES = \
LIGO-T0900288-v3-NSNS_Opt.txt \
LIGO-T0900288-v3-ZERO_DET_high_P.txt \
LIGO-T0900288-v3-ZERO_DET_low_P.txt \
LIGO-T1600593-v1-KAGRA_Opening.txt \
LIGO-T1600593-v1-KAGRA_Design.txt \
LIGO-T1600593-v1-KAGRA_Early.txt \
LIGO-T1600593-v1-KAGRA_Mid.txt \
LIGO-T1600593-v1-KAGRA_Late.txt \
LIGO-T1600593-v1-KAGRA_Design.txt
LIGO-T1600593-v1-KAGRA_Mid.txt \
LIGO-T1600593-v1-KAGRA_Opening.txt \
LIGO-T1800042-v5-aLIGO_APLUS.txt \
LIGO-T1800044-v5-aLIGO_DESIGN.txt \
LIGO-T1800545-v1-AdV_O3low.txt \
LIGO-T1800545-v1-AdV_O4.txt \
LIGO-T1800545-v1-AdV_O4intermediate.txt \
LIGO-T1800545-v1-KAGRA_128Mpc.txt \
LIGO-T1800545-v1-KAGRA_25Mpc.txt \
LIGO-T1800545-v1-KAGRA_80Mpc.txt \
LIGO-T1800545-v1-aLIGO_140Mpc.txt \
LIGO-T1800545-v1-aLIGO_175Mpc.txt \
LIGO-T1800545-v1-aLIGO_O3low.txt
EOSDATAFILES = \
LALSimNeutronStarEOS_ALF1.dat \
......
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