Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

bilby
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7d8fcd43

Commit 7d8fcd43 authored 6 years ago by Colm Talbot

Downloads
- Plain Diff

Merge branch 'master' into 'update_examples'

# Conflicts:
#   examples/injection_examples/basic_tutorial.py
#   examples/injection_examples/binary_neutron_star_example.py

parents ae253791 60f7750c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
CHANGELOG.md 2 additions, 0 deletions

CHANGELOG.md
bilby/core/result.py 3 additions, 35 deletions

bilby/core/result.py
bilby/gw/conversion.py 289 additions, 62 deletions

bilby/gw/conversion.py
bilby/gw/prior_files/binary_neutron_stars.prior 2 additions, 2 deletions

bilby/gw/prior_files/binary_neutron_stars.prior
bilby/gw/source.py 7 additions, 7 deletions

bilby/gw/source.py
examples/injection_examples/binary_neutron_star_example.py 20 additions, 4 deletions

examples/injection_examples/binary_neutron_star_example.py
test/conversion_test.py 24 additions, 2 deletions

test/conversion_test.py

with 349 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment