Skip to content
Snippets Groups Projects
Commit 37f3ffc3 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

More python changes

parent 9cfe41ac
No related branches found
No related tags found
1 merge request!242EDM4hep: mcparticles -> MCParticles
......@@ -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)
......
......@@ -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)]
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment