Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PyFstat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pep Covas Vidal
PyFstat
Commits
d5ca13d8
Commit
d5ca13d8
authored
7 years ago
by
Gregory Ashton
Browse files
Options
Downloads
Plain Diff
Merge branch 'tCWgpu' into 'master'
transient search: user option tauMin See merge request
GregAshton/PyFstat!15
parents
1f081b93
c9fc71e7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pyfstat/core.py
+12
-5
12 additions, 5 deletions
pyfstat/core.py
pyfstat/grid_based_searches.py
+7
-1
7 additions, 1 deletion
pyfstat/grid_based_searches.py
with
19 additions
and
6 deletions
pyfstat/core.py
+
12
−
5
View file @
d5ca13d8
...
...
@@ -332,6 +332,7 @@ class ComputeFstat(BaseSearchClass):
def
__init__
(
self
,
tref
,
sftfilepattern
=
None
,
minStartTime
=
None
,
maxStartTime
=
None
,
binary
=
False
,
BSGL
=
False
,
transientWindowType
=
None
,
t0Band
=
None
,
tauBand
=
None
,
tauMin
=
None
,
dt0
=
None
,
dtau
=
None
,
detectors
=
None
,
minCoverFreq
=
None
,
maxCoverFreq
=
None
,
injectSources
=
None
,
injectSqrtSX
=
None
,
assumeSqrtSX
=
None
,
...
...
@@ -359,9 +360,11 @@ class ComputeFstat(BaseSearchClass):
function, but with the full range, for debugging)
t0Band, tauBand: int
if >0, search t0 in (minStartTime,minStartTime+t0Band)
and tau in (
2*Tsft
,2*Tsft+tauBand).
and tau in (
tauMin
,2*Tsft+tauBand).
if =0, only compute CW Fstat with t0=minStartTime,
tau=maxStartTime-minStartTime.
tauMin: int
defaults to 2*Tsft
dt0, dtau: int
grid resolutions in transient start-time and duration,
both default to Tsft
...
...
@@ -659,6 +662,14 @@ class ComputeFstat(BaseSearchClass):
self
.
windowRange
.
tauBand
=
self
.
tauBand
if
self
.
dtau
:
self
.
windowRange
.
dtau
=
self
.
dtau
if
self
.
tauMin
is
None
:
self
.
windowRange
.
tau
=
int
(
2
*
self
.
Tsft
)
else
:
if
not
isinstance
(
self
.
tauMin
,
int
):
logging
.
warn
(
'
Casting non-integer tauMin={} to int...
'
.
format
(
self
.
tauMin
))
self
.
tauMin
=
int
(
self
.
tauMin
)
self
.
windowRange
.
tau
=
self
.
tauMin
logging
.
info
(
'
Initialising transient FstatMap features...
'
)
self
.
tCWFstatMapFeatures
,
self
.
gpu_context
=
(
...
...
@@ -702,10 +713,6 @@ class ComputeFstat(BaseSearchClass):
# true single-template search also in transient params:
# actual (t0,tau) window was set with tstart, tend before
self
.
windowRange
.
tau
=
int
(
tend
-
tstart
)
# TYPE UINT4
else
:
# grid search: start at minimum tau required for nondegenerate
# F-stat computation
self
.
windowRange
.
tau
=
int
(
2
*
self
.
Tsft
)
self
.
FstatMap
=
tcw
.
call_compute_transient_fstat_map
(
self
.
tCWFstatMapVersion
,
self
.
tCWFstatMapFeatures
,
...
...
This diff is collapsed.
Click to expand it.
pyfstat/grid_based_searches.py
+
7
−
1
View file @
d5ca13d8
...
...
@@ -369,6 +369,7 @@ class TransientGridSearch(GridSearch):
detectors
=
None
,
SSBprec
=
None
,
injectSources
=
None
,
input_arrays
=
False
,
assumeSqrtSX
=
None
,
transientWindowType
=
None
,
t0Band
=
None
,
tauBand
=
None
,
tauMin
=
None
,
dt0
=
None
,
dtau
=
None
,
outputTransientFstatMap
=
False
,
outputAtoms
=
False
,
...
...
@@ -396,9 +397,11 @@ class TransientGridSearch(GridSearch):
debugging). Currently only supported for nsegs=1.
t0Band, tauBand: int
if >0, search t0 in (minStartTime,minStartTime+t0Band)
and tau in (
2*Tsft
,2*Tsft+tauBand).
and tau in (
tauMin
,2*Tsft+tauBand).
if =0, only compute CW Fstat with t0=minStartTime,
tau=maxStartTime-minStartTime.
tauMin: int
defaults to 2*Tsft
dt0, dtau: int
grid resolutions in transient start-time and duration,
both default to Tsft
...
...
@@ -431,6 +434,7 @@ class TransientGridSearch(GridSearch):
detectors
=
self
.
detectors
,
transientWindowType
=
self
.
transientWindowType
,
t0Band
=
self
.
t0Band
,
tauBand
=
self
.
tauBand
,
tauMin
=
self
.
tauMin
,
dt0
=
self
.
dt0
,
dtau
=
self
.
dtau
,
minStartTime
=
self
.
minStartTime
,
maxStartTime
=
self
.
maxStartTime
,
BSGL
=
self
.
BSGL
,
SSBprec
=
self
.
SSBprec
,
...
...
@@ -840,6 +844,7 @@ class FrequencySlidingWindow(GridSearch):
self
.
nsegs
=
1
self
.
t0Band
=
None
self
.
tauBand
=
None
self
.
tauMin
=
None
if
os
.
path
.
isdir
(
outdir
)
is
False
:
os
.
mkdir
(
outdir
)
...
...
@@ -957,6 +962,7 @@ class EarthTest(GridSearch):
self
.
transientWindowType
=
None
self
.
t0Band
=
None
self
.
tauBand
=
None
self
.
tauMin
=
None
if
os
.
path
.
isdir
(
outdir
)
is
False
:
os
.
mkdir
(
outdir
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment