Commit 236bf4e1 authored by Pep Covas Vidal's avatar Pep Covas Vidal
Browse files

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

parent 64324bed
Pipeline #9936 failed with stages
...@@ -577,6 +577,10 @@ class ComputeFstat(BaseSearchClass): ...@@ -577,6 +577,10 @@ class ComputeFstat(BaseSearchClass):
FstatOAs.SSBprec = self.SSBprec FstatOAs.SSBprec = self.SSBprec
else: else:
FstatOAs.SSBprec = lalpulsar.FstatOptionalArgsDefaults.SSBprec FstatOAs.SSBprec = lalpulsar.FstatOptionalArgsDefaults.SSBprec
if self.EccentricityTiming:
FstatOAs.eccTiming = self.EccentricityTiming
else:
FstatOAs.eccTiming = lalpulsar.FstatOptionalArgsDefaults.eccTiming
FstatOAs.Dterms = lalpulsar.FstatOptionalArgsDefaults.Dterms FstatOAs.Dterms = lalpulsar.FstatOptionalArgsDefaults.Dterms
FstatOAs.runningMedianWindow = ( FstatOAs.runningMedianWindow = (
lalpulsar.FstatOptionalArgsDefaults.runningMedianWindow lalpulsar.FstatOptionalArgsDefaults.runningMedianWindow
...@@ -656,7 +660,6 @@ class ComputeFstat(BaseSearchClass): ...@@ -656,7 +660,6 @@ class ComputeFstat(BaseSearchClass):
PulsarDopplerParams.Alpha = 1 PulsarDopplerParams.Alpha = 1
PulsarDopplerParams.Delta = 1 PulsarDopplerParams.Delta = 1
PulsarDopplerParams.fkdot = np.array([0, 0, 0, 0, 0, 0, 0]) PulsarDopplerParams.fkdot = np.array([0, 0, 0, 0, 0, 0, 0])
PulsarDopplerParams.timingFlag = self.binaryTimingFlag,
self.PulsarDopplerParams = PulsarDopplerParams self.PulsarDopplerParams = PulsarDopplerParams
logging.info("Initialising FstatResults") logging.info("Initialising FstatResults")
...@@ -1163,7 +1166,7 @@ class SemiCoherentSearch(ComputeFstat): ...@@ -1163,7 +1166,7 @@ class SemiCoherentSearch(ComputeFstat):
injectSources=None, injectSources=None,
assumeSqrtSX=None, assumeSqrtSX=None,
SSBprec=None, SSBprec=None,
binaryTimingFlag, EccentricityTiming,
): ):
""" """
Parameters Parameters
......
...@@ -2276,7 +2276,7 @@ class MCMCSemiCoherentSearch(MCMCSearch): ...@@ -2276,7 +2276,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
injectSources=None, injectSources=None,
assumeSqrtSX=None, assumeSqrtSX=None,
nsegs=None, nsegs=None,
binaryTimingFlag=0, EccentricityTiming="ZeroEccentricity",
): ):
self.theta_prior = theta_prior self.theta_prior = theta_prior
...@@ -2301,7 +2301,7 @@ class MCMCSemiCoherentSearch(MCMCSearch): ...@@ -2301,7 +2301,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
self.injectSources = injectSources self.injectSources = injectSources
self.assumeSqrtSX = assumeSqrtSX self.assumeSqrtSX = assumeSqrtSX
self.nsegs = nsegs self.nsegs = nsegs
self.binaryTimingFlag = binaryTimingFlag self.EccentricityTiming = EccentricityTiming
if os.path.isdir(outdir) is False: if os.path.isdir(outdir) is False:
os.mkdir(outdir) os.mkdir(outdir)
...@@ -2363,7 +2363,7 @@ class MCMCSemiCoherentSearch(MCMCSearch): ...@@ -2363,7 +2363,7 @@ class MCMCSemiCoherentSearch(MCMCSearch):
detectors=self.detectors, detectors=self.detectors,
injectSources=self.injectSources, injectSources=self.injectSources,
assumeSqrtSX=self.assumeSqrtSX, assumeSqrtSX=self.assumeSqrtSX,
binaryTimingFlag = self.binaryTimingFlag, EccentricityTiming = self.EccentricityTiming,
) )
if self.minStartTime is None: if self.minStartTime is None:
self.minStartTime = self.search.minStartTime self.minStartTime = self.search.minStartTime
......
Supports Markdown
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