Skip to content

Commit 36e391a

Browse files
authored
Merge pull request #238 from MadAnalysis/lumi_scaling_fix
Bugfix in lumi scaling
2 parents e0683e8 + dc3ea9e commit 36e391a

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-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.13"
78-
date = "2023/11/08"
77+
version = "1.10.14"
78+
date = "2024/01/22"
7979

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

doc/releases/changelog-v1.10.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,13 @@
133133
* Update of the version of Delphes/DelphesMa5tune + compatibility with M1 chips and Mac OS 13.0.
134134
([#173](https://github.com/orgs/MadAnalysis/discussions/173))
135135

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

140+
* Minor bugfix in luminosity scaling for recasting
141+
([#238](https://github.com/MadAnalysis/madanalysis5/pull/238))
142+
140143
## Contributors
141144

142145
This release contains contributions from (in alphabetical order):

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 *= lumi_scaling**2
1148+
new_sigma = new_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.13";
41-
const std::string Configuration::sampleanalyzer_date_ = "2023/11/08";
40+
const std::string Configuration::sampleanalyzer_version_ = "1.10.14";
41+
const std::string Configuration::sampleanalyzer_date_ = "2024/01/22";
4242
// DO NOT TOUCH THESE LINES
4343

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

0 commit comments

Comments
 (0)