PyCBC 2.8.5__tar.gz → 2.8.7__tar.gz

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

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyCBC
-Version: 2.8.5
+Version: 2.8.7
 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.7
 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.7}/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.7
 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.7
 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.7}/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.7}/bin/pycbc_multi_inspiral

@@ -632,7 +632,7 @@ with ctx:
     # Loop over templates
     for t_num, template in enumerate(bank):
         # Loop over segments
-        for s_num, stilde in enumerate(segments[args.instruments[0]]):
+        for s_num in range(len(segments[args.instruments[0]])):
             stilde = {ifo: segments[ifo][s_num] for ifo in args.instruments}
             # Checks the 'inj_filter_rejector' options to determine whether
             # to filter this template/segment if injections are present
@@ -688,6 +688,8 @@ with ctx:
             #   Typically only a tiny fraction will be populated.
             power_chisq_arrays = dict.fromkeys(args.instruments)
             power_chisq_dof_arrays = dict.fromkeys(args.instruments)
+            # For convenience also store the lengths of the snr_dict values
+            wraparound_dict = dict.fromkeys(args.instruments)
             for ifo in args.instruments:
                 logging.debug(
                     "Filtering template %d/%d, ifo %s", t_num + 1, n_bank, ifo
@@ -719,8 +721,9 @@ with ctx:
                 snr_dict[ifo] = (
                     snr_ts[matched_filter[ifo].segments[s_num].analyze] * norm
                 )
+                wraparound_dict[ifo] = len(snr_dict[ifo])
                 assert (
-                    len(snr_dict[ifo]) > 0
+                    wraparound_dict[ifo] > 0
                 ), f'SNR time series for {ifo} is empty'
                 norm_dict[ifo] = norm
                 corr_dict[ifo] = corr.copy()
@@ -728,10 +731,10 @@ with ctx:
                 snr[ifo] = snrv * norm
                 # Initialize the cache for power chi^2
                 power_chisq_arrays[ifo] = np.full(
-                    len(snr_dict[ifo]), np.nan, dtype=np.float32
+                    wraparound_dict[ifo], np.nan, dtype=np.float32
                 )
                 power_chisq_dof_arrays[ifo] = np.zeros(
-                    len(snr_dict[ifo]), dtype=np.int32
+                    wraparound_dict[ifo], dtype=np.int32
                 )
                 del snr_ts, norm, corr, ind, snrv
 
@@ -750,22 +753,29 @@ with ctx:
                         position_index + 1,
                         len(sky_positions),
                     )
-                    # Adjust the indices of triggers (if there are any)
-                    # and store trigger indices list in a dictionary;
-                    # when there are no triggers, the dictionary is empty.
-                    # Indices are kept only if they do not get time shifted
-                    # out of the time we are looking at, i.e., require
+                    # Adjust the indices of triggers (if there are any) and
+                    # store trigger indices list in a dictionary; when there
+                    # are no triggers, the dictionary is empty. Indices are
+                    # kept only if they remain within the time being processed
+                    # after the time delay correction from detector to
+                    # geocenter due to sky location is applied, i.e., require
+                    # them to be between 0 and len(snr_dict[ifo]). In general
                     # idx[ifo] - time_delay_idx[slide][position_index][ifo]
-                    # (which applies the necessary time shift by operating on
-                    # indices) to be between 0 and len(snr_dict[ifo]).
+                    # operates on indices to apply a time shift from detctor
+                    # to geocenter at a given timeslide. The trimming carried
+                    # out here to ensure that the starting indices are
+                    # legitimate is on the zerolag indices, i.e., the keyword
+                    # slide is set to 0. Later, when looking for coincidences,
+                    # one must wrap around the appropriate timeslid
+                    # idx[ifo] - time_delay_idx[slide][position_index][ifo].
                     idx_dict = {
                         ifo: idx[ifo][
                             np.logical_and(
                                 idx[ifo]
-                                > time_delay_idx[slide][position_index][ifo],
+                                > time_delay_idx[0][position_index][ifo],
                                 idx[ifo]
-                                < time_delay_idx[slide][position_index][ifo]
-                                + len(snr_dict[ifo]),
+                                < time_delay_idx[0][position_index][ifo]
+                                + wraparound_dict[ifo],
                             )
                         ]
                         for ifo in args.instruments
@@ -776,27 +786,30 @@ with ctx:
                     # and applies the single IFO SNR cut asking for triggers to
                     # have SNR >= args.sngl_snr_threshold in at least
                     # args.nifo_sngl_snr_threshold IFOs; recall that idx_dict
-                    # tracks (at the geocent) triggers above threshold in
+                    # tracks (at the detectors) triggers above threshold in
                     # individual detectors. If only one IFO is available, then
                     # the method returns trigger indices for that IFO. Given
                     # that we are looping over timeslides and sky positions,
                     # the appropriate dictionary of time delays wrt the
-                    # geocenter must be passed to operate at the geocenter.
+                    # geocenter must be passed to operate at the geocenter,
+                    # as well as the dictionary to enable the wrap around at
+                    # each detector prior to searching for coincidences.
                     coinc_idx = coh.get_coinc_indexes(
                         idx_dict, time_delay_idx[slide][position_index],
-                        args.nifo_sngl_snr_threshold
+                        args.nifo_sngl_snr_threshold, wraparound_dict
                     )
                     logging.debug(
                         "Found %d coincident triggers", len(coinc_idx)
                     )
-                    # Time delay is applied to indices at the geocenter to have
-                    # them at the IFOs (hence the + which undoes the delay).
+                    # Time delay is applied to (coincident) indices at the
+                    # geocenter to have them at the IFOs (hence the + which
+                    # undoes the delay). The wrap around is performed.
                     coinc_idx_det_frame = {
                         ifo: (
                             coinc_idx
                             + time_delay_idx[slide][position_index][ifo]
                         )
-                        % len(snr_dict[ifo])
+                        % wraparound_dict[ifo]
                         for ifo in args.instruments
                     }
                     # Calculate the quadrature sum of individual detector SNRs,
@@ -979,17 +992,18 @@ with ctx:
                         # Updated coinc_idx_det_frame to account for the
                         # effect of the cuts applied so far (operate on the
                         # time related indices with a +time_delay_idx to
-                        # transform geocenter time to IFO time).
+                        # transform geocenter time to IFO time). The wrap
+                        # around is performed.
                         coinc_idx_det_frame = {
                             ifo: (
                                 coinc_idx
                                 + time_delay_idx[slide][position_index][ifo]
                             )
-                            % len(snr_dict[ifo])
+                            % wraparound_dict[ifo]
                             for ifo in args.instruments
                         }
                         # Build dictionary with per-IFO complex SNR time series
-                        # of the most recent set of triggers
+                        # of the most recent set of triggers.
                         coherent_ifo_trigs = {
                             ifo: snr_dict[ifo][coinc_idx_det_frame[ifo]]
                             for ifo in args.instruments
@@ -1116,8 +1130,11 @@ with ctx:
                         network_out_vals['my_network_chisq'] = np.real(
                             network_chisq_dict
                         )
+                        # coinc_idx has the geocenter indices of triggers.
+                        # The wrap around happened in get_coinc_indices.
                         network_out_vals['time_index'] = (
-                            coinc_idx + stilde[ifo].cumulative_index
+                            coinc_idx
+                            + stilde[args.instruments[0]].cumulative_index
                         )
                         network_out_vals['nifo'] = [nifo] * num_events
                         network_out_vals['dec'] = [

{PyCBC-2.8.5 → pycbc-2.8.7}/bin/pygrb/pycbc_make_offline_grb_workflow

@@ -122,17 +122,19 @@ elif len(sciSegs.keys()) < 2 and not single_ifo:
     msg += "configuration file."
     logging.error(msg)
     sys.exit()
-else:
-    onSrc, offSrc, bufferSeg = _workflow.generate_triggered_segment(wflow,
-                                                                    seg_dir,
-                                                                    sciSegs)
+
+onSrc, offSrc, bufferSeg = _workflow.generate_triggered_segment(
+    wflow, seg_dir, sciSegs
+)
 
 sciSegs = segmentlistdict(sciSegs)
 if onSrc is None:
+    logging.info("Making segment plot and exiting.")
+    # `make_grb_segments_plot()` wants a single segment for fail_criterion.
+    fail_criterion = offSrc[wflow.ifos[0]][0]
     make_grb_segments_plot(
         wflow, sciSegs, triggertime, triggername,
-        seg_dir, fail_criterion=offSrc)
-    logging.info("Making segment plot and exiting.")
+        seg_dir, fail_criterion=fail_criterion)
     sys.exit()
 
 plot_met = make_grb_segments_plot(

{PyCBC-2.8.5 → pycbc-2.8.7}/bin/pygrb/pycbc_pygrb_efficiency

@@ -103,7 +103,7 @@ parser.add_argument("--background-output-file",
 parser.add_argument("--onsource-output-file",
                     help="Exclusion distance output file.")
 parser.add_argument("--exclusion-dist-output-file",
-                    help="JSON file containing exclusion distances.")
+                    help="JSON file containing exclusion distances and efficiency curves.")
 parser.add_argument("-g", "--glitch-check-factor", action="store",
                     type=float, default=1.0, help="When deciding " +
                     "exclusion efficiencies this value is multiplied " +
@@ -591,11 +591,10 @@ if opts.background_output_file:
                 label='No marginalisation')
         ax.errorbar(dist_plot_vals, (fraction_no_mc),
                     yerr=[yerr_low_no_mc, yerr_high_no_mc], c='green')
-        marg_eff = fraction_mc
-        if np.nansum(marg_eff) > 0:
-            ax.plot(dist_plot_vals, marg_eff, 'r-', label='Marginalised')
+        if np.nansum(fraction_mc) > 0:
+            ax.plot(dist_plot_vals, fraction_mc, 'r-', label='Marginalised')
             ax.errorbar(dist_plot_vals,
-                        marg_eff,
+                        fraction_mc,
                         yerr=[yerr_low_mc, yerr_high_mc],
                         c='red')
         ax.legend()
@@ -660,6 +659,14 @@ if len(found_after_vetoes['network/template_id']):
 if opts.exclusion_dist_output_file:
     excl_dist['inj_set'] = inj_set_name
     excl_dist['trial_name'] = opts.trial_name
+    excl_dist['inj_dist'] = dist_plot_vals
+    excl_dist['eff_no_marg'] = list(fraction_no_mc)
+    excl_dist['eff_no_marg_err_low'] = list(yerr_low_no_mc)
+    excl_dist['eff_no_marg_err_high'] = list(yerr_high_no_mc)
+    excl_dist['marg_eff'] = list(fraction_mc)
+    excl_dist['marg_eff_err_low'] = list(yerr_low)
+    excl_dist['marg_eff_err_high'] = list(yerr_high)
+    excl_dist['eff_inc_count_err'] = list(red_efficiency)
     with open(opts.exclusion_dist_output_file, 'w') as excl_dist_file:
         json.dump(excl_dist, excl_dist_file)
 
@@ -673,10 +680,9 @@ if opts.onsource_output_file:
                 label='No marginalisation')
         ax.errorbar(dist_plot_vals, (fraction_no_mc),
                     yerr=[yerr_low_no_mc, yerr_high_no_mc], c='green')
-        marg_eff = fraction_mc
-        if np.nansum(marg_eff) > 0:
-            ax.plot(dist_plot_vals, marg_eff, 'r-', label='Marginalised')
-            ax.errorbar(dist_plot_vals, marg_eff, yerr=[yerr_low, yerr_high],
+        if np.nansum(fraction_mc) > 0:
+            ax.plot(dist_plot_vals, fraction_mc, 'r-', label='Marginalised')
+            ax.errorbar(dist_plot_vals, fraction_mc, yerr=[yerr_low, yerr_high],
                         c='red')
         if np.nansum(red_efficiency) > 0:
             ax.plot(dist_plot_vals, red_efficiency, 'm-',

{PyCBC-2.8.5 → pycbc-2.8.7}/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,14 +182,20 @@ 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.
+# Determine if we are following up injections or loudest off/on-source triggers.
+# If the time shift dataset exists, then assume we are doing the latter.
 is_injection_followup = True
 try:
     time_shift = fp[ifos[0]+' time shift (s)'][0]
@@ -200,16 +207,17 @@ except KeyError:
 for num_event in range(num_events):
     files = FileList([])
     logging.info('Processing event: %s', num_event+1)
-    gps_time = fp['GPS time'][num_event]
-    gps_time = gps_time.astype(float)
     tags = args.tags + [str(num_event+1)]
     if wiki_file:
         row = []
         for key in fp.keys():
             row.append(fp[key][num_event])
         add_wiki_row(wiki_file, row)
-    # Handle injections (which are on unslid data)
+    # Handle injections
+    # They are on unslid data so geocenter time is used
     if is_injection_followup:
+        gps_time = fp['GC GPS time (s)'][num_event]
+        gps_time = gps_time.astype(float)
         for snr_type in ['reweighted', 'coherent']:
             files += make_timeseries_plot(workflow, trig_file,
                                           snr_type, gps_time,
@@ -220,13 +228,14 @@ 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)
-    # Handle off/on-source loudest triggers follow-up (which may be on slid
-    # data in the case of the off-source)
+                                          tags=tags,
+                                          data_segments=valid_segs)
+    # Handle off/on-source loudest triggers follow-up
+    # They are data that may be slid so detector time is used
     else:
         for i_ifo, ifo in enumerate(ifos):
-            time_shift = fp[ifo+' time shift (s)'][num_event]
-            ifo_time = gps_time + time_shift
+            ifo_time = fp[ifo+' GPS time (s)'][num_event]
+            ifo_time = ifo_time.astype(float)
             files += make_timeseries_plot(workflow, trig_file,
                                           'single', ifo_time,
                                           args.output_dir, ifo=ifo,
@@ -235,7 +244,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.7}/bin/pygrb/pycbc_pygrb_page_tables

@@ -428,15 +428,19 @@ if lofft_outfile:
         d.extend([trig_data[ifo+'/snr'][ifo_trig_index[ifo]]
                   for ifo in ifos])
         d.extend([slide_dict[trig_slide_id][ifo] for ifo in ifos])
+        d.extend([trig_data[ifo+'/end_time'][ifo_trig_index[ifo]]
+                  for ifo in ifos])
         d.append(bestnr)
         td.append(d)
 
-    # th: table header [pycbc_pygrb_minifollowups looks for 'Slide Num']
-    th = ['Trial', 'Slide Num', 'p-value', 'GPS time',
+    # th: table header
+    # Check against pycbc_pygrb_minifollowups prior to changing any of these
+    th = ['Trial', 'Slide Num', 'p-value', 'GC GPS time (s)',
           'Rec. m1', 'Rec. m2', 'Rec. Mc', 'Rec. spin1z', 'Rec. spin2z',
           'Rec. RA', 'Rec. Dec', 'SNR', 'Chi^2', 'Null SNR']
     th.extend([ifo+' SNR' for ifo in ifos])
     th.extend([ifo+' time shift (s)' for ifo in ifos])
+    th.extend([ifo+' GPS time (s)' for ifo in ifos])
     th.append('BestNR')
 
     # When len(offsource_trigs) == 0, the loop above leaves td = [] unchanged
@@ -466,11 +470,12 @@ if lofft_outfile:
     td = [np.asarray(d) for d in td]
 
     # Format of table data
-    format_strings = ['##.##', '##.##', None, '##.#####',
+    format_strings = ['##.##', '##.##', None, '##.###',
                       '##.##', '##.##', '##.##', '##.##', '##.##',
                       '##.##', '##.##', '##.##', '##.##', '##.##']
-    format_strings.extend(['##.##' for ifo in ifos])
-    format_strings.extend(['##.##' for ifo in ifos])
+    format_strings.extend(['##.##' for _ in ifos])
+    format_strings.extend(['##.##' for _ in ifos])
+    format_strings.extend(['##.###' for _ in ifos])
     format_strings.extend(['##.##'])
     html_table = pycbc.results.html_table(td, th,
                                           format_strings=format_strings,
@@ -548,13 +553,16 @@ if onsource_file:
              on_trigs['network/my_network_chisq'][trig_index],
              on_trigs['network/null_snr'][trig_index]] + \
             [on_trigs[ifo+'/snr'][ifo_trig_index[ifo]] for ifo in ifos] + \
-            [loud_on_bestnr]
+            [on_trigs[ifo+'/end_time'][ifo_trig_index[ifo]]
+             for ifo in ifos] + [loud_on_bestnr]
         td.append(d)
 
     # Table header
-    th = ['p-value', 'GPS time', 'Rec. m1', 'Rec. m2', 'Rec. Mc',
+    # Check against pycbc_pygrb_minifollowups prior to changing any of these
+    th = ['p-value', 'GC GPS time (s)', 'Rec. m1', 'Rec. m2', 'Rec. Mc',
           'Rec. spin1z', 'Rec. spin2z', 'Rec. RA', 'Rec. Dec', 'SNR', 'Chi^2',
-          'Null SNR'] + [ifo+' SNR' for ifo in ifos] + ['BestNR']
+          'Null SNR'] + [ifo+' SNR' for ifo in ifos] + \
+          [ifo+' GPS time (s)' for ifo in ifos] + ['BestNR']
 
     td = list(zip(*td))
 
@@ -572,14 +580,15 @@ if onsource_file:
     logging.info("Writing loudest onsource trigger to html file.")
 
     # Format of table data
-    format_strings = [None, '##.#####', '##.##', '##.##', '##.##', '##.##',
+    format_strings = [None, '##.###', '##.##', '##.##', '##.##', '##.##',
                       '##.##', '##.##', '##.##', '##.##', '##.##', '##.##']
-    format_strings.extend(['##.##' for ifo in ifos])
+    format_strings.extend(['##.##' for _ in ifos])
+    format_strings.extend(['##.###' for _ in ifos])
     format_strings.extend(['##.##'])
 
     # 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,
@@ -628,8 +637,11 @@ if found_missed_file is not None:
 
     # Write quiet triggers to file
     sites = [ifo[0] for ifo in ifos]
+    # Table header
+    # Check against pycbc_pygrb_minifollowups prior to changing any of these
+    # Injections are in zero-lag so no timing information at the IFOs is needed
     th = ['Dist'] + ['Eff. Dist. '+site for site in sites] +\
-         ['GPS time', 'GPS time - Rec. Time'] +\
+         ['GC GPS time (s)', 'GPS time - Rec. Time'] +\
          ['Inj. m1', 'Inj. m2', 'Inj. Mc', 'Rec. m1', 'Rec. m2', 'Rec. Mc',
           'Inj. inc', 'Inj. RA', 'Inj. Dec', 'Rec. RA', 'Rec. Dec', 'SNR',
           'Chi^2', 'Null SNR'] +\
@@ -640,7 +652,7 @@ if found_missed_file is not None:
           'Rec S1z', 'Rec S2z']
     # Format of table data
     format_strings = ['##.##']
-    format_strings.extend(['##.##' for ifo in ifos])
+    format_strings.extend(['##.##' for _ in ifos])
     format_strings.extend(['##.#####', '##.#####',
                            '##.##', '##.##', '##.##',
                            '##.##', '##.##', '##.##',

{PyCBC-2.8.5 → pycbc-2.8.7}/bin/pygrb/pycbc_pygrb_plot_snr_timeseries

@@ -144,12 +144,14 @@ inj_data = ppu.load_data(inj_file, ifos, data_tag='injs',
                          slide_id=0)
 
 # Specify HDF file keys for x quantity (time) and y quantity (SNR)
+x_key = 'network/end_time_gc'
+y_key = 'network/' + opts.y_variable + '_snr'
 if opts.y_variable == 'single':
-    x_key = opts.ifo + '/end_time'
     y_key = opts.ifo + '/snr'
-else:
-    x_key = 'network/end_time_gc'
-    y_key = 'network/' + opts.y_variable + '_snr'
+    # When looking at a single slide in a detector use the time at the detector
+    # Otherwise use the time at the geocenter to look at all slides at once
+    if opts.slide_id != 'all':
+        x_key = opts.ifo + '/end_time'
 
 # Extract needed trigger properties and store them as dictionaries
 # Based on trial_dict: if vetoes were applied, trig_* are the veto survivors
@@ -204,6 +206,10 @@ if inj_file:
 # Generate plots
 logging.info("Plotting...")
 
+# Prepare the horizontal axis label
+x_label = "Geocenter" if 'network' in x_key else opts.ifo
+x_label += f" time since {central_time:.3f} (s)"
+
 # Determine what goes on the vertical axis
 y_labels = {'coherent': "Coherent SNR",
             'single': f"{ifo} SNR",
@@ -224,5 +230,5 @@ if not opts.x_lims:
     opts.x_lims = f"{start},{end}"
 plu.pygrb_plotter([trig_data_time, trig_data_snr],
                   [inj_data_time, inj_data_snr],
-                  f"Time since {central_time:.3f} (s)", y_label,
+                  x_label, y_label,
                   opts, cmd=' '.join(sys.argv))