From 37f3ffc3e575eb53a37bb9898de1d885d29e84f9 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 18 Feb 2022 22:26:19 -0600
Subject: [PATCH] More python changes
---
benchmarks/clustering/scripts/cluster_plots.py | 2 +-
benchmarks/imaging_shower_ML/scripts/check_edep_dists.py | 4 ++--
benchmarks/tracking/scripts/tracking_performance.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/benchmarks/clustering/scripts/cluster_plots.py b/benchmarks/clustering/scripts/cluster_plots.py
index 0b99c637..c7b2fd46 100644
--- a/benchmarks/clustering/scripts/cluster_plots.py
+++ b/benchmarks/clustering/scripts/cluster_plots.py
@@ -62,7 +62,7 @@ def thrown_particles_figure(rdf, save, mcbranch="MCParticles"):
get_pname = np.vectorize(lambda pid: pdgbase.GetParticle(int(pid)).GetName())
# enumerate particle names
- dft.loc[:, 'pname'] = get_pname(dft['pdgID'].values)
+ dft.loc[:, 'pname'] = get_pname(dft['PDG'].values)
penum = {pname: i for i, pname in enumerate(dft['pname'].unique())}
dft.loc[:, 'pname_id'] = dft['pname'].map(penum)
diff --git a/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py b/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py
index f191942a..76dca744 100644
--- a/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py
+++ b/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py
@@ -111,12 +111,12 @@ if __name__ == '__main__':
hist_vals, hist_cols = [], []
pdgbase = ROOT.TDatabasePDG()
- for pdgid in dfm['pdgID'].unique():
+ for pdgid in dfm['PDG'].unique():
particle = pdgbase.GetParticle(int(pdgid))
if not particle:
print("Unknown pdgcode {}, they are ignored".format(int(pdgid)))
continue
- events_indices = dfm[dfm.loc[:, 'pdgID'] == pdgid].index.unique()
+ events_indices = dfm[dfm.loc[:, 'PDG'] == pdgid].index.unique()
print("{} entries of particle {}".format(len(events_indices), particle.GetName()))
dfe_part = dfe.loc[dfe['event'].isin(events_indices)]
diff --git a/benchmarks/tracking/scripts/tracking_performance.py b/benchmarks/tracking/scripts/tracking_performance.py
index ca908b3b..c39c9717 100644
--- a/benchmarks/tracking/scripts/tracking_performance.py
+++ b/benchmarks/tracking/scripts/tracking_performance.py
@@ -62,8 +62,8 @@ def thrown_particles_figure(rdf, save, mcbranch="MCParticles"):
get_pcharge = np.vectorize(lambda pid: pdgbase.GetParticle(int(pid)).Charge()/3.)
# enumerate particle names
- dft.loc[:, 'pname'] = get_pname(dft['pdgID'].values)
- dft.loc[:, 'charge'] = get_pcharge(dft['pdgID'].values)
+ dft.loc[:, 'pname'] = get_pname(dft['PDG'].values)
+ dft.loc[:, 'charge'] = get_pcharge(dft['PDG'].values)
penum = {pname: i for i, pname in enumerate(dft['pname'].unique())}
dft.loc[:, 'pname_id'] = dft['pname'].map(penum)
--
GitLab