Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into update_instance_interped_priors

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into 441-injection-in-frequency-domain-doesn-t-update-time-domain-strain

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into remove_conditional_prior_feature_from_cbc_prior_dict

Merge branch 'temporarily_remove_3.6_testing' into 446-tests-on-master-failing-due-to-new-solar-mass-in-lal

Merge branch 'temporarily_remove_3.6_testing' into remove_conditional_prior_feature_from_cbc_prior_dict

# Conflicts:
#	.gitlab-ci.yml

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into remove_conditional_prior_feature_from_cbc_prior_dict

Merge branch 'temporarily_remove_3.6_testing' into 446-tests-on-master-failing-due-to-new-solar-mass-in-lal

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into 441-injection-in-frequency-domain-doesn-t-update-time-domain-strain

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into remove_conditional_prior_feature_from_cbc_prior_dict

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into remove_conditional_prior_feature_from_cbc_prior_dict

Merge branch '446-tests-on-master-failing-due-to-new-solar-mass-in-lal' into 441-injection-in-frequency-domain-doesn-t-update-time-domain-strain

Fix ROQ scaling checks

Closes bilby_pipe#147

See merge request !678

Introduce Joint Priors

See merge request !668

Bruce Edelman authored 5 years ago and Gregory Ashton committed 5 years ago

generalized the JointPrior object structure from Matthew Pitkin's MutlivariateGaussian prior formalism. TODO: add in the joint MapPrior for HEALPix priors

Resolve "Scheduled tests failing: gw_example_test.py"

Closes #442

See merge request !677

# Conflicts:
#	bilby/core/prior.py

Revert !674

Closes #442

See merge request !676

Gregory Ashton authored 5 years ago and Moritz Huebner committed 5 years ago

Revert "Merge branch '439-conditional-priors-not-working-reliably-with-nested-conditions' into 'master'"

This reverts merge request !674

Resolve "Conditional Priors not working reliably with Nested conditions"

Closes #439

See merge request !674