From 63eba570c53755da77c77146e036d54a972655d3 Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Mon, 17 Jun 2024 15:07:43 +0200
Subject: [PATCH] Remove debug line; fix bug in new uncertainty code
---
v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc | 1 -
v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc b/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
index 4e9329bc..58f5578b 100644
--- a/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
+++ b/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
@@ -627,7 +627,6 @@ std::vector< std::vector<double> > fastNLOLHAPDF::GetXsUncertaintyVec(const fast
if (iprint > 0) {
string style{PDFUncertaintyStyle_to_string(ePDFUnc)};
string PDFFile = GetLHAPDFFilename();
- cout << "PPPPPPPPPPPPPPPPPPPP " << PDFFile << endl;
string UncName = " # Relative PDF Uncertainties (" + style + " " + PDFFile + " " + "TODO" + ")";
fastNLOTools::PrintXSUncertainty(xsUnc, UncName);
}
diff --git a/v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc b/v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc
index 816e515b..dd139036 100644
--- a/v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc
+++ b/v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc
@@ -3473,10 +3473,14 @@ XsUncertainty fastNLOReader::GetXsUncertainty(const EScaleUncertaintyStyle eScal
SetScaleFactorsMuRMuF(xmurn[iscl],xmufn[iscl]);
CalcCrossSection();
bool lNormScale = false;
- if (lNorm && eScaleUnc == kAsymmetricRatio) {
- lNormScale = true;
+ if (lNorm) {
+ if (eScaleUnc == kAsymmetricRatio) {
+ lNormScale = true;
+ }
+ MyXSection = GetNormCrossSection(lNormScale,xmurd[iscl],xmufd[iscl]);
+ } else {
+ MyXSection = GetCrossSection(lNorm);
}
- MyXSection = GetNormCrossSection(lNormScale,xmurd[iscl],xmufd[iscl]);
for (unsigned int iobs = 0; iobs < NObsBin; iobs++) {
if (iscl == 0) {
XsUnc.xs.push_back(MyXSection[iobs]);
--
GitLab