From 066157b704dcf84eca5ecf022bcf116e706197e6 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 18 Feb 2022 22:53:38 -0600
Subject: [PATCH] Disable g4Parent
---
benchmarks/imaging_ecal/scripts/draw_cluster.py | 4 +++-
benchmarks/imaging_ecal/scripts/utils.py | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/benchmarks/imaging_ecal/scripts/draw_cluster.py b/benchmarks/imaging_ecal/scripts/draw_cluster.py
index faeac4be..e3b81460 100755
--- a/benchmarks/imaging_ecal/scripts/draw_cluster.py
+++ b/benchmarks/imaging_ecal/scripts/draw_cluster.py
@@ -151,7 +151,9 @@ if __name__ == '__main__':
dfallmcp = get_all_mcp(args.file, args.iev, 'MCParticles')
pdgbase = ROOT.TDatabasePDG()
# Select decaying particles
- dftemp = dfallmcp[dfallmcp['g4Parent'] == 1.0]
+ # FIXME g4Parent not in edm4hep
+ #dftemp = dfallmcp[dfallmcp['g4Parent'] == 1.0]
+ dftemp = dfallmcp
if len(dftemp) > 0:
dfdecaymcp = dftemp.copy()
for iptl in [0, len(dfdecaymcp) - 1]:
diff --git a/benchmarks/imaging_ecal/scripts/utils.py b/benchmarks/imaging_ecal/scripts/utils.py
index 452a9334..c65e32c6 100644
--- a/benchmarks/imaging_ecal/scripts/utils.py
+++ b/benchmarks/imaging_ecal/scripts/utils.py
@@ -55,7 +55,7 @@ def get_mcp_data(path, evnums=None, branch='MCParticles'):
events.GetEntry(iev)
# extract full mc particle data
for part in getattr(events, branch):
- dbuf[idb] = (iev, part.ps.x, part.ps.y, part.ps.z, part.pdgID, part.status)
+ dbuf[idb] = (iev, part.momentum.x, part.momentum.y, part.momentum.z, part.PDG, part.simulatorStatus)
idb += 1
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status'])
@@ -79,7 +79,7 @@ def get_mcp_simple(path, evnums=None, branch='MCParticles'):
events.GetEntry(iev)
# extract full mc particle data
part = getattr(events, branch)[2]
- dbuf[idb] = (iev, part.ps.x, part.ps.y, part.ps.z, part.pdgID, part.status)
+ dbuf[idb] = (iev, part.momentum.x, part.momentum.y, part.momentum.z, part.PDG, part.simulatorStatus)
idb += 1
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status'])
@@ -104,10 +104,10 @@ def get_all_mcp(path, evnums=None, branch='MCParticles'):
events.GetEntry(iev)
# extract mc particle data
for ptl in getattr(events, branch):
- dbuf[idb] = (iev, ptl.ps.x, ptl.ps.y, ptl.ps.z, ptl.pdgID, ptl.status, ptl.g4Parent, ptl.ve.x, ptl.ve.y, ptl.ve.z)
+ dbuf[idb] = (iev, ptl.momentum.x, ptl.momentum.y, ptl.momentum.z, ptl.PDG, ptl.simulatorStatus, ptl.endpoint.x, ptl.endpoint.y, ptl.endpoint.z)
idb += 1
- return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status', 'g4Parent', 'vex', 'vey', 'vez'])
+ return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status', 'vex', 'vey', 'vez'])
# read hits data from root file
def get_hits_data(path, evnums=None, branch='RecoEcalBarreImaginglHits'):
--
GitLab