From 236bf4e167bc9548a948c8a179ad3c65fac4e51c Mon Sep 17 00:00:00 2001
From: Pep Covas Vidal <pep.covas.vidal@aei.mpg.de>
Date: Wed, 26 Feb 2020 10:44:12 +0100
Subject: [PATCH] Update pyfstat/mcmc_based_searches.py, pyfstat/core.py files
---
pyfstat/core.py | 7 +++++--
pyfstat/mcmc_based_searches.py | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pyfstat/core.py b/pyfstat/core.py
index d19cc26..e287ada 100755
--- a/pyfstat/core.py
+++ b/pyfstat/core.py
@@ -577,6 +577,10 @@ class ComputeFstat(BaseSearchClass):
FstatOAs.SSBprec = self.SSBprec
else:
FstatOAs.SSBprec = lalpulsar.FstatOptionalArgsDefaults.SSBprec
+ if self.EccentricityTiming:
+ FstatOAs.eccTiming = self.EccentricityTiming
+ else:
+ FstatOAs.eccTiming = lalpulsar.FstatOptionalArgsDefaults.eccTiming
FstatOAs.Dterms = lalpulsar.FstatOptionalArgsDefaults.Dterms
FstatOAs.runningMedianWindow = (
lalpulsar.FstatOptionalArgsDefaults.runningMedianWindow
@@ -656,7 +660,6 @@ class ComputeFstat(BaseSearchClass):
PulsarDopplerParams.Alpha = 1
PulsarDopplerParams.Delta = 1
PulsarDopplerParams.fkdot = np.array([0, 0, 0, 0, 0, 0, 0])
- PulsarDopplerParams.timingFlag = self.binaryTimingFlag,
self.PulsarDopplerParams = PulsarDopplerParams
logging.info("Initialising FstatResults")
@@ -1163,7 +1166,7 @@ class SemiCoherentSearch(ComputeFstat):
injectSources=None,
assumeSqrtSX=None,
SSBprec=None,
- binaryTimingFlag,
+ EccentricityTiming,
):
"""
Parameters
diff --git a/pyfstat/mcmc_based_searches.py b/pyfstat/mcmc_based_searches.py
index 51bd589..ecfc5ed 100644
--- a/pyfstat/mcmc_based_searches.py
+++ b/pyfstat/mcmc_based_searches.py
@@ -2276,7 +2276,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
injectSources=None,
assumeSqrtSX=None,
nsegs=None,
- binaryTimingFlag=0,
+ EccentricityTiming="ZeroEccentricity",
):
self.theta_prior = theta_prior
@@ -2301,7 +2301,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
self.injectSources = injectSources
self.assumeSqrtSX = assumeSqrtSX
self.nsegs = nsegs
- self.binaryTimingFlag = binaryTimingFlag
+ self.EccentricityTiming = EccentricityTiming
if os.path.isdir(outdir) is False:
os.mkdir(outdir)
@@ -2363,7 +2363,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
detectors=self.detectors,
injectSources=self.injectSources,
assumeSqrtSX=self.assumeSqrtSX,
- binaryTimingFlag = self.binaryTimingFlag,
+ EccentricityTiming = self.EccentricityTiming,
)
if self.minStartTime is None:
self.minStartTime = self.search.minStartTime
--
GitLab