Commit 4a640fbc authored by Gregory Ashton's avatar Gregory Ashton

Merge branch 'develop-GA' of gitlab.aei.uni-hannover.de:GregAshton/PyFstat into develop-GA

parents f7aab64d 81bedf04
...@@ -136,7 +136,7 @@ def _get_dictionary_from_lines(lines, comments, raise_error): ...@@ -136,7 +136,7 @@ def _get_dictionary_from_lines(lines, comments, raise_error):
def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern, def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern,
minStartTime, maxStartTime, IFO=None, assumeSqrtSX=None, minStartTime, maxStartTime, IFOs=None, assumeSqrtSX=None,
tempory_filename='fs.tmp', **kwargs): tempory_filename='fs.tmp', **kwargs):
""" Wrapper to lalapps_PredictFstat """ Wrapper to lalapps_PredictFstat
...@@ -147,7 +147,7 @@ def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern, ...@@ -147,7 +147,7 @@ def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern,
sftfilepattern : str sftfilepattern : str
Pattern matching the sftfiles to use. Pattern matching the sftfiles to use.
minStartTime, maxStartTime : int minStartTime, maxStartTime : int
IFO : str IFOs : str
See `lalapps_PredictFstat --help` See `lalapps_PredictFstat --help`
assumeSqrtSX : float or None assumeSqrtSX : float or None
See `lalapps_PredictFstat --help`, if None this option is not used See `lalapps_PredictFstat --help`, if None this option is not used
...@@ -171,12 +171,8 @@ def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern, ...@@ -171,12 +171,8 @@ def predict_fstat(h0, cosi, psi, Alpha, Delta, Freq, sftfilepattern,
cl_pfs.append("--DataFiles='{}'".format(sftfilepattern)) cl_pfs.append("--DataFiles='{}'".format(sftfilepattern))
if assumeSqrtSX: if assumeSqrtSX:
cl_pfs.append("--assumeSqrtSX={}".format(assumeSqrtSX)) cl_pfs.append("--assumeSqrtSX={}".format(assumeSqrtSX))
if IFO: #if IFOs:
if ',' in IFO: # cl_pfs.append("--IFOs={}".format(IFOs))
logging.warning('Multiple detector selection not available, using'
' all available data')
else:
cl_pfs.append("--IFO={}".format(IFO))
cl_pfs.append("--minStartTime={}".format(int(minStartTime))) cl_pfs.append("--minStartTime={}".format(int(minStartTime)))
cl_pfs.append("--maxStartTime={}".format(int(maxStartTime))) cl_pfs.append("--maxStartTime={}".format(int(maxStartTime)))
......
Markdown is supported
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