From 06c8add5d2b4d18642c6f07a82b0ee6e2e8d240f Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 10 Aug 2021 18:03:20 +0000
Subject: [PATCH] Update benchmarks for new dd4pod (minor changes)
---
benchmarks/B0/scripts/hits_far_forward_protons.cxx | 4 ++--
benchmarks/B0/scripts/rec_far_forward_protons.cxx | 4 ++--
benchmarks/clustering/scripts/cluster_plots.py | 4 ++--
benchmarks/imaging_ecal/scripts/utils.py | 4 ++--
benchmarks/imaging_shower_ML/scripts/prepare_tf_dataset.py | 2 +-
benchmarks/tracking/scripts/hits_central_electrons.cxx | 4 ++--
benchmarks/tracking/scripts/hits_central_pions.cxx | 4 ++--
benchmarks/tracking/scripts/rec_central_electrons.cxx | 4 ++--
benchmarks/tracking/scripts/rec_central_pions.cxx | 4 ++--
benchmarks/tracking/scripts/rec_multiple_tracks.cxx | 4 ++--
benchmarks/tracking/scripts/tracking_performance.py | 4 ++--
11 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/benchmarks/B0/scripts/hits_far_forward_protons.cxx b/benchmarks/B0/scripts/hits_far_forward_protons.cxx
index aa877e88..cb6adfdc 100644
--- a/benchmarks/B0/scripts/hits_far_forward_protons.cxx
+++ b/benchmarks/B0/scripts/hits_far_forward_protons.cxx
@@ -31,7 +31,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -54,7 +54,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/B0/scripts/rec_far_forward_protons.cxx b/benchmarks/B0/scripts/rec_far_forward_protons.cxx
index 4cd5d321..e9c43514 100644
--- a/benchmarks/B0/scripts/rec_far_forward_protons.cxx
+++ b/benchmarks/B0/scripts/rec_far_forward_protons.cxx
@@ -29,7 +29,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -52,7 +52,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/clustering/scripts/cluster_plots.py b/benchmarks/clustering/scripts/cluster_plots.py
index d5a890ac..29c2ebdd 100644
--- a/benchmarks/clustering/scripts/cluster_plots.py
+++ b/benchmarks/clustering/scripts/cluster_plots.py
@@ -51,7 +51,7 @@ def flatten_collection(rdf, collection, cols=None):
def thrown_particles_figure(rdf, save, mcbranch="mcparticles"):
# define truth particle info
- dft = flatten_collection(rdf, mcbranch, ['genStatus', 'pdgID', 'psx', 'psy', 'psz', 'mass'])
+ dft = flatten_collection(rdf, mcbranch, ['genStatus', 'pdgID', 'ps.x', 'ps.y', 'ps.z', 'mass'])
dft.rename(columns={c: c.replace(mcbranch + '.', '') for c in dft.columns}, inplace=True)
dft.rename(columns={c: c.replace(mcbranch + 'Info.', '') for c in dft.columns}, inplace=True)
# select thrown particles
@@ -79,7 +79,7 @@ def thrown_particles_figure(rdf, save, mcbranch="mcparticles"):
# calculate kinematics
get_4vecs = np.vectorize(lambda x, y, z, m: ROOT.Math.PxPyPzMVector(x, y, z, m))
- fourvecs = get_4vecs(*dft[['psx', 'psy', 'psz', 'mass']].values.T)
+ fourvecs = get_4vecs(*dft[['ps.x', 'ps.y', 'ps.z', 'mass']].values.T)
dft.loc[:, 'p'] = [v.P() for v in fourvecs]
dft.loc[:, 'eta'] = [v.Eta() for v in fourvecs]
diff --git a/benchmarks/imaging_ecal/scripts/utils.py b/benchmarks/imaging_ecal/scripts/utils.py
index d3847618..ca58634a 100644
--- a/benchmarks/imaging_ecal/scripts/utils.py
+++ b/benchmarks/imaging_ecal/scripts/utils.py
@@ -51,7 +51,7 @@ def get_mcp_data(path, evnums=None, branch='mcparticles2'):
events.GetEntry(iev)
# extract full mc particle data
for part in getattr(events, branch):
- dbuf[idb] = (iev, part.psx, part.psy, part.psz, part.pdgID, part.status)
+ dbuf[idb] = (iev, part.ps.x, part.ps.y, part.ps.z, part.pdgID, part.status)
idb += 1
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status'])
@@ -75,7 +75,7 @@ def get_mcp_simple(path, evnums=None, branch='mcparticles2'):
events.GetEntry(iev)
# extract full mc particle data
part = getattr(events, branch)[2]
- dbuf[idb] = (iev, part.psx, part.psy, part.psz, part.pdgID, part.status)
+ dbuf[idb] = (iev, part.ps.x, part.ps.y, part.ps.z, part.pdgID, part.status)
idb += 1
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status'])
diff --git a/benchmarks/imaging_shower_ML/scripts/prepare_tf_dataset.py b/benchmarks/imaging_shower_ML/scripts/prepare_tf_dataset.py
index 2b722a45..9355b5d9 100644
--- a/benchmarks/imaging_shower_ML/scripts/prepare_tf_dataset.py
+++ b/benchmarks/imaging_shower_ML/scripts/prepare_tf_dataset.py
@@ -49,7 +49,7 @@ def get_mcp_simple(path, evnums=None, branch='mcparticles2'):
events.GetEntry(iev)
# extract full mc particle data
part = getattr(events, branch)[2]
- dbuf[idb] = (iev, part.psx, part.psy, part.psz, part.pdgID, part.status)
+ dbuf[idb] = (iev, part.ps.x, part.ps.y, part.ps.z, part.pdgID, part.status)
idb += 1
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status'])
diff --git a/benchmarks/tracking/scripts/hits_central_electrons.cxx b/benchmarks/tracking/scripts/hits_central_electrons.cxx
index a0d76fd4..7e38cc88 100644
--- a/benchmarks/tracking/scripts/hits_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/hits_central_electrons.cxx
@@ -31,7 +31,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -54,7 +54,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/tracking/scripts/hits_central_pions.cxx b/benchmarks/tracking/scripts/hits_central_pions.cxx
index 2e97e0df..0a70c5e4 100644
--- a/benchmarks/tracking/scripts/hits_central_pions.cxx
+++ b/benchmarks/tracking/scripts/hits_central_pions.cxx
@@ -31,7 +31,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -54,7 +54,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/tracking/scripts/rec_central_electrons.cxx b/benchmarks/tracking/scripts/rec_central_electrons.cxx
index 89a4521b..9bb12315 100644
--- a/benchmarks/tracking/scripts/rec_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/rec_central_electrons.cxx
@@ -29,7 +29,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -52,7 +52,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/tracking/scripts/rec_central_pions.cxx b/benchmarks/tracking/scripts/rec_central_pions.cxx
index 716a9a60..f761b66f 100644
--- a/benchmarks/tracking/scripts/rec_central_pions.cxx
+++ b/benchmarks/tracking/scripts/rec_central_pions.cxx
@@ -29,7 +29,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -52,7 +52,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/tracking/scripts/rec_multiple_tracks.cxx b/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
index 9f0da775..02bd77de 100644
--- a/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
@@ -29,7 +29,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
std::vector<float> pt (std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) {
- result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy));
+ result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
}
return result;
}
@@ -52,7 +52,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) {
- lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass);
+ lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv);
}
return result;
diff --git a/benchmarks/tracking/scripts/tracking_performance.py b/benchmarks/tracking/scripts/tracking_performance.py
index 9c347383..3166f921 100644
--- a/benchmarks/tracking/scripts/tracking_performance.py
+++ b/benchmarks/tracking/scripts/tracking_performance.py
@@ -50,7 +50,7 @@ def flatten_collection(rdf, collection, cols=None):
def thrown_particles_figure(rdf, save, mcbranch="mcparticles2"):
# define truth particle info
- dft = flatten_collection(rdf, mcbranch, ['genStatus', 'pdgID', 'psx', 'psy', 'psz', 'mass'])
+ dft = flatten_collection(rdf, mcbranch, ['genStatus', 'pdgID', 'ps.x', 'ps.y', 'ps.z', 'mass'])
dft.rename(columns={c: c.replace(mcbranch + '.', '') for c in dft.columns}, inplace=True)
# select thrown particles
dft = dft[dft['genStatus'] == 1]
@@ -79,7 +79,7 @@ def thrown_particles_figure(rdf, save, mcbranch="mcparticles2"):
# calculate kinematics
get_4vecs = np.vectorize(lambda x, y, z, m: ROOT.Math.PxPyPzMVector(x, y, z, m))
- fourvecs = get_4vecs(*dft[['psx', 'psy', 'psz', 'mass']].values.T)
+ fourvecs = get_4vecs(*dft[['ps.x', 'ps.y', 'ps.z', 'mass']].values.T)
dft.loc[:, 'p'] = [v.P() for v in fourvecs]
dft.loc[:, 'theta'] = [v.Theta() for v in fourvecs]
--
GitLab