Skip to content

Commit

Permalink
Allow PhenomXPHM options in laldict for v23 release branch (#4759)
Browse files Browse the repository at this point in the history
* Add 2 Phenom parameters that we need here for XPHM

* Also need it here

* FIx previous

* disable git lfs post-clone hook checks for lalsuite-extra (#4755)

* disable git lfs post-clone hook checks for lalsuite-extra

* Also in basic-tests.yml

---------

Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org>
  • Loading branch information
spxiwh and GarethCabournDavies authored May 28, 2024
1 parent d1a3c42 commit fc80e63
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
pip install "tox<4.0.0" pip setuptools --upgrade
- name: installing auxiliary data files
run: |
GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra
GIT_CLONE_PROTECTION_ACTIVE=false GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra
cd lalsuite-extra
git lfs pull -I "data/lalsimulation/SEOBNRv2ROM_*.dat"
git lfs pull -I "data/lalsimulation/*ChirpTime*.dat"
Expand Down
14 changes: 13 additions & 1 deletion pycbc/waveform/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,18 @@ def docstr(self, prefix='', include_label=True):
dbeta3 = Parameter("dbeta3",
dtype=float, default=0., label=r"$d\beta_3$",
description="Intermediate testingGR parameter.")

## Specific waveform parameters

threshmband = Parameter("ThresholdMband",
dtype=float, default=None, label="ThresholdMband",
description="PhenomXHM Multibanding")

precthreshmband = Parameter("PrecThresholdMband",
dtype=float, default=None, label="PrecThresholdMband",
description="PhenomXPHM Multibanding")


#
# =============================================================================
#
Expand Down Expand Up @@ -575,7 +587,7 @@ def docstr(self, prefix='', include_label=True):
testingGR_params = ParameterList\
([dchi0, dchi1, dchi2, dchi3, dchi4, dchi5, dchi5l, dchi6, dchi6l,
dchi7, dalpha1, dalpha2, dalpha3, dalpha4, dalpha5,
dbeta1, dbeta2, dbeta3])
dbeta1, dbeta2, dbeta3, precthreshmband, threshmband])

# intrinsic parameters of a CBC waveform. Some of these are not recognized
# by every waveform model
Expand Down
10 changes: 10 additions & 0 deletions pycbc/waveform/waveform.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,16 @@ def _check_lal_pars(p):
lalsimulation.SimInspiralWaveformParamsInsertNonGRDBeta2(lal_pars,p['dbeta2'])
if p['dbeta3'] is not None:
lalsimulation.SimInspiralWaveformParamsInsertNonGRDBeta3(lal_pars,p['dbeta3'])
if p['PrecThresholdMband'] is not None:
lalsimulation.SimInspiralWaveformParamsInsertPhenomXPHMThresholdMband(
lal_pars,
p['PrecThresholdMband'],
)
if p['ThresholdMband'] is not None:
lalsimulation.SimInspiralWaveformParamsInsertPhenomXHMThresholdMband(
lal_pars,
p['ThresholdMband'],
)
return lal_pars

def _lalsim_td_waveform(**p):
Expand Down
2 changes: 1 addition & 1 deletion tools/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ chmod +x $p

# LAL extra data files
# FIXME, should be a way to make reduced package (with subset of data files)
GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra
GIT_CLONE_PROTECTION_ACTIVE=false GIT_LFS_SKIP_SMUDGE=1 git clone https://git.ligo.org/lscsoft/lalsuite-extra
cd lalsuite-extra
git lfs pull -I "data/lalsimulation/SEOBNRv2ROM_*.dat"
git lfs pull -I "data/lalsimulation/*ChirpTime*.dat"
Expand Down

0 comments on commit fc80e63

Please sign in to comment.