PyCBC 2.3.7__tar.gz → 2.3.8__tar.gz

{PyCBC-2.3.7 → PyCBC-2.3.8}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyCBC
-Version: 2.3.7
+Version: 2.3.8
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://www.pycbc.org/
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 License: UNKNOWN
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.7
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.8
 Description: ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
         
         [PyCBC](http://pycbc.org) is a software package used to explore astrophysical sources of gravitational waves.

{PyCBC-2.3.7 → PyCBC-2.3.8}/PyCBC.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyCBC
-Version: 2.3.7
+Version: 2.3.8
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://www.pycbc.org/
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 License: UNKNOWN
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.7
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.3.8
 Description: ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
         
         [PyCBC](http://pycbc.org) is a software package used to explore astrophysical sources of gravitational waves.

{PyCBC-2.3.7 → PyCBC-2.3.8}/PyCBC.egg-info/requires.txt

@@ -1,7 +1,7 @@
 numpy>=1.16.0
 cython>=0.29
-numpy!=1.19.0,>=1.16.0
-scipy>=0.16.0
+numpy!=1.19.0,<2.0.0,>=1.16.0
+scipy<1.14.0,>=0.16.0
 astropy!=4.0.5,!=4.2.1,>=2.0.3
 matplotlib>=1.5.1
 mpld3>=0.3

{PyCBC-2.3.7 → PyCBC-2.3.8}/bin/minifollowups/pycbc_injection_minifollowup

@@ -386,18 +386,36 @@ for num_event in range(num_events):
 
     for curr_ifo in args.single_detector_triggers:
         single_fname = args.single_detector_triggers[curr_ifo]
-        hd_sngl = SingleDetTriggers(single_fname, args.bank_file, None, None,
-                                    None, curr_ifo)
-        end_times = hd_sngl.end_time
-        # Use SNR here or NewSNR??
-        snr = hd_sngl.snr
-        lgc_mask = abs(end_times - inj_params['tc']) < args.inj_window
+        # pre-cut for triggers within the time window of the injection
+        with HFile(single_fname) as trig_file:
+            n_triggers = trig_file[f'{curr_ifo}/end_time'].size
+            idx, _ = trig_file.select(
+                lambda t: abs(t - inj_params['tc']) < args.inj_window,
+                f'{curr_ifo}/end_time',
+                return_indices=True
+            )
 
-        if len(snr[lgc_mask]) == 0:
+        if len(idx) == 0:
+            # No triggers in this window
             continue
+        lgc_mask = numpy.zeros(n_triggers, dtype=bool)
+        lgc_mask[idx] = True
+
+        hd_sngl = SingleDetTriggers(
+            single_fname,
+            args.bank_file,
+            None,
+            None,
+            None,
+            curr_ifo,
+            premask=lgc_mask
+        )
+        # Use SNR here or NewSNR??
+        snr = hd_sngl.snr
 
-        snr_idx = numpy.arange(len(lgc_mask))[lgc_mask][snr[lgc_mask].argmax()]
+        snr_idx = idx[snr.argmax()]
         hd_sngl.mask = [snr_idx]
+
         curr_params = copy.deepcopy(inj_params)
         curr_params['mass1'] = hd_sngl.mass1[0]
         curr_params['mass2'] = hd_sngl.mass2[0]

{PyCBC-2.3.7 → PyCBC-2.3.8}/bin/minifollowups/pycbc_sngl_minifollowup

@@ -249,48 +249,30 @@ if args.maximum_duration is not None:
 logging.info('Finding loudest clustered events')
 rank_method = stat.get_statistic_from_opts(args, [args.instrument])
 
-extra_kwargs = {}
-for inputstr in args.statistic_keywords:
-    try:
-        key, value = inputstr.split(':')
-        extra_kwargs[key] = value
-    except ValueError:
-        err_txt = "--statistic-keywords must take input in the " \
-                  "form KWARG1:VALUE1 KWARG2:VALUE2 KWARG3:VALUE3 ... " \
-                  "Received {}".format(args.statistic_keywords)
-        raise ValueError(err_txt)
-
-logging.info("Calculating statistic for %d triggers", len(trigs.snr))
-sds = rank_method.single(trigs)
-stat = rank_method.rank_stat_single((args.instrument, sds), **extra_kwargs)
-logging.info("Clustering events over %.3fs window", args.cluster_window)
-cid = coinc.cluster_over_time(stat, trigs.end_time,
-                              args.cluster_window)
-trigs.apply_mask(cid)
-stat = stat[cid]
-if len(trigs.snr) < num_events:
-    num_events = len(trigs.snr)
-
-logging.info("Finding the loudest triggers")
-loudest_idx = sorted(numpy.argsort(stat)[::-1][:num_events])
-trigs.apply_mask(loudest_idx)
-stat = stat[loudest_idx]
+trigs.mask_to_n_loudest_clustered_events(
+    rank_method,
+    n_loudest=num_events,
+    cluster_window=args.cluster_window,
+)
 
 times = trigs.end_time
-tids = trigs.template_id
+trig_stat = trigs.stat
+trig_snrs = trigs.snr
+
+if isinstance(trigs.mask, numpy.ndarray) and trigs.mask.dtype == bool:
+    trigger_ids = numpy.flatnonzero(trigs.mask)
+else:
+    trigger_ids = trigs.mask
 
 # loop over number of loudest events to be followed up
-order = stat.argsort()[::-1]
+order = trig_stat.argsort()[::-1]
 for rank, num_event in enumerate(order):
-    logging.info('Processing event: %s', num_event)
+    logging.info('Processing event: %s', rank)
 
     files = wf.FileList([])
     time = times[num_event]
     ifo_time = '%s:%s' %(args.instrument, str(time))
-    if isinstance(trigs.mask, numpy.ndarray) and trigs.mask.dtype == bool:
-        tid = numpy.flatnonzero(trigs.mask)[num_event]
-    else:
-        tid = trigs.mask[num_event]
+    tid = trigger_ids[num_event]
     ifo_tid = '%s:%s' %(args.instrument, str(tid))
 
     layouts += (mini.make_sngl_ifo(workflow, sngl_file, tmpltbank_file,

{PyCBC-2.3.7 → PyCBC-2.3.8}/bin/pycbc_source_probability_offline

@@ -25,20 +25,13 @@ parser.add_argument('--search-tag', required=True,
 parser.add_argument('--ifar-threshold', type=float, default=None,
                     help='Select only candidate events with IFAR '
                          'above threshold.')
-parser.add_argument('--include-mass-gap', action='store_true',
-                    help='Option to include the Mass Gap region.')
 parser.add_argument('--verbose', action='count')
 parser.add_argument("--version", action="version",
                     version=pycbc.version.git_verbose_msg)
 mchirp_area.insert_args(parser)
 args = parser.parse_args()
 
-mc_area_args = mchirp_area.from_cli(args)
-
-if not args.include_mass_gap:
-    mass_bdary = mc_area_args['mass_bdary']
-    assert mass_bdary['ns_max'] == mass_bdary['gap_max'], \
-           'NS/Mass Gap boundaries should be the same.'
+mc_area_args = mchirp_area.from_cli(args, parser)
 
 pycbc.init_logging(args.verbose)
 
@@ -88,7 +81,8 @@ for event in tqdm.trange(len(ifar)):
                        / sngl_snr[ifo][0][event] for ifo in ifos_event])
     probs = mchirp_area.calc_probabilities(mchirp[event], coinc_snr,
                                            min_eff_dist, mc_area_args)
-    if not args.include_mass_gap:
+    # We do not expect a mass gap entry, but just in case
+    if "Mass Gap" in probs:
         probs.pop("Mass Gap")
     ifo_names = ''.join(sorted(ifos_event))
     out_name = dir_path + '%s-%s-%i-1.json' % (ifo_names, args.search_tag,

{PyCBC-2.3.7 → PyCBC-2.3.8}/pycbc/inference/sampler/emcee_pt.py

@@ -34,6 +34,9 @@ from ..burn_in import EnsembleMultiTemperedMCMCBurnInTests
 from pycbc.inference.io import EmceePTFile
 from .. import models
 
+# This is a hack that will allow us to continue using emcee's abandoned
+# PTSampler, which relied on `numpy.float`, until the end of time.
+numpy.float = float
 
 if emcee.__version__ >= '3.0.0':
     raise ImportError

{PyCBC-2.3.7 → PyCBC-2.3.8}/pycbc/io/hdf.py

@@ -483,7 +483,7 @@ class SingleDetTriggers(object):
                                                                        % param)
 
     def trig_dict(self):
-        """Returns dict of the masked trigger valuse """
+        """Returns dict of the masked trigger values """
         mtrigs = {}
         for k in self.trigs:
             if len(self.trigs[k]) == len(self.trigs['end_time']):
@@ -491,6 +491,7 @@ class SingleDetTriggers(object):
                     mtrigs[k] = self.trigs[k][self.mask]
                 else:
                     mtrigs[k] = self.trigs[k][:]
+        mtrigs['ifo'] = self.ifo
         return mtrigs
 
     @classmethod

PyCBC-2.3.8/pycbc/version.py

@@ -0,0 +1,27 @@
+# coding: utf-8
+# Generated by setup.py for PyCBC on 2024-09-25 18:26:18 +0000.
+
+# general info
+version = '2.3.8'
+date = '2024-09-25 18:05:04 +0000'
+release = 'True'
+last_release = '2.5.1'
+
+# git info
+git_hash = 'd6e94f55d24450fc77a15ef5bde809203c31c702'
+git_branch = 'None'
+git_tag = 'v2.3.8'
+git_author = 'Ian Harry <ian.harry@ligo.org>'
+git_committer = 'GitHub <noreply@github.com>'
+git_status = 'CLEAN: All modifications committed'
+git_builder = 'Unknown User <>'
+git_build_date = '2024-09-25 18:26:18 +0000'
+git_verbose_msg = """Version: 2.3.8
+Branch: None
+Tag: v2.3.8
+Id: d6e94f55d24450fc77a15ef5bde809203c31c702
+Builder: Unknown User <>
+Build date: 2024-09-25 18:26:18 +0000
+Repository status is CLEAN: All modifications committed"""
+
+from pycbc._version import *

{PyCBC-2.3.7 → PyCBC-2.3.8}/pyproject.toml

@@ -1,12 +1,13 @@
 [build-system]
 requires = ["setuptools",
             "wheel",
-            "cython>=0.29.21",
+            "cython>=3.0.0",
             "numpy==1.16.0; python_version <= '3.7'",
             "numpy==1.17.3; python_version == '3.8'",
             "numpy==1.19.3; python_version == '3.9'",
             "numpy==1.21.4; python_version =='3.10'",
-            "numpy; python_version >= '3.11'",
+            "numpy==1.23.4; python_version >= '3.11'",
+            "numpy; python_version >= '3.12'"
             ]
 
 # To ensure the best compatibility, try to match the numpy reqs

{PyCBC-2.3.7 → PyCBC-2.3.8}/setup.py

@@ -34,8 +34,8 @@ requires = []
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0',
-    'scipy>=0.16.0',
+    'numpy>=1.16.0,!=1.19.0,<2.0.0',
+    'scipy>=0.16.0,<1.14.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',
     'mpld3>=0.3',
@@ -119,7 +119,7 @@ def get_version_info():
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.3.7'
+        vinfo.version = '2.3.8'
         vinfo.release = 'True'
 
     version_script = f"""# coding: utf-8

PyCBC-2.3.7/pycbc/version.py

@@ -1,27 +0,0 @@
-# coding: utf-8
-# Generated by setup.py for PyCBC on 2024-05-28 20:42:01 +0000.
-
-# general info
-version = '2.3.7'
-date = '2024-05-28 20:15:34 +0000'
-release = 'True'
-last_release = '2.4.0'
-
-# git info
-git_hash = '2e0f835b436827ce1626c53bad647a96ced7e9d0'
-git_branch = 'None'
-git_tag = 'v2.3.7'
-git_author = 'Ian Harry <ian.harry@ligo.org>'
-git_committer = 'GitHub <noreply@github.com>'
-git_status = 'CLEAN: All modifications committed'
-git_builder = 'Unknown User <>'
-git_build_date = '2024-05-28 20:42:01 +0000'
-git_verbose_msg = """Version: 2.3.7
-Branch: None
-Tag: v2.3.7
-Id: 2e0f835b436827ce1626c53bad647a96ced7e9d0
-Builder: Unknown User <>
-Build date: 2024-05-28 20:42:01 +0000
-Repository status is CLEAN: All modifications committed"""
-
-from pycbc._version import *