diff --git a/pyfstat/core.py b/pyfstat/core.py index d19cc266d679b14deadaabaaa9b781e45e386174..e287ada2ebe9430bd97ada1959f8b91fc3d6f81b 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 51bd589aa82182e3bb5109f1f06a71ea3809e78a..ecfc5edba58fa959e8fce979a984ab49db63860d 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