Commit 1e111130 authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Some cleaning of the run_compute_fstat method and fix test

parent 83fa8892
...@@ -210,11 +210,17 @@ class ComputeFstat(object): ...@@ -210,11 +210,17 @@ class ComputeFstat(object):
logging.info('Initialising FstatResults') logging.info('Initialising FstatResults')
self.FstatResults = lalpulsar.FstatResults() self.FstatResults = lalpulsar.FstatResults()
self.windowRange = lalpulsar.transientWindowRange_t()
self.windowRange.type = lalpulsar.TRANSIENT_RECTANGULAR
self.windowRange.t0Band = 0
self.windowRange.dt0 = 1
self.windowRange.tauBand = 0
self.windowRange.dtau = 1
def run_computefstatistic_single_point(self, tstart, tend, F0, F1, def run_computefstatistic_single_point(self, tstart, tend, F0, F1,
F2, Alpha, Delta): F2, Alpha, Delta):
""" Compute the F-stat fully-coherently at a single point """ """ Compute the F-stat fully-coherently at a single point """
numFreqBins = 1
self.PulsarDopplerParams.fkdot = np.array([F0, F1, F2, 0, 0, 0, 0]) self.PulsarDopplerParams.fkdot = np.array([F0, F1, F2, 0, 0, 0, 0])
self.PulsarDopplerParams.Alpha = Alpha self.PulsarDopplerParams.Alpha = Alpha
self.PulsarDopplerParams.Delta = Delta self.PulsarDopplerParams.Delta = Delta
...@@ -222,21 +228,14 @@ class ComputeFstat(object): ...@@ -222,21 +228,14 @@ class ComputeFstat(object):
lalpulsar.ComputeFstat(self.FstatResults, lalpulsar.ComputeFstat(self.FstatResults,
self.FstatInput, self.FstatInput,
self.PulsarDopplerParams, self.PulsarDopplerParams,
numFreqBins, 1,
self.whatToCompute self.whatToCompute
) )
windowRange = lalpulsar.transientWindowRange_t() self.windowRange.t0 = int(tstart) # TYPE UINT4
windowRange.type = lalpulsar.TRANSIENT_RECTANGULAR self.windowRange.tau = int(tend - tstart) # TYPE UINT4
windowRange.t0 = int(tstart) # TYPE UINT4
windowRange.t0Band = 0
windowRange.dt0 = 1
windowRange.tau = int(tend - tstart) # TYPE UINT4
windowRange.tauBand = 0
windowRange.dtau = 1
useFReg = False
FS = lalpulsar.ComputeTransientFstatMap( FS = lalpulsar.ComputeTransientFstatMap(
self.FstatResults.multiFatoms[0], windowRange, useFReg) self.FstatResults.multiFatoms[0], self.windowRange, False)
return 2*FS.F_mn.data[0][0] return 2*FS.F_mn.data[0][0]
......
...@@ -86,8 +86,7 @@ class TestComputeFstat(unittest.TestCase): ...@@ -86,8 +86,7 @@ class TestComputeFstat(unittest.TestCase):
search = pyfstat.ComputeFstat(tref=Writer.tref, sftlabel=Writer.label, search = pyfstat.ComputeFstat(tref=Writer.tref, sftlabel=Writer.label,
sftdir=Writer.outdir) sftdir=Writer.outdir)
FS = search.run_computefstatistic_single_point(Writer.tref, FS = search.run_computefstatistic_single_point(Writer.tstart,
Writer.tstart,
Writer.tend, Writer.tend,
Writer.F0, Writer.F0,
Writer.F1, Writer.F1,
......
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