Commit 9e3bd5b5 authored by Rory Smith's avatar Rory Smith
Browse files

similar changes to roq pipeline

Original: 377d7f07d6935f42e1c80e158b4a4e9523a2d3fa
parent f98a2d3c
......@@ -137,14 +137,19 @@ for ifo in options.IFOs:
if options.fLow:
fLow = options.fLow
scale_factor = int(basis_params[0] / fLow)
if fHigh < basis_params[1]:
fHigh_index = fHigh / deltaF
else:
fLow = basis_params[0]
assert fHigh == basis_params[1]
fseries = fseries[int(fLow/deltaF):len(fseries)+1]
data = data[int(fLow/deltaF):len(data)+1]
assert fHigh == basis_params[1]
fHigh_index = fHigh/deltaF
fseries = fseries[int(fLow/deltaF):fHigh_index]
data = data[int(fLow/deltaF):fHigh_index]
psdfile = np.column_stack( np.loadtxt(options.psd_file[i]) )
......@@ -152,11 +157,17 @@ for ifo in options.IFOs:
psd[-1] = psd[-1 -1 ]
psd = psd[int(fLow/deltaF):len(psd)+1]
psd = psd[int(fLow/deltaF):fHigh_index]
data /= psd
# only get frequency components up to fHigh
B_linear = B_linear.T[0:fHigh][:].T
B_quadratic = B_quadratic.T[0:fHigh][:].T
assert len(data) == len(psd) == B_linear.shape[1] == B_quadratic.shape[1]
#for the dot product, it's convenient to work with transpose of B:
B_linear = B_linear.T
B_quadratic = B_quadratic.T
......
......@@ -173,7 +173,7 @@ for sampler in samps:
flow=int(roq_params[roq]['flow'] / roq_mass_freq_scale_factor)
srate=int(2.*roq_params[roq]['fhigh'] / roq_mass_freq_scale_factor)
if srate > 8192:
srate = 4096
srate = 8192
seglen=int(roq_params[roq]['seglen'] * roq_mass_freq_scale_factor)
# params.dat uses the convention q>1 so our q_min is the inverse of their qmax
......
Markdown is supported
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