lalsuite 7.22.1.dev20240408__cp312-cp312-manylinux_2_28_aarch64.whl → 7.26.2.dev20251202__cp312-cp312-manylinux_2_28_aarch64.whl

lalsimulation/gwsignal/models/pyseobnr_model.py

@@ -12,6 +12,148 @@ from lal import LIGOTimeGPS
 from ..core.waveform import CompactBinaryCoalescenceGenerator
 
 
+class SEOBNRv5EHM(CompactBinaryCoalescenceGenerator):
+
+    """
+    Implements a wrapper for SEOBNRv5EHM in the pyseob package
+
+    Parameters
+    ----------
+
+        No parameters required for initialization.
+
+    """
+
+    # _domain = 'time'
+    def __init__(self, **kwargs):
+
+        super().__init__()
+
+        self.seobnr = pyseob_wf
+        self._domain = "time"
+        self._implemented_domain = "time"
+        self._generation_domain = None
+
+    @property
+    def metadata(self):
+        metadata = {
+            "type": "aligned_spin",
+            "f_ref_spin": True,
+            "modes": True,
+            "polarizations": True,
+            "implemented_domain": "time",
+            "approximant": "SEOBNRv5EHM",
+            "implementation": "",
+            "conditioning_routines": "",
+        }
+        return metadata
+
+    def _strip_units(self, waveform_dict):
+        new_dc = {}
+        for key in waveform_dict.keys():
+            new_dc[key] = waveform_dict[key].value
+        return new_dc
+
+    def _generate_waveform_class(self, **parameters):
+
+        parameters_extra = {}
+
+        # Get the optional parameters for this approximant, if any
+        optional_params = [
+            "ModeArray",
+            "condition",
+            "lmax_nyquist",
+            "lmax",
+            "secular_bwd_int",
+            "warning_secular_bwd_int",
+            "t_backwards",
+            "warning_bwd_int",
+        ]
+
+        for key in optional_params:
+            val = parameters.pop(key, None)
+            if val is not None:
+                parameters_extra[key] = val
+
+        # indicates we are running pyseobnr through GWSignal. Emits proper
+        # warnings on non-reviewed model calls.
+        parameters_extra["gwsignal_environment"] = True
+
+        self.parameter_check(units_sys="Cosmo", **parameters)
+        self.waveform_dict["distance"] = self.waveform_dict["distance"].to(Mpc)
+        self.waveform_dict = self._strip_units(self.waveform_dict)
+        self.waveform_dict["approximant"] = self.metadata["approximant"]
+        self.waveform_dict["f_ref"] = self.waveform_dict["f22_ref"]
+        self.waveform_dict["rel_anomaly"] = self.waveform_dict["meanPerAno"]
+
+        # Make sure to update the waveform dictionary with extra parameters
+        self.waveform_dict.update(**parameters_extra)
+
+        #print(f"waveform_dict = {self.waveform_dict}")
+        return self.seobnr.GenerateWaveform(self.waveform_dict)
+
+    def _generate_modes(self, **parameters):
+
+        gen_wf = self._generate_waveform_class(**parameters)
+        times, hlm = gen_wf.generate_td_modes()
+        epoch = LIGOTimeGPS(times[0])
+        dt = self.waveform_dict["deltaT"]
+
+        hlm_dict = {}
+        for k, v in hlm.items():
+            hlm_lal = TimeSeries(v, times=times,  name=k)
+            hlm_dict[k] = hlm_lal
+
+        return hlm_dict
+
+    def _generate_td_polarizations(self, **parameters):
+
+        gen_wf = self._generate_waveform_class(**parameters)
+        if self.waveform_dict.get("condition"):
+            hp, hc = gen_wf.generate_td_polarizations_conditioned_1()
+        else:
+            hp, hc = gen_wf.generate_td_polarizations()
+        epoch = hp.epoch.gpsSeconds + hp.epoch.gpsNanoSeconds / 1e9
+        times = hp.deltaT * arange(hp.data.length) + epoch
+        return (
+            TimeSeries(hp.data.data, times=times, name="hp"),
+            TimeSeries(hc.data.data, times=times, name="hc"),
+        )
+
+    def _generate_fd_polarizations_from_td(self, **parameters):
+
+        gen_wf = self._generate_waveform_class(**parameters)
+        hptilde, hctilde = gen_wf.generate_fd_polarizations()
+        frequencies = hptilde.deltaF * arange(hptilde.data.length)
+        epoch = hptilde.epoch.gpsSeconds + hptilde.epoch.gpsNanoSeconds / 1e9
+        return (
+            FrequencySeries(
+                hptilde.data.data, frequencies=frequencies, epoch=epoch, name="hp"
+            ),
+            FrequencySeries(
+                hctilde.data.data, frequencies=frequencies, epoch=epoch, name="hc"
+            ),
+        )
+
+    def _generate_polarizations(self, **parameters):
+
+        if self._generation_domain == "time":
+            return self._generate_td_polarizations(**parameters)
+        elif self._generation_domain == "freq":
+            return self._generate_fd_polarizations_from_td(**parameters)
+        else:
+            raise ValueError("Generation domain must be 'time' or 'freq'.")
+
+    def generate_fd_waveform(self, **parameters):
+        return self._generate_fd_polarizations_from_td(**parameters)
+
+    def generate_td_waveform(self, **parameters):
+        return self._generate_td_polarizations(**parameters)
+
+    def generate_td_modes(self, **parameters):
+        return self._generate_modes(**parameters)
+
+
 class SEOBNRv5HM(CompactBinaryCoalescenceGenerator):
 
     """
@@ -66,12 +208,27 @@ class SEOBNRv5HM(CompactBinaryCoalescenceGenerator):
             "condition",
             "lmax_nyquist",
             "lmax",
+            "dA_dict",
+            "dw_dict",
+            "dTpeak",
+            "domega_dict",
+            "dtau_dict",
+            "da6",
+            "ddSO",
+            "tol_PA",
+            "rtol_ode",
+            "atol_ode",
+            "deltaT_sampling",
         ]
         for key in optional_params:
             val = parameters.pop(key, None)
             if val is not None:
                 parameters_extra[key] = val
 
+        # indicates we are running pyseobnr through GWSignal. Emits proper
+        # warnings on non-reviewed model calls.
+        parameters_extra["gwsignal_environment"] = True
+
         self.parameter_check(units_sys="Cosmo", **parameters)
         self.waveform_dict["distance"] = self.waveform_dict["distance"].to(Mpc)
         self.waveform_dict = self._strip_units(self.waveform_dict)
@@ -199,13 +356,29 @@ class SEOBNRv5PHM(CompactBinaryCoalescenceGenerator):
             "postadiabatic_type",
             "condition",
             "lmax_nyquist",
-            "lmax"
+            "lmax",
+            "dA_dict",
+            "dw_dict",
+            "dTpeak",
+            "domega_dict",
+            "dtau_dict",
+            "da6",
+            "ddSO",
+            "deltaT_sampling",
+            "omega_prec_deviation",
+            "enable_antisymmetric_modes",
+            "antisymmetric_modes_hm",
+            "antisymmetric_modes",
         ]
         for key in optional_params:
             val = parameters.pop(key, None)
             if val is not None:
                 parameters_extra[key] = val
 
+        # indicates we are running pyseobnr through GWSignal. Emits proper
+        # warnings on non-reviewed model calls.
+        parameters_extra["gwsignal_environment"] = True
+
         self.parameter_check(units_sys="Cosmo", **parameters)
         self.waveform_dict["distance"] = self.waveform_dict["distance"].to(Mpc)
         self.waveform_dict = self._strip_units(self.waveform_dict)

lalsimulation/nrfits/NRSur3dq8Remnant.py

@@ -12,7 +12,7 @@ import lal
 from .nrfits import NRFits
 
 class NRSur3dq8Remnant(NRFits):
-    """
+    r"""
     Class for NRSur3dq8Remnant model for the remnant mass, spin and kick
     velocity for nonprecessing BBH systems. This model was called surfinBH3dq8
     in the paper.

lalsimulation/nrfits/NRSur7dq4Remnant.py

@@ -14,7 +14,7 @@ from . import quaternion_utils
 from .nrfits import NRFits
 
 class NRSur7dq4Remnant(NRFits):
-    """
+    r"""
     Class for NRSur7dq4Remnant model for the mass, spin and kick of the final BH
     of generically precessing binary black holes.
 

lalsimulation/nrfits/eval_fits.py

@@ -173,7 +173,7 @@ def check_extra_params_and_set_defaults(extra_params_dict):
 #=============================================================================
 def eval_nrfit(m1, m2, chiA_vec, chiB_vec, model_name, fit_types_list, f_ref=-1,
         extra_params_dict=None):
-    """
+    r"""
     Evaluates Numerical Relativity fits for a given model.
 
     - m1:

lalsimulation/nrfits/nrfits.py

@@ -76,5 +76,3 @@ class NRFits(object):
                     extra_params_dict)
 
         return return_dict
-
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesBurstPPAnalysis

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesPostProc.py
@@ -24,10 +23,10 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #       MA 02110-1301, USA.
 
-from ligo.lw import ligolw
-from ligo.lw import lsctables
-from ligo.lw import table
-from ligo.lw import utils
+from igwn_ligolw import ligolw
+from igwn_ligolw import lsctables
+from igwn_ligolw import table
+from igwn_ligolw import utils
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.pyplot as pp
@@ -56,8 +55,6 @@ class LIGOLWContentHandlerExtractSimBurstTable(ligolw.LIGOLWContentHandler):
       if self.intable: ligolw.LIGOLWContentHandler.endElement(self,name)
       if self.intable and name==self.tableElementName: self.intable=False
 
-lsctables.use_in(LIGOLWContentHandlerExtractSimBurstTable)
-
 posterior_name_to_sim_burst_extractor = {
     'frequency' : lambda sb: sb.frequency,
     'duration' : lambda sb: sb.duration,
@@ -306,4 +303,3 @@ if __name__ == '__main__':
         skypp=True
 
     output_html(options.outdir, ks_pvalues, Ninj,skypp= skypp )
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesBurstPostProc

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesBurstPostProc.py
@@ -34,9 +33,7 @@
 #standard library imports
 import sys
 import os
-
-from six.moves import cPickle as pickle
-
+import pickle
 from time import strftime
 
 #related third party imports
@@ -50,9 +47,9 @@ from matplotlib import pyplot as plt
 from lalinference import bayespputils as bppu
 
 from lalinference import git_version
-from ligo.lw import table
-from ligo.lw import ligolw
-from ligo.lw import lsctables
+from igwn_ligolw import table
+from igwn_ligolw import ligolw
+from igwn_ligolw import lsctables
 
 try:
   os.environ['PATH'] = os.environ['PATH'] + ':/usr/texbin'
@@ -129,8 +126,6 @@ class LIGOLWContentHandlerExtractSimInspiralTable(ligolw.LIGOLWContentHandler):
       if self.intable: ligolw.LIGOLWContentHandler.endElement(self,name)
       if self.intable and name==self.tableElementName: self.intable=False
 
-lsctables.use_in(LIGOLWContentHandlerExtractSimInspiralTable)
-
 class LIGOLWContentHandlerExtractSimBurstTable(ligolw.LIGOLWContentHandler):
     def __init__(self,document):
       ligolw.LIGOLWContentHandler.__init__(self,document)
@@ -149,8 +144,6 @@ class LIGOLWContentHandlerExtractSimBurstTable(ligolw.LIGOLWContentHandler):
       if self.intable: ligolw.LIGOLWContentHandler.endElement(self,name)
       if self.intable and name==self.tableElementName: self.intable=False
 
-lsctables.use_in(LIGOLWContentHandlerExtractSimBurstTable)
-
 def pickle_to_file(obj,fname):
     """
     Pickle/serialize 'obj' into 'fname'.
@@ -333,16 +326,14 @@ def cbcBayesBurstPostProc(
     if injfile and eventnum is not None:
         print('Looking for event %i in %s\n'%(eventnum,injfile))
         import itertools
-        from ligo.lw import ligolw
-        from ligo.lw import lsctables
-        from ligo.lw import utils
+        from igwn_ligolw import ligolw
+        from igwn_ligolw import lsctables
+        from igwn_ligolw import utils
         xmldoc = utils.load_filename(injfile,contenthandler=LIGOLWContentHandlerExtractSimBurstTable)
         got_burst_table=1
         try:
-            lsctables.use_in(LIGOLWContentHandlerExtractSimBurstTable)
             simtable=lsctables.SimBurstTable.get_table(xmldoc)
         except ValueError:
-            lsctables.use_in(LIGOLWContentHandlerExtractSimInspiralTable)
             simtable=lsctables.SimInspiralTable.get_table(xmldoc)
             got_inspiral_table=1
             got_burst_table=0
@@ -408,12 +399,11 @@ def cbcBayesBurstPostProc(
 
     if eventnum is None and injfile is not None:
         import itertools
-        from ligo.lw import ligolw
-        from ligo.lw import lsctables
-        from ligo.lw import utils
+        from igwn_ligolw import lsctables
+        from igwn_ligolw import utils
         if got_inspiral_table==1:
             injections = lsctables.SimInspiralTable.get_table(
-                            utils.load_filename(injfile,contenthandler=lsctables.use_in(ligolw.LIGOLWContentHandler))
+                            utils.load_filename(injfile)
                             )
 
         if(len(injections)<1):

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesCombinePTMCMCh5s

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesCombinePTMCMCh5s.py

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesCombinePosteriors

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #       cbcBayesCombinePosteriors.py
 #
@@ -234,4 +233,3 @@ else:
 
 
 #Done!
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesCompPos

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesCompPos.py Copyright 2010--2012 Benjamin Aylott
@@ -57,7 +56,7 @@ twoDGreedyMenu=[['mc','eta'],['mchirp','eta'],['chirpmass','eta'],['mc','q'],['m
 #Convert parameter names to LaTeX; if not mentioned here, just use parameter name.
 paramNameLatexMap = {'m1': 'm_1', 'm2' : 'm_2', 'mtotal' : r'M_{\rm tot}', 'mchirp' : r'\mathcal{M}',
                      'mc': r'\mathcal{M}', 'distance' : 'd', 'distMPC' : 'd', 'dist': 'd',
-                     'iota': r'\iota', 'psi': '\psi', 'eta': '\eta', 'asym_massratio': 'q', 'a1': 'a_1',
+                     'iota': r'\iota', 'psi': r'\psi', 'eta': r'\eta', 'asym_massratio': 'q', 'a1': 'a_1',
                      'a2': 'a_2', 'phi1': r'\phi_1', 'phi2': r'\phi_2', 'theta1': r'\theta_1', 'theta2': r'\theta_2',
                      'cos(tilt1)': r'\cos t_1', 'cos(tilt2)': r'\cos t_2', 'cos(thetas)': r'\cos \theta_s',
                      'cosbeta': r'\cos \beta', 'phi_orb': r'\phi_{\rm orb}', 'cos(beta)': r'\cos \beta',
@@ -494,9 +493,9 @@ def compare_bayes(outdir,names_and_pos_folders,injection_path,eventnum,username,
 
     if injection_path is not None and os.path.exists(injection_path) and eventnum is not None:
         eventnum=int(eventnum)
-        from ligo.lw import ligolw, lsctables, utils
+        from igwn_ligolw import ligolw, lsctables, utils
         injections = lsctables.SimInspiralTable.get_table(
-                utils.load_filename(injection_path, contenthandler = lsctables.use_in(ligolw.LIGOLWContentHandler)))
+                utils.load_filename(injection_path))
         if eventnum is not None:
             if(len(injections)<eventnum):
                 print("Error: You asked for event %d, but %s contains only %d injections" %(eventnum,injection_path,len(injections)))

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesDIEvidence

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesDIEvidence.py: compute the direct-integration evidence

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesGraceDBinfo

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesGraceDBinfo

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesMCMC2pos

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesMCMC2pos.py
@@ -25,7 +24,6 @@
 #       MA 02110-1301, USA.
 
 import sys
-from six.moves import range
 from functools import reduce
 
 import matplotlib
@@ -33,7 +31,11 @@ matplotlib.use('Agg') #sets backend to not need to open windows
 
 import numpy as np
 import astropy.table as apt
-import scipy.integrate as si
+try:
+	from scipy.integrate import trapezoid
+except ImportError:
+	# FIXME: Remove this once we require scipy >=1.6.0.
+	from scipy.integrate import trapz as trapezoid
 from optparse import OptionParser
 
 from lalinference import git_version
@@ -158,8 +160,8 @@ def downsample_and_evidence(data_hdf5, deltaLogP=None, fixedBurnin=None, nDownsa
 	ebetas2 = np.concatenate((betas[::2], [0.0]))
 	elogls2 = np.concatenate((logls[::2], [logls[::2][-1]]))
 
-	evidence = -si.trapz(elogls, ebetas)
-	evidence2 = -si.trapz(elogls2, ebetas2)
+	evidence = -trapezoid(elogls, ebetas)
+	evidence2 = -trapezoid(elogls2, ebetas2)
 
 	posterior_samples['chain_log_evidence'] = evidence
 	posterior_samples['chain_delta_log_evidence'] = np.absolute(evidence - evidence2)

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesPPAnalysis

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesPPAnalysis.py
@@ -25,9 +24,8 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #       MA 02110-1301, USA.
 
-from ligo.lw import ligolw
-from ligo.lw import lsctables
-from ligo.lw import utils
+from igwn_ligolw import lsctables
+from igwn_ligolw import utils
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.pyplot as pp
@@ -255,7 +253,7 @@ if __name__ == '__main__':
 
     (options, args) = parser.parse_args()
 
-    injs = lsctables.SimInspiralTable.get_table(utils.load_filename(options.injxml,contenthandler=lsctables.use_in(ligolw.LIGOLWContentHandler)))
+    injs = lsctables.SimInspiralTable.get_table(utils.load_filename(options.injxml))
 
     if options.par == []:
         parameters = ['m1', 'm2', 'mc', 'eta', 'q',  'theta_jn', 'a1', 'a2', 'tilt1', 'tilt2', 'phi12', 'phi_jl', 'ra', 'dec', 'distance', 'time', 'phi_orb', 'psi']
@@ -322,4 +320,3 @@ if __name__ == '__main__':
         skypp=True
 
     output_html(options.outdir, ks_pvalues, Ninj ,skypp=skypp )
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesPlotSpinDisk

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # Ben Farr 2016
 
 import os

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesPosToSimBurst

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #       cbcBayesPosToSimBurst.py
 #       C2014 Salvatore Vitale <salvatore.vitale@ligo.org>
@@ -32,11 +31,10 @@
 Populate a sim_inspiral table with random draws from an ASCII table.
 """
 from optparse import Option, OptionParser
-from six.moves import range
 import numpy as np
-from ligo.lw import ligolw
-from ligo.lw import lsctables
-import ligo.lw.utils.process
+from igwn_ligolw import ligolw
+from igwn_ligolw import lsctables
+import igwn_ligolw.utils.process
 
 # Create a datatype for all relavent fields to be filled in the sim_inspiral table
 sim_inspiral_dt = [
@@ -196,14 +194,14 @@ if __name__ == "__main__":
     # Create a new XML document
     xmldoc = ligolw.Document()
     xmldoc.appendChild(ligolw.LIGO_LW())
-    proc = ligo.lw.utils.process.register_to_xmldoc(doc, sys.argv[0], {})
+    proc = igwn_ligolw.utils.process.register_to_xmldoc(doc, sys.argv[0], {})
 
     #create timeslide table and set offsets to 0
-    timeslide_table = lsctables.New(lsctables.TimeSlideTable)
+    timeslide_table = lsctables.TimeSlideTable.new()
     timeslide_id = timeslide_table.append_offsetvector(
         {'H1':0,'V1':0,'L1':0,'H2':0}, proc)
 
-    sim_table = lsctables.New(lsctables.SimBurstTable)
+    sim_table = lsctables.SimBurstTable.new()
     xmldoc.childNodes[0].appendChild(timeslide_table)
     xmldoc.childNodes[0].appendChild(sim_table)
 
@@ -227,4 +225,3 @@ if __name__ == "__main__":
     output_file = open(opts.output, 'w')
     xmldoc.write(output_file)
     output_file.close()
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesPosToSimInspiral

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesPosToSimInspiral.py
@@ -28,11 +27,10 @@
 Populate a sim_inspiral table with random draws from an ASCII table.
 """
 from optparse import Option, OptionParser
-from six.moves import range
 import numpy as np
-from ligo.lw import ligolw
-from ligo.lw import lsctables
-import ligo.lw.utils.process
+from igwn_ligolw import ligolw
+from igwn_ligolw import lsctables
+import igwn_ligolw.utils.process
 import matplotlib
 matplotlib.use("Agg") # Needed to run on the CIT cluster
 from lalinference import bayespputils as bppu
@@ -283,8 +281,8 @@ if __name__ == "__main__":
     # Create a new XML document
     xmldoc = ligolw.Document()
     xmldoc.appendChild(ligolw.LIGO_LW())
-    proc = ligo.lw.utils.process.register_to_xmldoc(doc, sys.argv[0], {})
-    sim_table = lsctables.New(lsctables.SimInspiralTable)
+    proc = igwn_ligolw.utils.process.register_to_xmldoc(doc, sys.argv[0], {})
+    sim_table = lsctables.SimInspiralTable.new()
     xmldoc.childNodes[0].appendChild(sim_table)
 
     # Add empty rows to the sim_inspiral table
@@ -307,4 +305,3 @@ if __name__ == "__main__":
     output_file = open(opts.output, 'w')
     xmldoc.write(output_file)
     output_file.close()
-

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesPostProc

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 # -*- coding: utf-8 -*-
 #
 #       cbcBayesPostProc.py
@@ -35,9 +34,7 @@
 import sys
 import os
 import socket
-
-from six.moves import cPickle as pickle
-
+import pickle
 from time import strftime
 
 #related third party imports
@@ -75,9 +72,8 @@ import lalinference.plot
 from lalinference import bayespputils as bppu
 from lalinference import git_version
 
-from ligo.lw import ligolw
-from ligo.lw import lsctables
-from ligo.lw import utils
+from igwn_ligolw import lsctables
+from igwn_ligolw import utils
 
 __author__="Ben Aylott <benjamin.aylott@ligo.org>, Ben Farr <bfarr@u.northwestern.edu>, Will M. Farr <will.farr@ligo.org>, John Veitch <john.veitch@ligo.org>"
 __version__= "git id %s"%git_version.id
@@ -287,7 +283,7 @@ def cbcBayesPostProc(
     injection=None
     if injfile and eventnum is not None:
         print('Looking for event %i in %s\n'%(eventnum,injfile))
-        xmldoc = utils.load_filename(injfile,contenthandler=lsctables.use_in(ligolw.LIGOLWContentHandler))
+        xmldoc = utils.load_filename(injfile)
         siminspiraltable=lsctables.SimInspiralTable.get_table(xmldoc)
         injection=siminspiraltable[eventnum]
 
@@ -346,7 +342,7 @@ def cbcBayesPostProc(
 
     if eventnum is None and injfile is not None:
         import itertools
-        injections = lsctables.SimInspiralTable.get_table(utils.load_filename(injfile, contenthandler=lsctables.use_in(ligolw.LIGOLWContentHandler)))
+        injections = lsctables.SimInspiralTable.get_table(utils.load_filename(injfile))
 
         if(len(injections)<1):
             try:

{lalsuite-7.22.1.dev20240408.data → lalsuite-7.26.2.dev20251202.data}/scripts/cbcBayesThermoInt

@@ -1,5 +1,4 @@
 #!python
-##(in place of shebang, for consistent line numbers)
 
 from optparse import OptionParser
 import sys
@@ -8,7 +7,11 @@ import matplotlib
 matplotlib.use('Agg')
 import matplotlib.pyplot as pp
 import numpy as np
-import scipy.integrate as si
+try:
+    from scipy.integrate import trapezoid
+except ImportError:
+    # FIXME: Remove this once we require scipy >=1.6.0.
+    from scipy.integrate import trapz as trapezoid
 
 matplotlib.rcParams['text.usetex'] = True
 
@@ -88,8 +91,8 @@ positional arguments:
     ebetas2 = np.concatenate((betas[::2], [0.0]))
     elogls2 = np.concatenate((logls[::2], [logls[::2][-1]]))
 
-    evidence = -si.trapz(elogls, ebetas)
-    evidence2 = -si.trapz(elogls2, ebetas2)
+    evidence = -trapezoid(elogls, ebetas)
+    evidence2 = -trapezoid(elogls2, ebetas2)
 
     devidence = np.abs(evidence - evidence2)
 
@@ -102,6 +105,3 @@ positional arguments:
     with open(options.evfile, 'w') as out:
         out.write('# ln-Z delta-ln-Z\n')
         out.write(str(evidence) + ' ' + str(devidence))
-
-
-