Removed xml dependence from pycbc_pygrb_page_tables

bin/pycbc_multi_inspiral

@@ -41,7 +41,7 @@ from pycbc.filter import MatchedFilterControl
 from pycbc.types import TimeSeries, zeros, float32, complex64
 from pycbc.types import MultiDetOptionAction
 from pycbc.vetoes import sgchisq
-
+from pycbc.conversions import mchirp_from_mass1_mass2
 
 # The following block of lines sets up the command-line interface (CLI) for the
 # pycbc_multi_inspiral executable.
@@ -335,8 +335,13 @@ with ctx:
         'null_snr': float32,
         'nifo': int,
         'my_network_chisq': float32,
+        'my_network_bank_chisq': float32,
+        'my_network_cont_chisq': float32,
         'reweighted_snr': float32,
-        'slide_id': int
+        'slide_id': int,
+        'mass1': float32,
+        'mass2': float,
+        'mchirp': float
         }
     network_out_vals = {
         'dec': None,
@@ -346,8 +351,13 @@ with ctx:
         'null_snr': None,
         'nifo': None,
         'my_network_chisq': None,
+        'my_network_bank_chisq': None,
+        'my_network_cont_chisq': None,
         'reweighted_snr': None,
-        'slide_id': None
+        'slide_id': None,
+        'mass1': None,
+        'mass2': None,
+        'mchirp': None
         }
     network_names = sorted(network_out_vals.keys())
     event_mgr = EventManagerCoherent(
@@ -392,6 +402,9 @@ with ctx:
     # Loop over templates
     for t_num, template in enumerate(bank):
         # Loop over segments
+        m1 = bank.table['mass1'][t_num]
+        m2 = bank.table['mass2'][t_num]
+        mchirp = mchirp_from_mass1_mass2(m1, m2)
         for s_num,stilde in enumerate(segments[args.instruments[0]]):
             stilde = {ifo : segments[ifo][s_num] for ifo in args.instruments}
             # Filter check checks the 'inj_filter_rejector' options to
@@ -602,59 +615,52 @@ with ctx:
                             # Calculate the power and autochi2 values for the coinc
                         # indexes (this uses the snr timeseries before the time
                         # delay, so we need to undo it. Same for normalisation)
+                        # Need all out vals to be the same length.
+                        # This means the entries that are single values
+                        # need to be repeated once per event. 
+                        num_events = None
+                        # Disctionaries for the degrees of freedom and chisqs
+                        # these are used to compute the network chisqs
                         chisq = {}
                         chisq_dof = {}
+                        chisq_bank = {}
+                        chisq_bank_dof = {}
+                        chisq_cont = {}
+                        chisq_cont_dof = {}
                         for ifo in args.instruments:
+                            # Chisqs
                             chisq[ifo], chisq_dof[ifo] = power_chisq.values(
                                 corr_dict[ifo],
                                 coherent_ifo_trigs[ifo] / norm_dict[ifo],
                                 norm_dict[ifo], stilde[ifo].psd,
                                 coinc_idx_det_frame[ifo]
                                 + stilde[ifo].analyze.start,
                                 template)
-                        # Calculate network chisq value
-                        network_chisq_dict = coh.network_chisq(
-                            chisq, chisq_dof, coherent_ifo_trigs)
-                        # Calculate chisq reweighted SNR
-                        if nifo > 2:
-                            reweighted_snr = ranking.newsnr(
-                                rho_coh, network_chisq_dict)
-                            # Calculate null reweighted SNR
-                            reweighted_snr = coh.reweight_snr_by_null(
-                                reweighted_snr, null, rho_coh)
-                        elif nifo == 2:
-                            reweighted_snr = ranking.newsnr(
-                                rho_coinc, network_chisq_dict)
-                        else:
-                            rho_sngl = abs(
-                                snr[args.instruments[0]][
-                                    coinc_idx_det_frame[args.instruments[0]]
-                                    ]
-                                )
-                            reweighted_snr = ranking.newsnr(
-                                rho_sngl, network_chisq_dict)
-                        # Need all out vals to be the same length. This means
-                        # the entries that are single values need to be
-                        # repeated once per event.
-                        num_events = len(reweighted_snr)
-                        # the output will only be possible if
-                        # len(networkchi2) == num_events
-                        for ifo in args.instruments:
-                            (ifo_out_vals['bank_chisq'],
-                                    ifo_out_vals['bank_chisq_dof']) =\
+                            chisq_bank[ifo], chisq_bank_dof[ifo] = \
                                 bank_chisq.values(
                                     template, stilde[ifo].psd, stilde[ifo],
                                     coherent_ifo_trigs[ifo] / norm_dict[ifo],
                                     norm_dict[ifo],
                                     coinc_idx_det_frame[ifo]
                                     + stilde[ifo].analyze.start)
-                            ifo_out_vals['cont_chisq'] = autochisq.values(
+                            chisq_cont[ifo] = autochisq.values(
                                 snr_dict[ifo] / norm_dict[ifo],
                                 coinc_idx_det_frame[ifo], template,
                                 stilde[ifo].psd, norm_dict[ifo],
                                 stilde=stilde[ifo], low_frequency_cutoff=flow)
-                            ifo_out_vals['chisq'] = chisq[ifo]
-                            ifo_out_vals['chisq_dof'] = chisq_dof[ifo]
+                            #chisq_cont_dof[ifo] = getattr(autochisq, 'dof')
+                            # Number of events
+                            if num_events is None:
+                                num_events = len(chisq[ifo])
+                            # Assign out_vals
+                            (ifo_out_vals['chisq'],
+                                ifo_out_vals['chisq_dof']) = \
+                                    (chisq[ifo], chisq_dof[ifo])
+                            (ifo_out_vals['bank_chisq'],
+                                ifo_out_vals['bank_chisq_dof']) = \
+                                    (chisq_bank[ifo], chisq_bank_dof[ifo])
+                            ifo_out_vals['cont_chisq'] = chisq_cont[ifo]
+                            print(ifo_out_vals['cont_chisq'])
                             ifo_out_vals['time_index'] = (
                                 coinc_idx_det_frame[ifo]
                                 + stilde[ifo].cumulative_index
@@ -669,22 +675,56 @@ with ctx:
                             event_mgr.add_template_events_to_ifo(
                                 ifo, ifo_names,
                                 [ifo_out_vals[n] for n in ifo_names])
-                        if nifo>2:
+                        # Calculate network, network bank and network cont chisq values
+                        network_chisq_dict = coh.network_chisq(
+                            chisq, chisq_dof, coherent_ifo_trigs)
+                        # NOTE: not implemented yet
+                        #network_chisq_bank_dict = coh.network_chisq(
+                        #    chisq_bank, chisq_bank_dof, coherent_ifo_trigs)
+                        #network_chisq_cont_dict = coh.network_chisq(
+                        #    chisq_cont, chisq_cont_dof, coherent_ifo_trigs)
+                        # Calculate chisq reweighted SNR
+                        if nifo > 2:
+                            reweighted_snr = ranking.newsnr(
+                                rho_coh, network_chisq_dict)
+                            # Calculate null reweighted SNR
+                            reweighted_snr = coh.reweight_snr_by_null(
+                                reweighted_snr, null, rho_coh)
                             network_out_vals['coherent_snr'] = rho_coh
                             network_out_vals['null_snr'] = null
-                        elif nifo==2:
+                        elif nifo == 2:
+                            reweighted_snr = ranking.newsnr(
+                                rho_coinc, network_chisq_dict)
                             network_out_vals['coherent_snr'] = rho_coinc
                         else:
+                            rho_sngl = abs(
+                                snr[args.instruments[0]][
+                                    coinc_idx_det_frame[args.instruments[0]]
+                                    ]
+                                )
+                            reweighted_snr = ranking.newsnr(
+                                rho_sngl, network_chisq_dict)
                             network_out_vals['coherent_snr'] = (
                                 abs(snr[args.instruments[0]][
                                     coinc_idx_det_frame[args.instruments[0]]
                                     ])
                                 )
+                        # Assign network values
                         network_out_vals['reweighted_snr'] = reweighted_snr
                         network_out_vals['my_network_chisq'] = (
                             np.real(network_chisq_dict))
+                        # NOTE: not implemented yet
+                        #network_out_vals['my_network_bank_chisq'] = (
+                        #    np.real(my_network_chisq_bank_dict)
+                        #)
+                        #network_out_vals['network_cont_chisq'] = (
+                        #    np.real(my_network_chisq_cont_dict)
+                        #)
                         network_out_vals['time_index'] = (
                             coinc_idx + stilde[ifo].cumulative_index)
+                        network_out_vals['mass1'] = [m1] * num_events
+                        network_out_vals['mass2'] = [m2] * num_events
+                        network_out_vals['mchirp'] = [mchirp] * num_events
                         network_out_vals['nifo'] = [nifo] * num_events
                         network_out_vals['dec'] = [sky_positions[1][position_index]] * num_events
                         network_out_vals['ra'] = [sky_positions[0][position_index]] * num_events
@@ -707,4 +747,4 @@ logging.info('Writing output')
 event_mgr.write_events(args.output)
 
 logging.info("Finished")
-logging.info("Time to complete analysis: %d", int(time.time() - time_init))
+logging.info("Time to complete analysis: %d", int(time.time() - time_init))