Commit 10637d3b authored by Moritz's avatar Moritz
Browse files

Merge remote-tracking branch 'origin/combine_samples_moritzh' into combine_samples_moritzh

# Conflicts:
#	bilby/core/
parents 0187bb88 b507d8a2
......@@ -2,19 +2,19 @@ from __future__ import division
import os
from collections import OrderedDict, namedtuple
from itertools import product
from distutils.version import LooseVersion
from copy import deepcopy
from distutils.version import LooseVersion
import corner
import json
import scipy.stats
import matplotlib
import matplotlib.pyplot as plt
from matplotlib import lines as mpllines
import numpy as np
import pandas as pd
from scipy.special import logsumexp
import scipy.stats
from scipy.special import logsumexp
from . import utils
from .utils import (logger, infer_parameters_from_function,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment