Merge pull request #351 from johannbrehmer/weighted-histo

Improved default for weighted histograms

docs/conf.py

@@ -24,7 +24,7 @@
 author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer'
 
 # The short X.Y version
-version = '0.4.4'
+version = '0.4.5'
 # The full version, including alpha/beta/rc tags
 release = version
 

madminer/__version__.py

@@ -1 +1 @@
-__version__ = "0.4.4"
+__version__ = "0.4.5"

madminer/limits.py

@@ -43,7 +43,7 @@ def observed_limits(
         include_xsec=True,
         resolutions=25,
         luminosity=300000.0,
-        n_histo_toys=10000,
+        n_histo_toys=None,
         returns="pval",
         dof=None,
         n_observed=None,
@@ -83,7 +83,7 @@ def expected_limits(
         include_xsec=True,
         resolutions=25,
         luminosity=300000.0,
-        n_histo_toys=10000,
+        n_histo_toys=None,
         returns="pval",
         dof=None,
         histo_theta_batchsize=100,
@@ -363,6 +363,9 @@ def _make_sampled_histo_data(
         sampler = SampleAugmenter(self.madminer_filename, include_nuisance_parameters=self.include_nuisance_parameters)
         all_summary_stats, all_theta = None, None
 
+        if n_toys_per_theta is None:
+            n_toys_per_theta = 10000
+
         n_thetas = len(thetas)
         n_batches = (n_thetas - 1) // histo_theta_batchsize + 1
         for i_batch in range(n_batches):

setup.py

@@ -20,7 +20,7 @@
 EMAIL = 'johann.brehmer@nyu.edu'
 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.4'
+VERSION = '0.4.5'
 
 # What packages are required for this module to be executed?
 REQUIRED = [