Skip to content

Commit

Permalink
fix leftover old var binning flag in map
Browse files Browse the repository at this point in the history
  • Loading branch information
@marialiubarska
marialiubarska committed Nov 12, 2024
1 parent 4a5fae5 commit c2a89f3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pisa/core/map.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1681,7 +1681,7 @@ def llh(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.llh(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.llh(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1715,7 +1715,7 @@ def mcllh_mean(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.mcllh_mean(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.mcllh_mean(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1750,7 +1750,7 @@ def mcllh_eff(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.mcllh_eff(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.mcllh_eff(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1784,7 +1784,7 @@ def conv_llh(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.conv_llh(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.conv_llh(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1824,7 +1824,7 @@ def barlow_llh(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.barlow_llh(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.barlow_llh(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1859,7 +1859,7 @@ def mod_chi2(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.mod_chi2(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.mod_chi2(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1893,7 +1893,7 @@ def correct_chi2(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.correct_chi2(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.correct_chi2(actual_values=hi, expected_values=exp_val_hi))\
Expand Down Expand Up @@ -1927,7 +1927,7 @@ def chi2(self, expected_values, binned=False):
expected_values=exp_val_hi)\
for hi, exp_val_hi in zip(self.hist, expected_values)]

if is_not_vb:
if not self.variable_binning:
return np.sum(stats.chi2(actual_values=self.hist,
expected_values=expected_values))
return np.sum([np.sum(stats.chi2(actual_values=hi, expected_values=exp_val_hi))\
Expand Down

0 comments on commit c2a89f3

Please sign in to comment.