Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PyFstat
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gregory Ashton
PyFstat
Commits
445f49df
Commit
445f49df
authored
May 08, 2018
by
Gregory Ashton
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into develop-GA
parents
3e693091
20a52183
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
pyfstat/core.py
pyfstat/core.py
+1
-1
pyfstat/grid_based_searches.py
pyfstat/grid_based_searches.py
+4
-0
pyfstat/tcw_fstat_map_funcs.py
pyfstat/tcw_fstat_map_funcs.py
+4
-1
No files found.
pyfstat/core.py
View file @
445f49df
...
...
@@ -714,7 +714,7 @@ class ComputeFstat(BaseSearchClass):
# actual (t0,tau) window was set with tstart, tend before
self
.
windowRange
.
tau
=
int
(
tend
-
tstart
)
# TYPE UINT4
self
.
FstatMap
=
tcw
.
call_compute_transient_fstat_map
(
self
.
FstatMap
,
self
.
timingFstatMap
=
tcw
.
call_compute_transient_fstat_map
(
self
.
tCWFstatMapVersion
,
self
.
tCWFstatMapFeatures
,
self
.
FstatResults
.
multiFatoms
[
0
],
self
.
windowRange
)
if
self
.
tCWFstatMapVersion
==
'lal'
:
...
...
pyfstat/grid_based_searches.py
View file @
445f49df
...
...
@@ -459,10 +459,12 @@ class TransientGridSearch(GridSearch):
tCWfilebase
=
os
.
path
.
splitext
(
self
.
out_file
)[
0
]
+
'_tCW_'
logging
.
info
(
'Will save per-Doppler Fstatmap'
\
' results to {}*.dat'
.
format
(
tCWfilebase
))
self
.
timingFstatMap
=
0.
for
vals
in
tqdm
(
self
.
input_data
):
detstat
=
self
.
search
.
get_det_stat
(
*
vals
)
windowRange
=
getattr
(
self
.
search
,
'windowRange'
,
None
)
FstatMap
=
getattr
(
self
.
search
,
'FstatMap'
,
None
)
self
.
timingFstatMap
+=
getattr
(
self
.
search
,
'timingFstatMap'
,
None
)
thisCand
=
list
(
vals
)
+
[
detstat
]
if
getattr
(
self
,
'transientWindowType'
,
None
):
if
self
.
tCWFstatMapVersion
==
'lal'
:
...
...
@@ -491,6 +493,8 @@ class TransientGridSearch(GridSearch):
if
self
.
outputAtoms
:
self
.
search
.
write_atoms_to_file
(
os
.
path
.
splitext
(
self
.
out_file
)[
0
])
logging
.
info
(
'Total time spent computing transient F-stat maps: {:.2f}s'
.
format
(
self
.
timingFstatMap
))
data
=
np
.
array
(
data
,
dtype
=
np
.
float
)
if
return_data
:
return
data
...
...
pyfstat/tcw_fstat_map_funcs.py
View file @
445f49df
...
...
@@ -3,6 +3,7 @@
import
numpy
as
np
import
os
import
logging
from
time
import
time
# optional imports
import
importlib
as
imp
...
...
@@ -185,14 +186,16 @@ def call_compute_transient_fstat_map ( version,
if
version
in
fstatmap_versions
:
if
features
[
version
]:
time0
=
time
()
FstatMap
=
fstatmap_versions
[
version
](
multiFstatAtoms
,
windowRange
)
timingFstatMap
=
time
()
-
time0
else
:
raise
Exception
(
'Required module(s) for transient F-stat map'
\
' method "{}" not available!'
.
format
(
version
))
else
:
raise
Exception
(
'Transient F-stat map method "{}"'
\
' not implemented!'
.
format
(
version
))
return
FstatMap
return
FstatMap
,
timingFstatMap
def
reshape_FstatAtomsVector
(
atomsVector
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment