From f6f997027ea95b6f840f2b565d9288d9c8568449 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Mon, 27 May 2024 14:08:45 -0700 Subject: [PATCH 1/4] Add 2 Phenom parameters that we need here for XPHM --- pycbc/waveform/waveform.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pycbc/waveform/waveform.py b/pycbc/waveform/waveform.py index 0ab1b10e599..b9ac89dc1ad 100644 --- a/pycbc/waveform/waveform.py +++ b/pycbc/waveform/waveform.py @@ -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): From 3c2f5eeaa1f9ce93996aea0c1e9c4d1707fa4052 Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Mon, 27 May 2024 14:37:02 -0700 Subject: [PATCH 2/4] Also need it here --- pycbc/waveform/parameters.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pycbc/waveform/parameters.py b/pycbc/waveform/parameters.py index 47cb9b43b0f..97d12f073b2 100644 --- a/pycbc/waveform/parameters.py +++ b/pycbc/waveform/parameters.py @@ -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 + +dchi0 = Parameter("ThresholdMband", + dtype=float, default=None, label="ThresholdMband", + description="PhenomXHM Multibanding") + +dchi0 = Parameter("PrecThresholdMband", + dtype=float, default=None, label="PrecThresholdMband", + description="PhenomXPHM Multibanding") + + # # ============================================================================= # From 70b382cf7f4db7b06e4f32a735b47ecfe9cf16fb Mon Sep 17 00:00:00 2001 From: Ian Harry Date: Tue, 28 May 2024 00:54:58 -0700 Subject: [PATCH 3/4] FIx previous --- pycbc/waveform/parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pycbc/waveform/parameters.py b/pycbc/waveform/parameters.py index 97d12f073b2..23640c8352a 100644 --- a/pycbc/waveform/parameters.py +++ b/pycbc/waveform/parameters.py @@ -548,11 +548,11 @@ def docstr(self, prefix='', include_label=True): ## Specific waveform parameters -dchi0 = Parameter("ThresholdMband", +threshmband = Parameter("ThresholdMband", dtype=float, default=None, label="ThresholdMband", description="PhenomXHM Multibanding") -dchi0 = Parameter("PrecThresholdMband", +precthreshmband = Parameter("PrecThresholdMband", dtype=float, default=None, label="PrecThresholdMband", description="PhenomXPHM Multibanding") @@ -587,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 From 0b06d338a2737369574d8ae561e644ae5db98d90 Mon Sep 17 00:00:00 2001 From: Gareth S Cabourn Davies Date: Mon, 20 May 2024 17:06:52 +0100 Subject: [PATCH 4/4] 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 --- .github/workflows/basic-tests.yml | 2 +- tools/install_travis.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index d962026e09a..239e9250db4 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -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" diff --git a/tools/install_travis.sh b/tools/install_travis.sh index a2bc95eea08..49de69c23e8 100755 --- a/tools/install_travis.sh +++ b/tools/install_travis.sh @@ -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"