Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
WuShichao committed Jul 28, 2024
1 parent 28fc1b2 commit b06d32e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
5 changes: 4 additions & 1 deletion bin/inference/pycbc_inference_model_stats
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ model.sampling_transforms = None
def callmodel(arg):
iteration, paramvals = arg
# calculate the logposterior to get all stats populated
model.update(**{p: paramvals[p] for p in model.variable_params})
try:
model.update_all_models(**{p: paramvals[p] for p in model.variable_params})
except:
model.update(**{p: paramvals[p] for p in model.variable_params})
_ = model.logposterior
stats = model.get_current_stats()

Expand Down
4 changes: 4 additions & 0 deletions pycbc/inference/models/hierarchical.py
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,9 @@ def total_loglr(self):
self.primary_model.return_sh_hh = True
sh_primary, hh_primary = self.primary_model.loglr
self.primary_model.return_sh_hh = False
# set logr, otherwise it will store (sh, hh)
setattr(self.primary_model._current_stats, 'loglr',
self.primary_model.marginalize_loglr(sh_primary, hh_primary))

margin_names_vector = list(
self.primary_model.marginalize_vector_params.keys())
Expand Down Expand Up @@ -786,6 +789,7 @@ def total_loglr(self):
print("hh_total: ", hh_total)

loglr = self.primary_model.marginalize_loglr(sh_total, hh_total)
setattr(self._current_stats, 'total_loglr', loglr)

return loglr

Expand Down
3 changes: 2 additions & 1 deletion pycbc/inference/models/relbin.py
Original file line number Diff line number Diff line change
Expand Up @@ -596,10 +596,11 @@ def _loglr(self):
filt += filter_i
norm += norm_i

loglr = self.marginalize_loglr(filt, norm)
if self.return_sh_hh:
results = (filt, norm)
else:
results = self.marginalize_loglr(filt, norm)
results = loglr
return results

def write_metadata(self, fp, group=None):
Expand Down

0 comments on commit b06d32e

Please sign in to comment.