PyCBC 2.8.5__tar.gz → 2.8.6__tar.gz

{PyCBC-2.8.5 → pycbc-2.8.6}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyCBC
-Version: 2.8.5
+Version: 2.8.6
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://pycbc.org/
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.8.5
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.8.6
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 Keywords: ligo,physics,gravity,signal processing,gravitational waves
@@ -20,9 +20,47 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy>=1.16.0
+Requires-Dist: cython>=0.29
+Requires-Dist: numpy!=1.19.0,!=2.2.2,<2,>=1.16.0
+Requires-Dist: scipy<1.17.0,>=0.16.0
+Requires-Dist: astropy!=4.0.5,!=4.2.1,>=2.0.3
+Requires-Dist: matplotlib>=1.5.1
+Requires-Dist: mpld3>=0.3
+Requires-Dist: pillow
+Requires-Dist: h5py!=3.7.0,>=3.0.0
+Requires-Dist: jinja2
+Requires-Dist: Mako>=1.0.1
+Requires-Dist: beautifulsoup4>=4.6.0
+Requires-Dist: tqdm
+Requires-Dist: setuptools<82.0.0
+Requires-Dist: gwdatafind
+Requires-Dist: pegasus-wms.api==5.0.9
+Requires-Dist: pegasus-wms.common==5.0.9
+Requires-Dist: python-ligo-lw>=1.7.0
+Requires-Dist: igwn-segments
+Requires-Dist: lalsuite==7.25.1
+Requires-Dist: lscsoft-glue>=1.59.3
+Requires-Dist: pykerr
 Provides-Extra: cuda
+Requires-Dist: pycuda>=2015.1; extra == "cuda"
+Requires-Dist: scikit-cuda; extra == "cuda"
 Provides-Extra: igwn
-License-File: LICENSE
+Requires-Dist: ciecplib>=0.7.0; extra == "igwn"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
 

{PyCBC-2.8.5 → pycbc-2.8.6}/PyCBC.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyCBC
-Version: 2.8.5
+Version: 2.8.6
 Summary: Core library to analyze gravitational-wave data, find signals, and study their parameters.
 Home-page: http://pycbc.org/
-Download-URL: https://github.com/gwastro/pycbc/tarball/v2.8.5
+Download-URL: https://github.com/gwastro/pycbc/tarball/v2.8.6
 Author: The PyCBC team
 Author-email: alex.nitz@gmail.org
 Keywords: ligo,physics,gravity,signal processing,gravitational waves
@@ -20,9 +20,47 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy>=1.16.0
+Requires-Dist: cython>=0.29
+Requires-Dist: numpy!=1.19.0,!=2.2.2,<2,>=1.16.0
+Requires-Dist: scipy<1.17.0,>=0.16.0
+Requires-Dist: astropy!=4.0.5,!=4.2.1,>=2.0.3
+Requires-Dist: matplotlib>=1.5.1
+Requires-Dist: mpld3>=0.3
+Requires-Dist: pillow
+Requires-Dist: h5py!=3.7.0,>=3.0.0
+Requires-Dist: jinja2
+Requires-Dist: Mako>=1.0.1
+Requires-Dist: beautifulsoup4>=4.6.0
+Requires-Dist: tqdm
+Requires-Dist: setuptools<82.0.0
+Requires-Dist: gwdatafind
+Requires-Dist: pegasus-wms.api==5.0.9
+Requires-Dist: pegasus-wms.common==5.0.9
+Requires-Dist: python-ligo-lw>=1.7.0
+Requires-Dist: igwn-segments
+Requires-Dist: lalsuite==7.25.1
+Requires-Dist: lscsoft-glue>=1.59.3
+Requires-Dist: pykerr
 Provides-Extra: cuda
+Requires-Dist: pycuda>=2015.1; extra == "cuda"
+Requires-Dist: scikit-cuda; extra == "cuda"
 Provides-Extra: igwn
-License-File: LICENSE
+Requires-Dist: ciecplib>=0.7.0; extra == "igwn"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![GW150914](https://raw.githubusercontent.com/gwastro/pycbc-logo/master/pycbc_logo_name.png)
 

{PyCBC-2.8.5 → pycbc-2.8.6}/PyCBC.egg-info/requires.txt

@@ -1,7 +1,7 @@
 numpy>=1.16.0
 cython>=0.29
-numpy!=1.19.0,!=2.2.2,>=1.16.0
-scipy>=0.16.0
+numpy!=1.19.0,!=2.2.2,<2,>=1.16.0
+scipy<1.17.0,>=0.16.0
 astropy!=4.0.5,!=4.2.1,>=2.0.3
 matplotlib>=1.5.1
 mpld3>=0.3
@@ -11,7 +11,7 @@ jinja2
 Mako>=1.0.1
 beautifulsoup4>=4.6.0
 tqdm
-setuptools
+setuptools<82.0.0
 gwdatafind
 pegasus-wms.api==5.0.9
 pegasus-wms.common==5.0.9

{PyCBC-2.8.5 → pycbc-2.8.6}/bin/pygrb/pycbc_pygrb_minifollowups

@@ -27,6 +27,7 @@ import os
 import argparse
 import logging
 
+from igwn_segments import segmentlist
 import pycbc.workflow as wf
 from pycbc.workflow.core import FileList, resolve_url_to_file
 import pycbc.workflow.minifollowups as mini
@@ -181,11 +182,17 @@ if veto_file:
     veto_file = os.path.join(start_rundir, args.veto_file)
     veto_file = wf.resolve_url_to_file(veto_file)
 
+seg_file_abs_paths = [os.path.join(start_rundir, f) for f in args.seg_files]
+
 # Convert the segments files to a FileList
-seg_files = wf.FileList([
-    wf.resolve_url_to_file(os.path.join(start_rundir, f))
-    for f in args.seg_files
-])
+seg_files = wf.FileList(
+    [wf.resolve_url_to_file(f) for f in seg_file_abs_paths]
+)
+
+# The Q-scan jobs need to be told the valid science segments to deal with
+# triggers near the boundaries correctly. We use the offsource segment as a
+# proxy for the valid science segments, and ignore vetoed time inside it.
+valid_segs = segmentlist([ppu._read_seg_files(seg_file_abs_paths)['off']])
 
 # (Loudest) off/on-source events are on time-slid data so the
 # try will succeed, as it finds the time shift columns.
@@ -220,7 +227,8 @@ for num_event in range(num_events):
         for ifo in ifos:
             files += mini.make_qscan_plot(workflow, ifo, gps_time,
                                           args.output_dir,
-                                          tags=tags)
+                                          tags=tags,
+                                          data_segments=valid_segs)
     # Handle off/on-source loudest triggers follow-up (which may be on slid
     # data in the case of the off-source)
     else:
@@ -235,7 +243,8 @@ for num_event in range(num_events):
                                           tags=tags)
             files += mini.make_qscan_plot(workflow, ifo, ifo_time,
                                           args.output_dir,
-                                          tags=tags)
+                                          tags=tags,
+                                          data_segments=valid_segs)
 
     layouts += list(layout.grouper(files, 2))
 

{PyCBC-2.8.5 → pycbc-2.8.6}/bin/pygrb/pycbc_pygrb_page_tables

@@ -579,7 +579,7 @@ if onsource_file:
 
     # Table data: assemble human readable message when no trigger is recovered
     if not loud_on_bestnr_trigs:
-        td = [list("-" * len(format_strings))]
+        td = [["-"] for _ in format_strings]
         td[0][0] = "There are no events"
     td = [np.asarray(d) for d in td]
     html_table = pycbc.results.html_table(td, th,

{PyCBC-2.8.5 → pycbc-2.8.6}/bin/pygrb/pycbc_pygrb_plot_stats_distribution

@@ -51,7 +51,7 @@ parser = ppu.pygrb_initialize_plot_parser(description=__doc__)
 parser.add_argument("-F", "--trig-file", action="store", required=True,
                     help="Location of off-source trigger file")
 parser.add_argument("-x", "--x-variable", required=True,
-                    choices=["bestnr", "snr", "snruncut"],
+                    choices=["bestnr", "snr", "snraftercuts"],
                     help="Quantity to plot on the horizontal axis.")
 ppu.pygrb_add_bestnr_cut_opt(parser)
 ppu.pygrb_add_slide_opts(parser)
@@ -114,13 +114,13 @@ trig_data = ppu.extract_trig_properties(
 # Calculate SNR and BestNR values and maxima
 time_veto_max_snr = {}
 time_veto_max_bestnr = {}
-time_veto_max_snr_uncut = {}
+time_veto_max_snr_aftercuts = {}
 
 for slide_id in slide_dict:
     num_slide_segs = len(trial_dict[slide_id])
     time_veto_max_snr[slide_id] = np.zeros(num_slide_segs)
     time_veto_max_bestnr[slide_id] = np.zeros(num_slide_segs)
-    time_veto_max_snr_uncut[slide_id] = np.zeros(num_slide_segs)
+    time_veto_max_snr_aftercuts[slide_id] = np.zeros(num_slide_segs)
 
 for slide_id in slide_dict:
     for j, trial in enumerate(trial_dict[slide_id]):
@@ -134,16 +134,16 @@ for slide_id in slide_dict:
         # Max BestNR
         time_veto_max_bestnr[slide_id][j] = \
             max(trig_data[keys[2]][slide_id][trial_cut])
-        # Max SNR for triggers passing SBVs
-        sbv_cut = trig_data[keys[2]][slide_id][:] != 0
+        # Max SNR for triggers passing the cut on reweighted SNR
+        sbv_cut = trig_data[keys[2]][slide_id][:] >= opts.newsnr_threshold
         if not (trial_cut & sbv_cut).any():
             continue
-        time_veto_max_snr_uncut[slide_id][j] =\
+        time_veto_max_snr_aftercuts[slide_id][j] =\
             max(trig_data[keys[1]][slide_id][trial_cut & sbv_cut])
 
 # This is the data that will be plotted
 full_time_veto_max_snr = ppu.sort_stat(time_veto_max_snr)
-full_time_veto_max_snr_uncut = ppu.sort_stat(time_veto_max_snr_uncut)
+full_time_veto_max_snr_aftercuts = ppu.sort_stat(time_veto_max_snr_aftercuts)
 _, _, full_time_veto_max_bestnr = \
     ppu.max_median_stat(slide_dict, time_veto_max_bestnr, trig_data[keys[2]],
                         total_trials)
@@ -151,8 +151,8 @@ _, _, full_time_veto_max_bestnr = \
 # returned a no-event (i.e., BestNR = 0)
 if full_time_veto_max_bestnr[0] != 0.:
     full_time_veto_max_snr = np.concatenate(([0.], full_time_veto_max_snr))
-    full_time_veto_max_snr_uncut = \
-        np.concatenate(([0.], full_time_veto_max_snr_uncut))
+    full_time_veto_max_snr_aftercuts = \
+        np.concatenate(([0.], full_time_veto_max_snr_aftercuts))
     full_time_veto_max_bestnr = \
         np.concatenate(([0.], full_time_veto_max_bestnr))
 
@@ -164,10 +164,10 @@ logging.info("SNR and bestNR maxima calculated.")
 # =========
 x_label_dict = {"bestnr": "BestNR",
                 "snr": "SNR",
-                "snruncut": "SNR after signal based vetoes"}
+                "snraftercuts": "SNR after signal based vetoes"}
 data_dict = {"bestnr": full_time_veto_max_bestnr,
              "snr": full_time_veto_max_snr,
-             "snruncut": full_time_veto_max_snr_uncut}
+             "snraftercuts": full_time_veto_max_snr_aftercuts}
 fig = plt.figure()
 ax = fig.gca()
 ax.grid(True)

pycbc-2.8.6/examples/inference/lisa_smbhb_ldc/get.sh

@@ -0,0 +1,24 @@
+set -e
+
+download_if_absent() {
+    local URL="$1"
+    local FILENAME=$(basename "$URL")
+    if [ ! -f "$FILENAME" ]; then
+        echo "Downloading $FILENAME"
+        curl -O -L --show-error --silent "$URL"
+    else
+        echo "File $FILENAME already exists, download skipped"
+    fi
+}
+
+for channel in A E T
+do
+    strain_file=${channel}_TDI_v2.gwf
+    download_if_absent https://zenodo.org/record/7497853/files/${strain_file}
+
+    psd_file=${channel}_psd.txt
+    download_if_absent https://zenodo.org/record/7497853/files/${psd_file}
+done
+
+params_file=MBHB_params_v2_LISA_frame.pkl 
+download_if_absent https://zenodo.org/record/7497853/files/${params_file}

{PyCBC-2.8.5 → pycbc-2.8.6}/examples/inference/margtime/get.sh

@@ -5,5 +5,5 @@ do
     file=${ifo}_GWOSC_4KHZ_R1-1126257415-4096.gwf
     test -f ${file} && continue
     curl -O -L --show-error --silent \
-        https://www.gwosc.org/eventapi/html/GWTC-1-confident/GW150914/v3/${ifo}_GWOSC_4KHZ_R1-1126257415-4096.gwf
+        https://www.gwosc.org/eventapi/html/GWTC-1-confident/GW150914/v3/${file}
 done

{PyCBC-2.8.5/examples/inference/relative → pycbc-2.8.6/examples/inference/multisignal}/get.sh

@@ -4,5 +4,5 @@ for ifo in H-H1 L-L1 V-V1
 do
     file=${ifo}_LOSC_CLN_4_V1-1187007040-2048.gwf
     test -f ${file} && continue
-    curl -O --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
+    curl -O -L --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
 done

{PyCBC-2.8.5/examples/inference/single → pycbc-2.8.6/examples/inference/relative}/get.sh

@@ -4,5 +4,5 @@ for ifo in H-H1 L-L1 V-V1
 do
     file=${ifo}_LOSC_CLN_4_V1-1187007040-2048.gwf
     test -f ${file} && continue
-    curl -O --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
+    curl -O -L --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
 done

{PyCBC-2.8.5 → pycbc-2.8.6}/examples/inference/relmarg/get.sh

@@ -2,5 +2,5 @@ for ifo in H-H1 L-L1 V-V1
 do
     file=${ifo}_LOSC_CLN_4_V1-1187007040-2048.gwf
     test -f ${file} && continue
-    curl -O --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
+    curl -O -L --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
 done

{PyCBC-2.8.5/examples/inference/multisignal → pycbc-2.8.6/examples/inference/single}/get.sh

@@ -4,5 +4,5 @@ for ifo in H-H1 L-L1 V-V1
 do
     file=${ifo}_LOSC_CLN_4_V1-1187007040-2048.gwf
     test -f ${file} && continue
-    curl -O --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
+    curl -O -L --show-error --silent https://dcc.ligo.org/public/0146/P1700349/001/${file}
 done

{PyCBC-2.8.5 → pycbc-2.8.6}/pycbc/results/pygrb_postprocessing_utils.py

@@ -172,24 +172,10 @@ def pygrb_add_bestnr_cut_opt(parser):
                         "Default 0: all events are considered.")
 
 
-# =============================================================================
-# Wrapper to pick triggers with a given slide_id
-# =============================================================================
-# Underscore starts name of functions not called outside this file
-def _slide_filter(trig_file, data, slide_id=None):
-    """
-    This function adds the capability to select triggers with specific
-    slide_ids during the postprocessing stage of PyGRB.
-    """
-    if slide_id is None:
-        return data
-    mask = numpy.where(trig_file['network/slide_id'][:] == slide_id)[0]
-    return data[mask]
-
-
 # =============================================================================
 # Wrapper to read segments files
 # =============================================================================
+# An underscore at the name start flags a function called only in this file
 def _read_seg_files(seg_files):
     """Read segments txt files"""
 
@@ -333,18 +319,40 @@ def load_data(input_file, ifos, rw_snr_threshold=None, data_tag=None,
     # Do not assume that IFO and network datasets are sorted the same way:
     # find where each surviving network/event_id is placed in the IFO/event_id
     ifo_ids_above_thresh_locations = {}
+    # 1. Determine once the IDs to be found
+    target_ids = net_ids[above_thresh]
     for ifo in ifos:
-        ifo_ids_above_thresh_locations[ifo] = \
-            numpy.array([numpy.where(ifo_ids[ifo] == net_id)[0][0]
-                         for net_id in net_ids[above_thresh]])
-
-    # Apply the cut on all the data by removing points with reweighted SNR = 0
+        input_ids = ifo_ids[ifo]
+        # 2. Do not assume ifo_ids are sorted and produce a sorting tracker
+        sorter = numpy.argsort(input_ids)
+        # 3. Find out where the target_ids are in the sorted ifo_ids[ifo]
+        insert_indices = numpy.searchsorted(
+            input_ids,
+            target_ids,
+            sorter=sorter)
+        # 4. Safety checks:
+        # a. searchsorted returns len(arr) when the element is not in the arr
+        # b. ensure that all target_ids were recovered in ifo_ids[ifo]
+        assert (insert_indices < len(input_ids)).all()
+        assert (input_ids[sorter[insert_indices]] == target_ids).all()
+        # 5. Extract valid original indices
+        ifo_ids_above_thresh_locations[ifo] = sorter[insert_indices]
+
+    # Removing points with reweighted SNR below threshold and select
+    # a specific slide, if the user asked for this
     trigs_dict = {}
     with HFile(input_file, "r") as trigs:
+        # Prepare a default mask that will preserve all points after
+        # the ones below threshold have already been removed
+        mask = numpy.full(sum(above_thresh), True)
+        # When necessary and possible, update the mask so it selects a given
+        # slide id
+        if slide_id is not None and 'network/slide_id' in trigs.keys():
+            mask = numpy.where(trigs['network/slide_id'][above_thresh] ==
+                               slide_id)[0]
         for (path, dset) in _dataset_iterator(trigs):
-            # The dataset contains search information or missed injections
-            # information, not properties of triggers or found injections:
-            # just copy it
+            # The dataset contains search or missed injections information,
+            # not properties of triggers or found injections: just copy it
             if 'search' in path or 'missed' in path or 'gating' in path:
                 trigs_dict[path] = dset[:]
             # The dataset is trig/inj info at an IFO:
@@ -361,9 +369,14 @@ def load_data(input_file, ifos, rw_snr_threshold=None, data_tag=None,
                 trigs_dict[path] = dset[above_thresh]
 
             if 'network/slide_id' in trigs.keys():
-                if trigs_dict[path].size == trigs['network/slide_id'][:].size:
-                    trigs_dict[path] = _slide_filter(trigs, trigs_dict[path],
-                                                     slide_id=slide_id)
+                # The slide selection is applied to datasets that contain
+                # properties of surviving triggers. These datasets are
+                # identified knowing that each trigger has a slide id, so
+                # they must have as many entries as the 'network/slide_id'
+                # dataset once triggers below threshold are removed from it.
+                if trigs_dict[path].size == \
+                        trigs['network/slide_id'][above_thresh].size:
+                    trigs_dict[path] = trigs_dict[path][mask]
 
     return trigs_dict
 

{PyCBC-2.8.5 → pycbc-2.8.6}/pycbc/results/table_utils.py

@@ -59,7 +59,7 @@ google_table_template = mako.template.Template("""
 """)
 
 def html_table(columns, names, page_size=None, format_strings=None):
-    """ Return an html table of this data
+    """ Return an HTML table of this data.
 
     Parameters
     ----------
@@ -69,14 +69,27 @@ def html_table(columns, names, page_size=None, format_strings=None):
     page_size : {int, None}, optional
         The number of items to show on each page of the table
     format_strings : {lists of strings, None}, optional
-        The ICU format string for this column, None for no formatting. All
-    columns must have a format string if provided.
+        The ICU format string for this column, None for no formatting.
+        All columns must have a format string if provided.
 
     Returns
     -------
     html_table : str
         A str containing the html code to display a table of this data
     """
+    if len(columns) != len(names):
+        raise ValueError(
+            'I need the same number of columns and names, '
+            f'got {len(columns)} and {len(names)} instead'
+        )
+    if format_strings is not None and len(format_strings) != len(columns):
+        raise ValueError(
+            'I need the same number of columns and format strings, '
+            f'got {len(columns)} and {len(names)} instead'
+        )
+    if len({len(column) for column in columns}) != 1:
+        raise ValueError('All columns must have the same length')
+
     if page_size is None:
         page = 'disable'
     else:
@@ -205,4 +218,3 @@ def static_table(data, titles=None, columns_max=None, row_labels=None):
         n_rows=n_rows,
         row_labels=row_labels,
     )
-

{PyCBC-2.8.5 → pycbc-2.8.6}/pycbc/version.py

@@ -1,27 +1,27 @@
 # coding: utf-8
-# Generated by setup.py for PyCBC on 2025-10-16 13:29:09 +0000.
+# Generated by setup.py for PyCBC on 2026-02-11 16:57:27 +0000.
 
 # general info
-version = '2.8.5'
-date = '2025-10-16 13:14:39 +0000'
+version = '2.8.6'
+date = '2026-02-11 16:25:28 +0000'
 release = True
-last_release = '2.9.0'
+last_release = '2.10.0'
 
 # git info
-git_hash = 'd7d03ed0d393cb9cf27a8be70d964dcc1a4bfcfa'
+git_hash = '8d4b8fd3815e8976d80edf5f3c24cc7fdbd62d9f'
 git_branch = 'None'
-git_tag = 'v2.8.5'
+git_tag = 'v2.8.6'
 git_author = 'Tito Dal Canton <tito.dalcanton@ijclab.in2p3.fr>'
 git_committer = 'GitHub <noreply@github.com>'
 git_status = 'CLEAN: All modifications committed'
 git_builder = 'Unknown User <>'
-git_build_date = '2025-10-16 13:29:09 +0000'
-git_verbose_msg = """Version: 2.8.5
+git_build_date = '2026-02-11 16:57:27 +0000'
+git_verbose_msg = """Version: 2.8.6
 Branch: None
-Tag: v2.8.5
-Id: d7d03ed0d393cb9cf27a8be70d964dcc1a4bfcfa
+Tag: v2.8.6
+Id: 8d4b8fd3815e8976d80edf5f3c24cc7fdbd62d9f
 Builder: Unknown User <>
-Build date: 2025-10-16 13:29:09 +0000
+Build date: 2026-02-11 16:57:27 +0000
 Repository status is CLEAN: All modifications committed"""
 
 from pycbc._version import *

{PyCBC-2.8.5 → pycbc-2.8.6}/pycbc/workflow/minifollowups.py

@@ -793,7 +793,7 @@ def make_qscan_plot(workflow, ifo, trig_time, out_dir, injection_file=None,
                     data_segments=None, time_window=100, tags=None):
     """ Generate a make_qscan node and add it to workflow.
 
-    This function generates a single node of the singles_timefreq executable
+    This function generates a single node of the plot_qscan executable
     and adds it to the current workflow. Parent/child relationships are set by
     the input/output files automatically.
 
@@ -812,7 +812,7 @@ def make_qscan_plot(workflow, ifo, trig_time, out_dir, injection_file=None,
         plot.
     data_segments: igwn_segments.segmentlist (optional, default=None)
         The list of segments for which data exists and can be read in. If given
-        the start/end times given to singles_timefreq will be adjusted if
+        the start/end times given to plot_qscan will be adjusted if
         [trig_time - time_window, trig_time + time_window] does not completely
         lie within a valid data segment. A ValueError will be raised if the
         trig_time is not within a valid segment, or if it is not possible to
@@ -820,7 +820,7 @@ def make_qscan_plot(workflow, ifo, trig_time, out_dir, injection_file=None,
         trigger. This **must** be coalesced.
     time_window: int (optional, default=None)
         The amount of data (not including padding) that will be read in by the
-        singles_timefreq job. The default value of 100s should be fine for most
+        plot_qscan job. The default value of 100s should be fine for most
         cases.
     tags: list (optional, default=None)
         List of tags to add to the created nodes, which determine file naming.

{PyCBC-2.8.5 → pycbc-2.8.6}/pycbc/workflow/pegasus_sites.py

@@ -241,7 +241,8 @@ def add_osg_site(sitecat, cp):
                       value=r"\"0,1,2,4,5,7,8,9,10,11,12,13,16,17,24,27,35,36,40\"")
     site.add_profiles(Namespace.CONDOR, key="Requirements",
                       value="(HAS_SINGULARITY =?= TRUE) && "
-                            "(IS_GLIDEIN =?= True)")
+                            "(IS_GLIDEIN =?= True) && "
+                            "(HAS_CVMFS_singularity_opensciencegrid_org =?= True)")
     cvmfs_loc = '"/cvmfs/singularity.opensciencegrid.org/pycbc/pycbc-el8:v'
     cvmfs_loc += sing_version + '"'
     site.add_profiles(Namespace.CONDOR, key="My.SingularityImage",

{PyCBC-2.8.5 → pycbc-2.8.6}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=70.0.0",
+requires = ["setuptools>=70.0.0,<82.0.0",
             "wheel",
             "cython>=0.29.21",
             "numpy>=2.0.0,!=2.2.2",

{PyCBC-2.8.5 → pycbc-2.8.6}/setup.py

@@ -32,8 +32,8 @@ requires = []
 setup_requires = ['numpy>=1.16.0']
 install_requires = setup_requires + [
     'cython>=0.29',
-    'numpy>=1.16.0,!=1.19.0,!=2.2.2',
-    'scipy>=0.16.0',
+    'numpy>=1.16.0,!=1.19.0,!=2.2.2,<2',
+    'scipy>=0.16.0,<1.17.0',
     'astropy>=2.0.3,!=4.2.1,!=4.0.5',
     'matplotlib>=1.5.1',
     'mpld3>=0.3',
@@ -43,7 +43,7 @@ install_requires = setup_requires + [
     'Mako>=1.0.1',
     'beautifulsoup4>=4.6.0',
     'tqdm',
-    'setuptools',
+    'setuptools<82.0.0',
     'gwdatafind',
     'pegasus-wms.api == 5.0.9',
     'pegasus-wms.common == 5.0.9',
@@ -96,7 +96,7 @@ def get_version_info():
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '2.8.5'
+        vinfo.version = '2.8.6'
         vinfo.release = True
 
     version_script = f"""# coding: utf-8

PyCBC-2.8.5/examples/inference/lisa_smbhb_ldc/get.sh

@@ -1,16 +0,0 @@
-set -e
-
-for channel in A E T
-do
-    strain_file=${channel}_TDI_v2.gwf
-    test -f ${strain_file} && continue
-    curl -LO --show-error --silent https://zenodo.org/record/7497853/files/${strain_file}
-
-    psd_file=${channel}_psd.txt
-    test -f ${psd_file} && continue
-    curl -LO --show-error --silent https://zenodo.org/record/7497853/files/${psd_file}
-done
-
-params_file=MBHB_params_v2_LISA_frame.pkl 
-test -f ${params_file} && continue
-curl -LO --show-error --silent https://zenodo.org/record/7497853/files/${params_file}