Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add acceleration option to JointPrimaryMarginalizedModel likelihood #4688

Merged
merged 56 commits into from
Sep 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
55e5541
Update hierarchical.py
WuShichao Apr 7, 2024
a6ac76d
Update hierarchical.py
WuShichao Apr 8, 2024
f4ed98d
Update hierarchical.py
WuShichao Apr 8, 2024
41224cc
Update hierarchical.py
WuShichao Apr 10, 2024
7109db9
Update hierarchical.py
WuShichao Apr 10, 2024
0bbe7a4
fix cc issues
WuShichao Apr 10, 2024
6920a8c
Update hierarchical.py
WuShichao Apr 15, 2024
55fba36
Update relbin.py
WuShichao Apr 15, 2024
b993833
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao May 16, 2024
7099515
add complex phase correction for sh_others
WuShichao May 16, 2024
94ba798
Update hierarchical.py
WuShichao May 16, 2024
6afbc4e
Update relbin.py
WuShichao May 16, 2024
e20b6f5
fix cc issues
WuShichao May 16, 2024
25a4562
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Jun 4, 2024
8fb82a1
make code more general
WuShichao Jun 7, 2024
757a30b
update
WuShichao Jun 13, 2024
a2d64d1
fix
WuShichao Jun 13, 2024
8a9287e
rename
WuShichao Jun 13, 2024
5423d8c
update
WuShichao Jun 15, 2024
0b9d44e
WIP
WuShichao Jun 17, 2024
eeb8890
fix a bug in frame transform
WuShichao Jun 18, 2024
50e3599
fix overwritten issues
WuShichao Jun 19, 2024
dba5292
update
WuShichao Jun 19, 2024
537256e
update
WuShichao Jun 19, 2024
0af3fed
fix reconstruct
WuShichao Jun 19, 2024
0a09b12
make this PR general
WuShichao Jun 28, 2024
eb57268
update
WuShichao Jun 28, 2024
6d856b3
update
WuShichao Jun 28, 2024
075c39a
fix cc issues
WuShichao Jun 28, 2024
9ffbb70
rename
WuShichao Jun 28, 2024
e0f1ec4
rename
WuShichao Jun 28, 2024
6ce67c3
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Jul 1, 2024
bf105a4
add multiband description
WuShichao Jul 1, 2024
273264f
fix
WuShichao Jul 4, 2024
5226b7d
add comments
WuShichao Jul 4, 2024
21fd035
fix hdf's config
WuShichao Jul 5, 2024
ba3816d
fix
WuShichao Jul 5, 2024
28fc1b2
fix
WuShichao Jul 6, 2024
b06d32e
fix
WuShichao Jul 28, 2024
b4a47af
fix
WuShichao Jul 29, 2024
a5b6d8c
remove print
WuShichao Jul 29, 2024
ca096ec
update for Alex's comments
WuShichao Jul 29, 2024
e8825be
wip
WuShichao Jul 30, 2024
be2b066
update
WuShichao Jul 30, 2024
c03652e
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Jul 31, 2024
02b6937
fix
WuShichao Jul 31, 2024
87f10cb
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Jul 31, 2024
cbcd5a2
update
WuShichao Aug 1, 2024
36af111
seems work
WuShichao Aug 12, 2024
c084f4f
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Aug 12, 2024
709b524
fix CC issue
WuShichao Aug 12, 2024
3a17bf5
fix
WuShichao Aug 12, 2024
3865d5e
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Aug 12, 2024
0df23f2
fix demargin
WuShichao Aug 25, 2024
da34461
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Aug 25, 2024
f2b0798
Merge branch 'gwastro:master' into accelerate_multiband
WuShichao Sep 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix overwritten issues
WuShichao committed Jun 19, 2024
commit 50e35999798d9275947181cd127a44544ea0278f
17 changes: 13 additions & 4 deletions pycbc/inference/models/hierarchical.py
Original file line number Diff line number Diff line change
@@ -779,6 +779,7 @@ def total_loglr(self):
{key: value[0] if isinstance(value, numpy.ndarray)
else value for key, value in margin_params.items()})
other_model.update(**current_params_other)
print("self.other_model.current_params: ", self.other_model.current_params)
other_model.return_sh_hh_each_ifo = True
sh_other_max_dict, hh_other_max_dict = other_model.loglr
other_model.return_sh_hh_each_ifo = False
@@ -792,11 +793,19 @@ def total_loglr(self):
hh_others_T += hh_other_max_dict['LISA_T']

if self.accelerate_loglr:
print("self.other_models[0].current_params: ", self.other_models[0].current_params)
# _, longitude_lisa, latitude_lisa, polarization_lisa = \
# geo_to_lisa(self.other_models[0].current_params['tc'],
# self.other_models[0].current_params['ra'],
# self.other_models[0].current_params['dec'],
# self.other_models[0].current_params['polarization'],
# self.other_models[0].current_params['t_offset'])

# after update, the self.other_model.current_params have been transformed,
# tc and polarization have been overwritten
_, longitude_lisa, latitude_lisa, polarization_lisa = \
geo_to_lisa(self.other_models[0].current_params['tc'],
self.other_models[0].current_params['ra'],
self.other_models[0].current_params['dec'],
self.other_models[0].current_params['polarization'],
geo_to_lisa(margin_params['tc'], margin_params['ra'],
margin_params['dec'], margin_params['polarization'],
self.other_models[0].current_params['t_offset'])
inclination_lisa =\
self.other_models[0].current_params['inclination']