82f0a3aaee
Do not export Python modules in CMake config
Drop patch root-clang-ignore-gcc-options.patch
("Recent ROOT does not send all possible compiler flags to rootcling.")
41 lines
2.1 KiB
Diff
41 lines
2.1 KiB
Diff
From 00bbfddbf5c900923b284ddc540d2458bda15b7b Mon Sep 17 00:00:00 2001
|
|
From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
|
|
Date: Wed, 5 Aug 2020 13:22:46 +0200
|
|
Subject: [PATCH] Fix a shadow warning.
|
|
|
|
---
|
|
roofit/roofitmore/src/RooHypatia2.cxx | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/roofit/roofitmore/src/RooHypatia2.cxx b/roofit/roofitmore/src/RooHypatia2.cxx
|
|
index 7d550b2753..fe80f414d0 100644
|
|
--- a/roofit/roofitmore/src/RooHypatia2.cxx
|
|
+++ b/roofit/roofitmore/src/RooHypatia2.cxx
|
|
@@ -119,21 +119,21 @@
|
|
/// \param[in] a2 Start of right tail.
|
|
/// \param[in] n2 Shape parameter of right tail (\f$ n2 \ge 0 \f$). With \f$ n2 = 0 \f$, the function is constant.
|
|
RooHypatia2::RooHypatia2(const char *name, const char *title, RooAbsReal& x, RooAbsReal& lambda,
|
|
- RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& sigma, RooAbsReal& mu, RooAbsReal& a,
|
|
+ RooAbsReal& zeta, RooAbsReal& beta, RooAbsReal& argSigma, RooAbsReal& mu, RooAbsReal& a,
|
|
RooAbsReal& n, RooAbsReal& a2, RooAbsReal& n2) :
|
|
RooAbsPdf(name, title),
|
|
_x("x", "x", this, x),
|
|
_lambda("lambda", "Lambda", this, lambda),
|
|
_zeta("zeta", "zeta", this, zeta),
|
|
_beta("beta", "Asymmetry parameter beta", this, beta),
|
|
- _sigma("sigma", "Width parameter sigma", this, sigma),
|
|
+ _sigma("sigma", "Width parameter sigma", this, argSigma),
|
|
_mu("mu", "Location parameter mu", this, mu),
|
|
_a("a", "Left tail location a", this, a),
|
|
_n("n", "Left tail parameter n", this, n),
|
|
_a2("a2", "Right tail location a2", this, a2),
|
|
_n2("n2", "Right tail parameter n2", this, n2)
|
|
{
|
|
- RooHelpers::checkRangeOfParameters(this, {&sigma}, 0.);
|
|
+ RooHelpers::checkRangeOfParameters(this, {&argSigma}, 0.);
|
|
RooHelpers::checkRangeOfParameters(this, {&zeta, &n, &n2, &a, &a2}, 0., std::numeric_limits<double>::max(), true);
|
|
if (zeta.getVal() == 0. && zeta.isConstant()) {
|
|
RooHelpers::checkRangeOfParameters(this, {&lambda}, -std::numeric_limits<double>::max(), 0., false,
|
|
--
|
|
2.26.2
|
|
|