Cherry-picked commits for 2.1.3 release #4604
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#4298) * Apply autogating on the last 16 s of the buffer instead of the analysis chunk only Add 2 command lines to the PyCBC Live run script to set the length and overlap in seconds of the segments used to estimate the PSD with Welchs method * Fix help messages of --autogating-psd-duration and --autogating-psd-stride * Set autogating_psd_duration and autogating_psd_stride in __init__ function of StrainBuffer class * Forgot to change detect_loud_glitches(strain) to detect_loud_glitches(self.strain) * Change --autogating-psd-duration and --autogating-psd-stride from type=int to type=float * Add documentation of the new kwargs autogating_psd_duration and autogating_psd_stride * Change the option name of —autogating-psd-duration to —autogating-psd-segment-length. Add --autogating-duration option for PyCBC Live run script to set the amount of data we want to apply autogating on. The default value is set to 16 s. Move variables « autogating_duration_length » and « autogating_start_sample » inside the « if self.autogating_threshold it not None » block since those variables are only used inside that block. * Add missing , * Fix typo * Change comment message since the command --autogating-duration has been added and 16 s is not a hardcoded value anymore.
* Add mchirp / tau0 direct conversions * Consistency tests for mchirp-tau0 conversion
No-one spotted this ...
* Use constant chirp time window for mchirp bounds * syntax error is bad * update snr-max branch (gwastro#4343) * workaround for search issue and rtd theme (gwastro#4340) * Add mchirp / tau0 direct conversions (gwastro#4337) * Add mchirp / tau0 direct conversions * Consistency tests for mchirp-tau0 conversion --------- Co-authored-by: Alex Nitz <[email protected]> * add apparently needed import * adjust eta bounds to be sane/useful * if max mtotal is 500 max mchirp should be closer to 200 --------- Co-authored-by: Alex Nitz <[email protected]>
* Fix edge case in check for horizon distance * Suggestion by Gareth; improve docstring & comments
* Fix bug where counts/coefficients were not in the right order, make plots a bit prettier * TDC comments * Reorder operations
* Add argument verification for singles * Apply suggestions from code review * remove --enable-single-detector-background * Some more option-checking, and making fixed ifar option actually possible! * fix options in example * CC, typo * CC
* First part of moving venv build to igwn * TESTING HACK. REVERT ME BEFORE MERGING!!! * Try this * Testing * Revert "Testing" This reverts commit c0b9ea0. * Add new CVMFS commands * Remove rsync filter which isn't working * Add error wrap abort handler * Update tools/venv_transfer_commands.sh Co-authored-by: Duncan Macleod <[email protected]> * Fix Ian's idiocy (attempt to) and HostChecking * Set to abort for one last test * One final publish test * Add a chmod on the root CVMFS directory * Prepare for merging * Fix mistake --------- Co-authored-by: Duncan Macleod <[email protected]>
…4393) * allow SNR optimizer to use the candidate point in the initial array of test points
gwastro#4176) * Applying spin bounds based upon object mass~ * Updated reference to correct paper * Adding spin bounds based on upper bounds of masses * removing unnecessary additions * Changing max mass2 to the right quantities * Creating maxeta + reusing maxm1 * minor cleanup * fixed min / max eta values * fixed min / max eta * Correcting maxm2 equation * more readable/less redundant comment --------- Co-authored-by: Thomas Dent <[email protected]>
…4346) * Introduced a new arguement --skymap-only-ifos in pycbc_live * Default skymap_only_ifos changed * skymap_only_ifos as an attribute of LiveEventManager * Test skymaps with V1 as skymap_only_ifos * singles with skymap_only_ifos * Removing commented lines etc * A default seed for SNR opt * Poking CI tests I remove an unnecessary FIXME in the comments, but mostly doing this to restart the CI tests, which seem to have not linked up right. --------- Co-authored-by: Souradeep Pal <[email protected]> Co-authored-by: Ian Harry <[email protected]>
* bugfix - allow non-running of singles * CC * Revrt wrongly-added test chnages
* Take precentile of rate, not count * make change to mean as well * Fix to label * Update bin/live/pycbc_live_plot_combined_single_fits Co-authored-by: Tito Dal Canton <[email protected]> * Update bin/live/pycbc_live_combine_single_fits --------- Co-authored-by: Tito Dal Canton <[email protected]>
* Docstring * Remove unused variables * Simplify loops/ifs * Whitespace * Logging tweaks * Unnecessary f-strings * Gareth's suggestion
…ro#4342) * setup snr_opt before threading * Some minor tweaks, setup optimize_snr even if not performing it * Dont open file unless using it * TDC comments * clarify comments * bug --------- Co-authored-by: GarethCabournDavies <[email protected]>
…wastro#4393)" This reverts commit 460d2a40c4bdaf1446fd541f9e7666b24c625d35. The revert is to avoid a bug in the SNR optimizer introduced by this commit and later fixed properly in gwastro#4561.
|
Make sure to use “Rebase and merge”, not the default “Squash and merge”, so that history is preserved for reviewers. |
|
Lots of stuff failing in the CI tests. We may need to cherry pick a few more things, for example #4580 |
|
As well as #4580, I would take the last 5 patches from https://github.com/spxiwh/pycbc/commits/v233_release_branch/ This reverts #4289 and then does some cleanup related to it. |
|
Where do we stand on this after today's call? It sounded like we will want a new release branch, so do we still need to do the 2.1.3 release? |
|
@maxtrevor I will poke at this a bit more to see if I can make the tests pass, but if that takes too long, I might just decide to start a new release line from master. |
* update lalsimulation cvmfs path * missed that the mount location needs to be changed as well * more references to previsou CVMFS location
This reverts commit e3418c7.
titodalcanton
merged commit 89f4f1e
into
gwastro:v21_release_branch
27 of 46 checks passed
|
I accidentally pushed to the upstream branch here. The only remaining failures were on the docs though, which we do not care about for this release line, so I suppose this is ok. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.