From 1ca7cb12f4be46f3e08c84491b30eaa51dfa4a6c Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 28 Aug 2024 13:35:20 +0000
Subject: [PATCH] Revert "fix: use InclusiveKinematicsESigma in DIS benchmarks
(#22)"
This reverts commit 49e6bc61ef86bfa6f32486f3d53a54019c72f67d
---
benchmarks/dis/analysis/dis_electrons.cxx | 4 ++--
benchmarks/dis/analysis/kinematics_correlations.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/benchmarks/dis/analysis/dis_electrons.cxx b/benchmarks/dis/analysis/dis_electrons.cxx
index 716c2b04..b5d0c65d 100644
--- a/benchmarks/dis/analysis/dis_electrons.cxx
+++ b/benchmarks/dis/analysis/dis_electrons.cxx
@@ -81,7 +81,7 @@ int dis_electrons(const std::string& config_name)
.Define("Q2_jb", "InclusiveKinematicsJB.Q2")
.Define("Q2_da", "InclusiveKinematicsDA.Q2")
.Define("Q2_sigma", "InclusiveKinematicsSigma.Q2")
- .Define("Q2_esigma", "InclusiveKinematicsESigma.Q2")
+ .Define("Q2_esigma", "InclusiveKinematicseSigma.Q2")
.Define("logQ2_sim", "log10(Q2_sim)")
.Define("logQ2_el", "log10(Q2_el)")
.Define("logQ2_jb", "log10(Q2_jb)")
@@ -98,7 +98,7 @@ int dis_electrons(const std::string& config_name)
.Define("x_jb", "InclusiveKinematicsJB.x")
.Define("x_da", "InclusiveKinematicsDA.x")
.Define("x_sigma", "InclusiveKinematicsSigma.x")
- .Define("x_esigma", "InclusiveKinematicsESigma.x")
+ .Define("x_esigma", "InclusiveKinematicseSigma.x")
.Define("x_el_res", combinatorial_diff_ratio, {"x_sim", "x_el"})
.Define("x_jb_res", combinatorial_diff_ratio, {"x_sim", "x_jb"})
.Define("x_da_res", combinatorial_diff_ratio, {"x_sim", "x_da"})
diff --git a/benchmarks/dis/analysis/kinematics_correlations.py b/benchmarks/dis/analysis/kinematics_correlations.py
index 3bfd316e..3113df0e 100644
--- a/benchmarks/dis/analysis/kinematics_correlations.py
+++ b/benchmarks/dis/analysis/kinematics_correlations.py
@@ -161,21 +161,21 @@ keys = ur.concatenate(rec_file + ':events/' + 'InclusiveKinematicsJB')
JacquetBlondel = [keys['InclusiveKinematicsJB.Q2'], keys['InclusiveKinematicsJB.x']]
keys = ur.concatenate(rec_file + ':events/' + 'InclusiveKinematicsSigma')
Sigma = [keys['InclusiveKinematicsSigma.Q2'], keys['InclusiveKinematicsSigma.x']]
-keys = ur.concatenate(rec_file + ':events/' + 'InclusiveKinematicsESigma')
-ESigma = [keys['InclusiveKinematicsESigma.Q2'], keys['InclusiveKinematicsESigma.x']]
+keys = ur.concatenate(rec_file + ':events/' + 'InclusiveKinematicseSigma')
+eSigma = [keys['InclusiveKinematicseSigma.Q2'], keys['InclusiveKinematicseSigma.x']]
Q2values_T = Truth[0]
Q2values_E = Electron[0]
Q2values_DA = DoubleAngle[0]
Q2values_JB = JacquetBlondel[0]
Q2values_S = Sigma[0]
-Q2values_eS = ESigma[0]
+Q2values_eS = eSigma[0]
Xvalues_T = Truth[1]
Xvalues_E = Electron[1]
Xvalues_DA = DoubleAngle[1]
Xvalues_JB = JacquetBlondel[1]
Xvalues_S = Sigma[1]
-Xvalues_eS = ESigma[1]
+Xvalues_eS = eSigma[1]
method_dict = {'e':'Electron','DA':'Double-Angle','JB':'Jacquet-Blondel','S':'Sigma','eS':'eSigma'}
method_Q2values_dict = {'e':Q2values_E,'DA':Q2values_DA,'JB':Q2values_JB,'S':Q2values_S,'eS':Q2values_eS}
--
GitLab