diff --git a/pyfstat.py b/pyfstat.py index f27fe965e74ed71dd9a587eb44c3996e5744a04e..adeed2b91ff6d64a45eb502b8f76f9e4a59f0aa8 100755 --- a/pyfstat.py +++ b/pyfstat.py @@ -210,11 +210,17 @@ class ComputeFstat(object): logging.info('Initialising 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, F2, Alpha, Delta): """ 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.Alpha = Alpha self.PulsarDopplerParams.Delta = Delta @@ -222,21 +228,14 @@ class ComputeFstat(object): lalpulsar.ComputeFstat(self.FstatResults, self.FstatInput, self.PulsarDopplerParams, - numFreqBins, + 1, self.whatToCompute ) - windowRange = lalpulsar.transientWindowRange_t() - windowRange.type = lalpulsar.TRANSIENT_RECTANGULAR - 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 + self.windowRange.t0 = int(tstart) # TYPE UINT4 + self.windowRange.tau = int(tend - tstart) # TYPE UINT4 FS = lalpulsar.ComputeTransientFstatMap( - self.FstatResults.multiFatoms[0], windowRange, useFReg) + self.FstatResults.multiFatoms[0], self.windowRange, False) return 2*FS.F_mn.data[0][0] diff --git a/tests/tests.py b/tests/tests.py index f788c167f4c5bc8b88984f0880717ba3c4cce5f6..98a3c3ca5c0ff28b74ce8fe7d557bf9da7203779 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -86,8 +86,7 @@ class TestComputeFstat(unittest.TestCase): search = pyfstat.ComputeFstat(tref=Writer.tref, sftlabel=Writer.label, sftdir=Writer.outdir) - FS = search.run_computefstatistic_single_point(Writer.tref, - Writer.tstart, + FS = search.run_computefstatistic_single_point(Writer.tstart, Writer.tend, Writer.F0, Writer.F1,