Commit 63bb5490 authored by Richard O'Shaughnessy's avatar Richard O'Shaughnessy
Browse files

ILE: Update to current pylal

parent 39eab10e
......@@ -24,7 +24,10 @@ import factored_likelihood
import mcsampler
import xmlutils
#from lalinference.bayestar import fits as bfits
try:
from lalinference.bayestar import fits as bfits
except:
print " no fits "
__author__ = "Evan Ochsner <evano@gravity.phys.uwm.edu>, Chris Pankow <pankow@gravity.phys.uwm.edu>, R. O'Shaughnessy"
......@@ -415,10 +418,10 @@ for inst, psdf in map(lambda c: c.split("="), opts.psd_file):
assert psd_dict[inst].deltaF == deltaF
# Highest freq. at which PSD is defined
if isinstance(psd_dict[inst],
pylal.xlal.datatypes.real8frequencyseries.REAL8FrequencySeries):
fmax = psd_dict[inst].f0 + deltaF * (len(psd_dict[inst].data) - 1)
elif isinstance(psd_dict[inst], lal.REAL8FrequencySeries):
#if isinstance(psd_dict[inst],
# pylal.xlal.datatypes.real8frequencyseries.REAL8FrequencySeries):
# fmax = psd_dict[inst].f0 + deltaF * (len(psd_dict[inst].data) - 1)
if isinstance(psd_dict[inst], lal.REAL8FrequencySeries):
fmax = psd_dict[inst].f0 + deltaF * (psd_dict[inst].data.length - 1)
# Assert upper limit of IP integral does not go past where PSD defined
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment