Skip to content

Commit e08e8fd

Browse files
authored
Merge pull request #246 from MadAnalysis/luminosity_scaling_fix2
fix typo in run_recast
2 parents 6a3ad2e + a0ce62f commit e08e8fd

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

bin/ma5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ sys.path.insert(0, servicedir)
7474

7575
# Release version
7676
# Do not touch it !!!!!
77-
version = "1.10.15"
78-
date = "2024/05/06"
77+
version = "1.10.16"
78+
date = "2024/08/26"
7979

8080
# Loading the MadAnalysis session
8181
import madanalysis.core.launcher

doc/releases/changelog-v1.10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137

138138
* Covariance matrix implementation has been fixed for HL extrapolations
139139
(see issue [#223](https://github.com/MadAnalysis/madanalysis5/issues/223)).
140-
([#225](https://github.com/MadAnalysis/madanalysis5/pull/225))
140+
([#225](https://github.com/MadAnalysis/madanalysis5/pull/225)) and ([#246](https://github.com/MadAnalysis/madanalysis5/pull/246))
141141

142142
* Minor bugfix in luminosity scaling for recasting
143143
([#238](https://github.com/MadAnalysis/madanalysis5/pull/238))

madanalysis/misc/run_recast.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ def header_info_file(self, etree, analysis, extrapolated_lumi):
11451145
if self.main.recasting.error_extrapolation=='sqrt':
11461146
new_sigma = round(math.sqrt(sigma)*lumi_scaling,8)
11471147
elif self.main.recasting.error_extrapolation=='linear':
1148-
new_sigma = new_sigma * lumi_scaling**2
1148+
new_sigma = sigma * lumi_scaling**2
11491149
else:
11501150
new_sigma = sigma * lumi_scaling**2 * self.main.recasting.error_extrapolation[0]**2 + \
11511151
np.sqrt(sigma) * lumi_scaling * self.main.recasting.error_extrapolation[1]**2

tools/SampleAnalyzer/Commons/Base/Configuration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ using namespace MA5;
3737
// Initializing static data members
3838
// -----------------------------------------------------------------------------
3939
// DO NOT TOUCH THESE LINES
40-
const std::string Configuration::sampleanalyzer_version_ = "1.10.15";
41-
const std::string Configuration::sampleanalyzer_date_ = "2024/05/06";
40+
const std::string Configuration::sampleanalyzer_version_ = "1.10.16";
41+
const std::string Configuration::sampleanalyzer_date_ = "2024/08/26";
4242
// DO NOT TOUCH THESE LINES
4343

4444
// -----------------------------------------------------------------------------

0 commit comments

Comments
 (0)