Skip to content

Commit

Permalink
Merge pull request #342 from johannbrehmer/develop
Browse files Browse the repository at this point in the history
Bumped version number
  • Loading branch information
johannbrehmer authored Jun 3, 2019
2 parents d043e90 + 354dee1 commit 2e9a713
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer'

# The short X.Y version
version = '0.4.1'
version = '0.4.2'
# The full version, including alpha/beta/rc tags
release = version

Expand Down
2 changes: 1 addition & 1 deletion madminer/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.1"
__version__ = "0.4.2"
6 changes: 3 additions & 3 deletions madminer/limits.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def observed_limits(
histo_theta_batchsize=100,
):
if n_observed is None:
n_observed=len(x_observed)
n_observed = len(x_observed)
theta_grid, return_values, i_ml = self._analyse(
n_observed,
x_observed,
Expand Down Expand Up @@ -137,7 +137,7 @@ def _analyse(
):
logger.debug("Calculating p-values for %s expected events", n_events)

assert returns in ["pval", "llr","llr_raw"], "returns has to be either 'pval','llr' or 'llr_raw'!"
assert returns in ["pval", "llr", "llr_raw"], "returns has to be either 'pval','llr' or 'llr_raw'!"

# Observation weights
if obs_weights is None:
Expand Down Expand Up @@ -209,7 +209,7 @@ def _analyse(
log_r = log_r_kin + log_p_xsec
if returns == "llr_raw":
return theta_grid, log_r, 0

logger.debug("Combined -2 log r: %s", -2.0 * log_r)
log_r, i_ml = self._subtract_ml(log_r)
logger.debug("Min-subtracted -2 log r: %s", -2.0 * log_r)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
EMAIL = '[email protected]'
AUTHOR = 'Johann Brehmer, Felix Kling, Irina Espejo, Kyle Cranmer'
REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
VERSION = '0.4.1'
VERSION = '0.4.2'

# What packages are required for this module to be executed?
REQUIRED = [
Expand Down

0 comments on commit 2e9a713

Please sign in to comment.