Allow SNR optimizer to use candidate point in initial array #4393
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
| @@ -292,6 +334,9 @@ if args.optimizer == 'pso' and ps == None: | |||
| parser.error('You need to install pyswarms to use the pso optimizer.') | |||
| pycbc.init_logging(args.verbose) | |||
|
|
|||
| if args.seed: | |||
There was a problem hiding this comment.
These changes mean that we can control the random seed for these optimizers, which is useful for testing
|
Poke @ArthurTolley |
GarethCabournDavies
force-pushed
the
optimize_initial_point
branch
from
af48618
to
81380dd
Compare
|
@ArthurTolley If you are happy with the changes, go to the 'Files Changed' page, go to 'Review changes', select 'approve' and click 'submit review' (with an optional comment as to why you are approving) |
|
@GarethCabournDavies How do you always manage to read my mind and know when I'm looking at something 🤯 I'll have one final look and then happy to approve because I think it's a great feature which makes a lot of sense! |
ArthurTolley
approved these changes
Jun 28, 2023
bhooshan-gadre
pushed a commit
to bhooshan-gadre/pycbc
that referenced
this pull request
Jul 11, 2023
…4393) * allow SNR optimizer to use the candidate point in the initial array of test points
|
Remember to tag stuff relevant to PyCBC Live with the "low latency" label, otherwise we will forget to cherry-pick it into release branches… |
|
FWIW, what benefit do we expect to get by doing this? E.g. does it guarantee that any 'optimized' point will be better than the search template? |
That's the idea: this means that the search template is always within the swarm / set of attempted templates, so the 'best point' is always equal or better than the template
Sorry, will try to remember this in future |
|
I actually found PSO to be quite efficient if using the template bank itself (or points from "nearby" in the template bank) as seeds. So not just the point itself, but also other nearby points. |
tdent
added a commit
that referenced
this pull request
Jul 26, 2023
* Try to fix CI tests (#4394) * Switch FFTW/MKL order of preference * Swap backend order and force gomp import * FIx typo * Do need openmpi in tox.ini * Fix bug in MKL error function * Force FFTW on this one. * CC * Requested Josh changes * Add bank corner plot (#4339) * Add corner plotting script for template banks * Comment where premerger duration has been subtracted from template duration in bank_conversions * add premerger_duration to bank_conversions.py * Move premerger duration into bank_conversions * Use bank's approximant * Dont plot signular values as default * CC complaints * docstring * TDC comments * Keep approximant kwarg as default, TDC comments 2 * Added an OSError exception to MKL check (#4390) * Add a possibility for defaultvalues sections in config files (#4385) * Add a possibility for defaultvalues sections in config files * do not allow [section] and [section-defaultvalues] options * defaultvalues for top-level sections only * underscore on add_ini_opts * Remove default sections from get_subsections (#4399) * Update setup-python action to v4 (#4400) * Replace LOSC with GWOSC (#4401) * Replace LOSC with GWOSC * Fix leftover Python 2-ism * Try to improve codeclimate * Try to fix codeclimate * Try to fix codeclimate * Try to fix codeclimate * Exclude IFO sections when looping through the get_subsections (#4402) * Exclude IFO sections when looping through the get_subsections for plots * Add an example whihc would have previously failed into the search config * Offline singles in workflow (#4386) * Add single-detector options into workflow * Fix a couple of isses which make results pages weird * fix * fix gen.sh to use correct workflow generator * revert change made in error * A couple of points which state coincident when it may not be * Rejection samp (#4379) * unexpected events * added temp-volume in cl * added rejection sampling * added indexing of mchirp in fit_param * added compensation factor * added corrections * added more corrections * added random number generator seed * added mchirp instead of log(mchirp) in rejection samp * Use probabilities to compensate downsampled kde * Try to deal with flaky failures when apt-getting (#4384) * Implement pre-cuts in fit_over_multiparam for efficiency (#4374) * Make some efficiency savings in pycbc_fit_sngls_over_multiparam * Missing logging line in once case * Add in progress reporting, in case of silent failure * I thought we needed some leeway, but we don't * TD comments * Simplify comment * Migrate to new gwdatafind API (#4383) * Migrate to new gwdatafind API * CC and one regression fix * One more style change * Don't need these options now * Revert "Don't need these options now" This reverts commit 6f2ed1b. * Add a Fisher distribution for sky locations (#4209) * Update transforms.py Adding new_z_to_euler and rotate_euler from pylal.sphericalutils * Update sky_location.py Added new class FisherDist for drawing from sky locations (in ra, dec) * Update sky_location.py Included help message for fisherDist * Update sky_location.py * Code climate issues * Code climate issues * Code-climate changes * Code climate issues * Code climate issues * Update transforms.py changed lal.PI to numpy.pi in new_z_to_euler * Update transforms.py minor changes * Update sky_location.py updated docstring, did changes to make the code look more simple * Update sky_location.py typos corrected * Update sky_location.py code climate changes * Update sky_location.py * Update sky_location.py Included the definitions rvs_polaz and rvs_radec * Update transforms.py Included the definitions decra2polaz and polaz2decra * Update sky_location.py * Update transforms.py code climate issues fixed * Update sky_location.py code climate issues fixed * Update sky_location.py code climate issues * Update sky_location.py fixed code climate issues * Update sky_location.py fixed code climate issues * Update sky_location.py * Update pycbc/distributions/sky_location.py Co-authored-by: Tito Dal Canton <tito@dalcanton.it> * Update sky_location.py * Update sky_location.py * Update transforms.py modified polaz2decra to polaz2radec * Update sky_location.py * Update sky_location.py Forgotten polaz2decra --> polaz2radec * Update sky_location.py Code climate fixes * Update sky_location.py Updated the code for checking the effectiveness of running from config file * Create sky_location_old.py * modified to include from config * Modified to run from config file * Added Fisher distribution to the lista of available distributions * Delete sky_location_old.py * Update sky_location.py * Renamed Fisher to FisherSky * Updated the name to FisherSky * changed Fisher to FisherSky in __all__ * removed decra2polaz and polaz2radec to conversions * Included def decra2polaz, polaz2radec in line 859 * Added angle_unit option * removed decra2polaz and polaz2decra * made carresction * made corrections * Corrected the typing error while removing recra2polaz * Modified angle_unit and updated init file * Empty line on 852 retrieved * corrected * Empty line on852 retrieved * Fixed code climate issues * Sigma conversion taken care of * Fixed code climate issues * Update sky_location.py Codeclimate * Update test_distributions.py Adding fisher_sky to the list of distributions that do not undergo the distribution unittests. * Update sky_location.py Syntax fixed. * Update sky_location.py complying to codeclimate * Refactor using scipy's Rotation * Improve docstring and make warning stricter * Update pycbc/distributions/sky_location.py Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> * Update pycbc/distributions/sky_location.py right angle to correct angle Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> * Update sky_location.py logging issue solved --------- Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> Co-authored-by: Tito Dal Canton <tito@dalcanton.it> Co-authored-by: P Prasia <prasia.p@ldas-pcdev2.gw.iucaa.in> Co-authored-by: Tito Dal Canton <tito.canton@ligo.org> * add in several missing marginalization combinations (#4376) * allow polarization marginalization with earth rotation * add in missing marg combos * fixes * fixes * fixes * cleanup * cc * cc * Try to fix CI tests (#4394) * Switch FFTW/MKL order of preference * Swap backend order and force gomp import * FIx typo * Do need openmpi in tox.ini * Fix bug in MKL error function * Force FFTW on this one. * CC * Requested Josh changes * Add bank corner plot (#4339) * Add corner plotting script for template banks * Comment where premerger duration has been subtracted from template duration in bank_conversions * add premerger_duration to bank_conversions.py * Move premerger duration into bank_conversions * Use bank's approximant * Dont plot signular values as default * CC complaints * docstring * TDC comments * Keep approximant kwarg as default, TDC comments 2 * Added an OSError exception to MKL check (#4390) * Add a possibility for defaultvalues sections in config files (#4385) * Add a possibility for defaultvalues sections in config files * do not allow [section] and [section-defaultvalues] options * defaultvalues for top-level sections only * underscore on add_ini_opts * Remove default sections from get_subsections (#4399) * Update setup-python action to v4 (#4400) * Replace LOSC with GWOSC (#4401) * Replace LOSC with GWOSC * Fix leftover Python 2-ism * Try to improve codeclimate * Try to fix codeclimate * Try to fix codeclimate * Try to fix codeclimate * Exclude IFO sections when looping through the get_subsections (#4402) * Exclude IFO sections when looping through the get_subsections for plots * Add an example whihc would have previously failed into the search config * Offline singles in workflow (#4386) * Add single-detector options into workflow * Fix a couple of isses which make results pages weird * fix * fix gen.sh to use correct workflow generator * revert change made in error * A couple of points which state coincident when it may not be --------- Co-authored-by: Thomas Dent <thomas.dent@usc.es> Co-authored-by: Ian Harry <ian.harry@ligo.org> Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> Co-authored-by: Prasia-Pankunni <116145091+Prasia-Pankunni@users.noreply.github.com> Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> Co-authored-by: Tito Dal Canton <tito@dalcanton.it> Co-authored-by: P Prasia <prasia.p@ldas-pcdev2.gw.iucaa.in> Co-authored-by: Tito Dal Canton <tito.canton@ligo.org> Co-authored-by: Alex Nitz <alex.nitz@gmail.com> Co-authored-by: Arthur Tolley <32394213+ArthurTolley@users.noreply.github.com> Co-authored-by: Tito Dal Canton <tito.dalcanton@ijclab.in2p3.fr> * Adding SEOBNRv5Peak key and function in the final frequency cutoff dictionary (#4408) Co-authored-by: KHUN PHUKON <khun.phukon@ligo.org> * Injection kde (#4409) * unexpected events * added temp-volume in cl * added injection kde * significance bug for trigger_fit. A couple of minor fixes (#4407) * Upgrades to pycbc_grb_inj_finder (#4364) * retaining single ifo injection information * Update pycbc_grb_inj_finder Update according to requested changes from pull request review. * Adding more specific comments Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> * Adding more specific comments out_dict changed to "output dictionary" in comment Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> * Remove xlen Removed xlen from cp_dataset_cont and instead calculated the length of xidentifier within the function. * Reverting comment changes * Remove extra comment * Francesco's bug fix Modified to simplify and correct where ifo information was jumbled together * remove trig_dict and comment * Removed extra lines Removed line and datasets = {} * Update to copyright comment and imports Added our names and accounted for older python version. --------- Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> * Simple bugfix (#4413) Co-authored-by: Bhooshan Gadre <bhooshan.gadre@ligo.org> * Move PyCBC venvs to new IGWN CVMFS server (#4412) * 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 <duncan.macleod@ligo.org> * 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 <duncan.macleod@ligo.org> * Get FFT options in pycbc_condition_strain (#4404) * pycbc_optimize_snr: Implement mass dependent bounds on spin parameters (#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 <thomas.dent@usc.es> * Allow SNR optimizer to use candidate point in initial array (#4393) * allow SNR optimizer to use the candidate point in the initial array of test points * update two LISA docs (#4417) * Update injection_smbhb.ini * Update lisa_smbhb_relbin.ini * Update lisa_smbhb_relbin.ini * Update lisa_smbhb_relbin.ini * Update lisa_smbhb_ldc_pe.rst * Allow pycbc_multi_inspiral to search over a sky grid (#4380) * Allow pycbc_multi_inspiral to search over a sky grid * Adding the possibility to give either a sky grid or a sky position * Change the names of the command lines --ra and --dec to --latitude and --longitude to match the changes made in pycbc_multi_inspiral and remove --processing-scheme because it makes the example crash * Compute the antenna pattern only once for each sky position by keeping fp and fc together * Replace the number of detectors from a hardcoded value to a variable * add TDI AE PSD with confusion noise for LISA (#4389) * add TDI AE PSD with confusion noise * Update analytical_space.py * fix cc issue * Update analytical.py * EM brute (#4299) * Space before colons in eos_utils.py help messages * Enable extrapolation in eos_utils.py when NS is out of bounds * Same check on shape in primary_mass and secondary mass * Function to swap masses and spins of object 1 and object2 * Allow user to request for remnant_mass calculations: 1) extrapolation, 2) swapping object 1 and object 2 if mass2 > mass1, 3) treat as a (dark) BBH and NSBH with NS mass greater than a value probided by the user * Renamned swap_companions to ensure_obj1_is_primary and generalized it * codeclimate * codeclimate * Fixed line that was too long * Fixed docstring and using keywords explicitly in all remnant_mass_* calls * Renamed max_ns_mass as ns_bh_mass_boundary and improved help messages of functions * Improved docstings * Comprehensions in pycbc_brute_bank * Complying to naming convention for spin components in spherical coordinates * Update conversions.py Fixing single code climate complaint. * Prevent duplicates of the HLV page_ifar plot on the summary page (#4421) * Prevent duplicates of the HLV page_ifar plot on the summary page * Rename 'coincidences' as appropriate * add high frequency sky location dependent response for long detectors (#4377) * reset commit, add in high freqeuncy response to detector * update * fixes * Make pegasus 5.0.5 work (#4276) * Revert "try pinning pegasus version (#4265)" This reverts commit 398e135. * Set for_planning flag for subworkflow output map * Add version check so we don't break 5.0.3 * Also include 5.0.4 * make ci faster (#4414) * update * move long log into debug level, allow to set debug level * fix workflow * more explicit control of running external scripts for docs setup at same time * fixes * update * try this * try this ... * update * fixes * update * updates * mistake in example search config file (#4425) * mistake in example search config file * add failure if search runs too long * Range_temp kde (#4424) * unexpected events * added temp-volume in cl * setting the range for temp_kde * setting min based on max kde * logging for min template kde ratio --------- Co-authored-by: Thomas Dent <thomas.dent@usc.es> * Pygrb offline workflow (#4288) * Fixed indexing and autochisq argument in pycbc_multi_inspiral * Only Hanford is labelled with a 1: avoiding pycbc_pygrb_plot_snr_timeseries failure. trigs rather than trigs_or_injs as variable name in pycbc_pygrb_plot_coh_ifosnr * Simplified and update pycbc_pygrb_plot_injs_results; adapted pycbc_pygrb_pp_workflow * Forgotten comma * Massive commit that stitches together pycbc_make_offline_grb_workflow and pycbc_pygrb_pp_workflow, by picking up the latter as a SubWorkflow. * Massive commit that stitches together pycbc_make_offline_grb_workflow and pycbc_pygrb_pp_workflow, by picking up the latter as a SubWorkflow. * Code-climate fixes * More code-climate * Import error flagged by code-climate * Forgotten import fixes * Minor cleanup of comments or commented out code lines * Syntax fix * Defining 2 empty file lists * First part of PR 4288 review comments * One more TODO * opt_to_file is now configparser_value_to_file in pycbc/workflow/core.py * Upgraded configparser_value_to_file with attrs keyword argument * Using configparser_value_to_file throughout the PyGRB workflow generator * Removing 2 unused PyGRB functions * Removed LigolwCBCAlignTotalSpinExecutable, LigolwCBCJitterSkylocExecutable, and PycbcDarkVsBrightInjectionsExecutable support in general and removed LalappsInspinjExecutable support from PyGRB * Codeclimate * bank_veto_file variable needs to be a FileList, not a File * Bug with tags for single IFO SNR plots workflow generator * Fixing pycbc_pygrb_plot_coh_ifosnr * Fixing layout of chi-square plots and section label for individual detector SNRs * Codeclimate * Codeclimate * Codeclimate * Removed FIXME for testing purposes * First changes following up on PR review * Second round of changes following up on PR review * Flagging with an underscore grb utility functions not used outside the files they are defined in * Flagging with an underscore grb utility functions not used outside the files they are defined in * Removed _get_antenna_factors from PyGRB utily file * Removed commented out function from pycbc_pygrb_plot_injs_results * Substituted old unused code with a TODO * Adding injection set name as an option in pycbc_pygrb_efficiency * extend --> append for single files * Documenting setup_pygrb_pp_workflow more appropriately * Reverted name of _get_antenna_responses to get_antenna_responses; cleaner handling of bank-veto-bank-file for pycbc_multi_inspiral job setup. * Line shortened * Avoid skymap v1.1.0 (#4429) * only download LISA response file once (#4423) * Update analytical_space.py * Update analytical_space.py * Introduced a new arguement --skymap-only-ifos in pycbc_live (#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 <souradeep.pal@ldas-pcdev4.ligo.caltech.edu> Co-authored-by: Ian Harry <ian.harry@port.ac.uk> * Fix stageout (#4428) * Fix the help message for stageout script * Fix the help message for stageout and copy map scripts --------- Co-authored-by: connor-mcisaac <connor.mcisaac@outlook.com> * more physical rwrap for LISA SMBHB/SOBHB injection (follow-up fix 2) (#4350) * more physical rwrap * fix cc issues * Update waveform.py * Update companion.txt * Update requirements.txt * Update requirements.txt * Update companion.txt * 10 times tau * Update companion.txt * Update requirements.txt * Update setup.py * add check * Update waveform.py * allow user to choose rwarp * fix cc issue * set 0.2 as minimum rwrap * Update waveform.py * Remove most X509/globus links and hooks from PyCBC (#4375) * Remove most X509/globus links and hooks from PyCBC * Need to update this one as well * Don't need these options now * Update docs/workflow/pycbc_make_coinc_search_workflow.rst Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> --------- Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> * fftw_fix (#4418) * Allow pycbc inspiral to run with only numpy fft * Remove Unneeded function from npfft.py --------- Co-authored-by: Neeresh Kumar Perla <neereshkumarperla@Neereshs-MacBook-Pro.local> * Add argument verification for singles (#4365) * 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 * Move versioning page generation into its own executable (#4431) * Move versioning page generation into its own executable * Allow duplicated executables * 🤦 * CC changes * CC * save_fig_with_metadata cannot be imported from versioning * Don't like spaces in arguments * Ian's comments * Dont pass executables as files * Same type output from get_code_version_numbers * Rename --longitude and --latitude back to --ra and --dec (#4433) * bugfix - allow non-running of singles (#4439) * bugfix - allow non-running of singles * CC * Revrt wrongly-added test chnages * Add IMRPhenomXAS template duration (#4410) * Add IMRPhenomXAS template duration * removing assertion * fixed fomatting for codeclimate * Adding PhenomXAS duration and removing space fixes * removing extra new line --------- Co-authored-by: Bhooshan Gadre <bhooshan.gadre@ligo.org> * Treat CVMFS better (#4440) * dqsegdb2 update (#4442) * dqsegdb2 update * Update requirements-igwn.txt Co-authored-by: Duncan Macleod <duncan.macleod@ligo.org> --------- Co-authored-by: Ian Harry <ian.harry@ligo.org> Co-authored-by: Duncan Macleod <duncan.macleod@ligo.org> --------- Co-authored-by: Ian Harry <ian.harry@ligo.org> Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> Co-authored-by: Arthur Tolley <32394213+ArthurTolley@users.noreply.github.com> Co-authored-by: Tito Dal Canton <tito.dalcanton@ijclab.in2p3.fr> Co-authored-by: Praveen Kumar <86048588+PRAVEEN-mnl@users.noreply.github.com> Co-authored-by: Prasia-Pankunni <116145091+Prasia-Pankunni@users.noreply.github.com> Co-authored-by: Francesco Pannarale <pannarale@users.noreply.github.com> Co-authored-by: Tito Dal Canton <tito@dalcanton.it> Co-authored-by: P Prasia <prasia.p@ldas-pcdev2.gw.iucaa.in> Co-authored-by: Tito Dal Canton <tito.canton@ligo.org> Co-authored-by: Alex Nitz <alex.nitz@gmail.com> Co-authored-by: Khun Sang Phukon <khunsang@gmail.com> Co-authored-by: KHUN PHUKON <khun.phukon@ligo.org> Co-authored-by: ETVincent <98178306+ETVincent@users.noreply.github.com> Co-authored-by: Bhooshan Uday Varsha Gadre <bhooshanudaygadre@gmail.com> Co-authored-by: Bhooshan Gadre <bhooshan.gadre@ligo.org> Co-authored-by: Duncan Macleod <duncan.macleod@ligo.org> Co-authored-by: Shichao Wu <wushichao@mail.bnu.edu.cn> Co-authored-by: hoangstephanie <105010876+hoangstephanie@users.noreply.github.com> Co-authored-by: SouradeepPal <126229608+SouradeepPal@users.noreply.github.com> Co-authored-by: Souradeep Pal <souradeep.pal@ldas-pcdev4.ligo.caltech.edu> Co-authored-by: Ian Harry <ian.harry@port.ac.uk> Co-authored-by: connor-mcisaac <connor.mcisaac@outlook.com> Co-authored-by: Neeresh Kumar <neeresh@users.noreply.github.com> Co-authored-by: Neeresh Kumar Perla <neereshkumarperla@Neereshs-MacBook-Pro.local>
|
Was it tested that this produces OK results, in terms of actually optimizing SNR (eg for a BNS injection)? |
This was tested by running on various candidates from pycbc live and checking that SNR increased or stayed the same in all cases (Note that this was designed with PSO in mind) |
|
Ah, was it not tested with DE then? |
|
It was tested, but I think I didn't look at the outputs closely enough in that case (i.e. tests ran, checks on test results werent good enough) |
titodalcanton
pushed a commit
to titodalcanton/pycbc
that referenced
this pull request
Jan 16, 2024
…4393) * allow SNR optimizer to use the candidate point in the initial array of test points
titodalcanton
added a commit
to titodalcanton/pycbc
that referenced
this pull request
Jan 16, 2024
…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.
titodalcanton
added a commit
to titodalcanton/pycbc
that referenced
this pull request
Jan 19, 2024
… array (gwastro#4393)"" This reverts commit 7be12f1. We are now catching up with master, where the bug originally introduced by gwastro#4393 is fixed properly, so here I am undoing the temporary fix.
titodalcanton
added a commit
that referenced
this pull request
Feb 6, 2024
* Remove reference to relative_example in docs * Use RTLD_GLOBAL for libgomp (#4353) * Use RTLD_GLOBAL for libgomp In conda-forge/pycbc-feedstock#74 it was suggested to use RTLD_GLOBAL for libgomp. Let's see if this works fine with the test suite (which should answer @josh-willis 's concerns). * Move import of ctypes/gomp into __enter__ * Try this * Revert "Revert "Allow SNR optimizer to use candidate point in initial array (#4393)"" This reverts commit 7be12f1. We are now catching up with master, where the bug originally introduced by #4393 is fixed properly, so here I am undoing the temporary fix. * SNR optimisation options for pycbc_live (#4432) * Moving the live optimizer option changes to my own branch * Completing the snr optimization argument group * updating pycbc_live * re-adding bug fix * removing TODO message * Bug with d_e options * Adding optimizer-seed * fixing the d_e optimizer * replacing run.sh code * resolve merge conflict * fixing run.sh * cleaning up args_to_string func * changing comment * codeclimate fixes * module docstring * Update module docstring copyright Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> * Add gareth * removing argv * argument changing * removing duplicated arguments * minor CC points * remove bug introduced when making CC happier --------- Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> Co-authored-by: Thomas Dent <thomas.dent@usc.es> * Improvements to single-detector trigger fitting code for PyCBC Live (#4486) * Cleanup * Cleanup * Refactor duration bin parsing code and add support for reading from bank * Minor fix/cleanup to logging * Update CLI checks for duration bins * Cleanup * Ignore inconsistent config when combining * Fix bug * Fix typo Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> * Comment from Gareth --------- Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> * [pycbc live] Don't add snr options to command if they don't exist (#4518) * Don't run snr optimizer setup if not optimizing snr * moving the check to a more appropraite place * setting snr_opt_options to None if not optimizing * [pycbc live] Allowing the use of psd variation in the ranking statistic for pycbc live (#4533) * Modifying files to include psd variation in single detector statistic calculation * ending variation.py with a blank line * Changing to an increment agnostic solution * removing change already fixed * Updating function names and docstrings * removing ToDos and adding more helpful comments * Removing unused import * Codeclimate fixes * Removing excess logging and whitespace mistakes * Removing unused objects + codeclimate fixes * Updating comments and docstrings, removing matchedfilter changes * Revert "Updating comments and docstrings, removing matchedfilter changes" This reverts commit 0e6473a. * Removing matchedfilter changes, updating comments and docstrings * Move --verbose to the end of the commands * more comment updates * Repositioning filter recreation * Changes to comments and removing whitespace Co-authored-by: Thomas Dent <thomas.dent@usc.es> * removing refchecks * Adding option veification for psd variation * Apply suggestions from code review Co-authored-by: Thomas Dent <thomas.dent@usc.es> * fixing EOL error * Refactoring the filter creation function * codeclimate fixes * undo * full_filt func * removing indentation * code climate * code climate * try to quiet codeclimate * codeclimate doesn't know PEP8 * brackets obviate line continuation --------- Co-authored-by: Thomas Dent <thomas.dent@usc.es> * added scaling of initial pop in snr_optimizer (#4561) * added scaling of initial pop * init popn in optimize_di & pso func * added changes in optimize_pso * usig logging.debug for snr * Do not set matplotlib's backend in internal modules (#4592) * Set version to 2.1.4 * Remove reference to single_template_examples in docs * Remove reference to hierarchical_model in docs * Live: produce empty trigger fit plot for detectors with no triggers (#4600) * Live: produce empty trigger fit plot for detectors with no triggers * allow for below-threshold triggers * fix thinko in option parsing for defaults (#4615) * fix thinko in option parsing for defaults When an option is not given at all getattr on the args object gives None, but we don't want to translate that into "--option-name None" on the command line. * bugfix obviously we needed to define 'key_name' first .. * Improvements to single fit plots (#4509) * Improvements to single fit plots * Apply suggestions from Gareth Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> --------- Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> --------- Co-authored-by: Ian Harry <ian.harry@ligo.org> Co-authored-by: Arthur Tolley <32394213+ArthurTolley@users.noreply.github.com> Co-authored-by: Gareth S Cabourn Davies <gareth.cabourndavies@ligo.org> Co-authored-by: Thomas Dent <thomas.dent@usc.es> Co-authored-by: Praveen Kumar <86048588+PRAVEEN-mnl@users.noreply.github.com>
acorreia61201
pushed a commit
to acorreia61201/pycbc
that referenced
this pull request
Apr 4, 2024
…4393) * allow SNR optimizer to use the candidate point in the initial array of test points
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.
Allow PSO and differential evolution optimizers to use the candidate point in the initial array