Update pyfstat/mcmc_based_searches.py, pyfstat/core.py files

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

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