From 8c5f536522e504b5e315b88d49aedddc012d09ff Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 24 Aug 2021 19:30:59 +0000
Subject: [PATCH] Resolve "tracking/scripts/tracking_performance.py fails (but
gitlab doesn't catch it)"
---
benchmarks/tracking/run_tracking_benchmarks.py | 6 +++---
benchmarks/tracking/scripts/tracking_performance.py | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/benchmarks/tracking/run_tracking_benchmarks.py b/benchmarks/tracking/run_tracking_benchmarks.py
index b0576b1f..cc65ad63 100755
--- a/benchmarks/tracking/run_tracking_benchmarks.py
+++ b/benchmarks/tracking/run_tracking_benchmarks.py
@@ -67,7 +67,7 @@ if 'sim' in procs:
if args.seed > 0:
sim_cmd += ['--random.seed', args.seed]
return_code = subprocess.run(sim_cmd).returncode
- if return_code is not None and return_code < 0:
+ if return_code is not None and return_code != 0:
print("ERROR running simulation!")
exit(1)
subprocess.run(['rootls', '-t', sim_file])
@@ -84,7 +84,7 @@ if 'rec' in procs:
rec_cmd = ['xenv', '-x', juggler_xenv, 'gaudirun.py', os.path.join(sdir, 'options', option_script)]
return_code = subprocess.run(rec_cmd).returncode
- if return_code is not None and return_code < 0:
+ if return_code is not None and return_code != 0:
print('ERROR running juggler ({})!'.format(opt))
exit(1)
process = subprocess.run(['rootls', '-t', rec_file])
@@ -97,7 +97,7 @@ if 'ana' in procs:
'--tracking-collection', 'outputTrackParameters',
'-o', 'results', '-t', args.nametag]
return_code = subprocess.run(ana_cmd).returncode
- if return_code is not None and return_code < 0:
+ if return_code is not None and return_code != 0:
print('ERROR running analysis ({})!'.format(ana))
exit(1)
diff --git a/benchmarks/tracking/scripts/tracking_performance.py b/benchmarks/tracking/scripts/tracking_performance.py
index 3166f921..69e2affc 100644
--- a/benchmarks/tracking/scripts/tracking_performance.py
+++ b/benchmarks/tracking/scripts/tracking_performance.py
@@ -47,7 +47,6 @@ def flatten_collection(rdf, collection, cols=None):
dfp.loc[:, 'event'] = evns
return dfp
-
def thrown_particles_figure(rdf, save, mcbranch="mcparticles2"):
# define truth particle info
dft = flatten_collection(rdf, mcbranch, ['genStatus', 'pdgID', 'ps.x', 'ps.y', 'ps.z', 'mass'])
@@ -137,6 +136,8 @@ if __name__ == '__main__':
dfm = thrown_particles_figure(rdf_rec, save=os.path.join(args.outdir, '{}_thrown_particles.png'.format(args.nametag)), mcbranch=args.mc)
df = flatten_collection(rdf_rec, args.coll)
df.rename(columns={c: c.replace(args.coll + '.', '') for c in df.columns}, inplace=True)
+ df['theta'] = df['direction.theta']
+ df['phi'] = df['direction.phi']
fig, axs = plt.subplots(2, 2, figsize=(16, 12), dpi=120)
for ax in axs.flat:
--
GitLab