Merge pull request #246 from MadAnalysis/luminosity_scaling_fix2

fix typo in run_recast
MadAnalysis · Aug 26, 2024 · e08e8fd · e08e8fd
2 parents 6a3ad2e + a0ce62f
commit e08e8fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bin/ma5 b/bin/ma5
@@ -74,8 +74,8 @@ sys.path.insert(0, servicedir)
 
 # Release version
 # Do not touch it !!!!!
-version = "1.10.15"
-date = "2024/05/06"
+version = "1.10.16"
+date = "2024/08/26"
 
 # Loading the MadAnalysis session
 import madanalysis.core.launcher

diff --git a/doc/releases/changelog-v1.10.md b/doc/releases/changelog-v1.10.md
@@ -137,7 +137,7 @@
 
 * Covariance matrix implementation has been fixed for HL extrapolations
   (see issue [#223](https://github.com/MadAnalysis/madanalysis5/issues/223)).
-  ([#225](https://github.com/MadAnalysis/madanalysis5/pull/225))
+  ([#225](https://github.com/MadAnalysis/madanalysis5/pull/225)) and ([#246](https://github.com/MadAnalysis/madanalysis5/pull/246))
 
 * Minor bugfix in luminosity scaling for recasting
   ([#238](https://github.com/MadAnalysis/madanalysis5/pull/238))

diff --git a/madanalysis/misc/run_recast.py b/madanalysis/misc/run_recast.py
@@ -1145,7 +1145,7 @@ def header_info_file(self, etree, analysis, extrapolated_lumi):
                 if self.main.recasting.error_extrapolation=='sqrt':
                     new_sigma = round(math.sqrt(sigma)*lumi_scaling,8)
                 elif self.main.recasting.error_extrapolation=='linear':
-                    new_sigma = new_sigma * lumi_scaling**2
+                    new_sigma = sigma * lumi_scaling**2
                 else:
                     new_sigma = sigma * lumi_scaling**2 * self.main.recasting.error_extrapolation[0]**2 + \
                         np.sqrt(sigma) * lumi_scaling * self.main.recasting.error_extrapolation[1]**2

diff --git a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp
@@ -37,8 +37,8 @@ using namespace MA5;
 // Initializing static data members
 // -----------------------------------------------------------------------------
 // DO NOT TOUCH THESE LINES
-const std::string Configuration::sampleanalyzer_version_ = "1.10.15";
-const std::string Configuration::sampleanalyzer_date_ = "2024/05/06";
+const std::string Configuration::sampleanalyzer_version_ = "1.10.16";
+const std::string Configuration::sampleanalyzer_date_ = "2024/08/26";
 // DO NOT TOUCH THESE LINES
 
 // -----------------------------------------------------------------------------