aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortlatorre <tlatorre@uchicago.edu>2021-01-04 14:57:54 -0600
committertlatorre <tlatorre@uchicago.edu>2021-01-04 14:57:54 -0600
commitd65a8ff3eaf705c97d9e2f92c54c7416c09b638f (patch)
tree4395a8584d4105b5b3553ee2d871dfbceddfd4c4
parent3d13f8f409d412c6d2aa3447b81e29a1a3d7b2a7 (diff)
downloadsddm-d65a8ff3eaf705c97d9e2f92c54c7416c09b638f.tar.gz
sddm-d65a8ff3eaf705c97d9e2f92c54c7416c09b638f.tar.bz2
sddm-d65a8ff3eaf705c97d9e2f92c54c7416c09b638f.zip
update plot-dc
-rwxr-xr-xutils/plot-dc29
-rw-r--r--utils/sddm/plot_energy.py2
2 files changed, 16 insertions, 15 deletions
diff --git a/utils/plot-dc b/utils/plot-dc
index 89de2a9..acd7e7b 100755
--- a/utils/plot-dc
+++ b/utils/plot-dc
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (c) 2019, Anthony Latorre <tlatorre at uchicago>
#
# This program is free software: you can redistribute it and/or modify it
@@ -123,23 +123,24 @@ if __name__ == '__main__':
for run, df in rhdr.groupby('run'):
evs.append(get_events(df.filename.values, merge_fits=True))
if len(mc_filenames):
- evs.append(get_events(mc_filenames, merge_fits=True))
- ev = pd.concat(evs)
+ for filename in mc_filenames:
+ evs.append(get_events([filename], merge_fits=True, mc=True))
+ ev = pd.concat([ev for ev in evs if len(ev) > 0])
ev = ev[ev.prompt & ~np.isnan(ev.fmin)]
ev = ev[ev.ke > 20]
- with pd.option_context('display.max_rows', None, 'display.max_columns', None):
- print("Noise events")
- print(ev[ev.noise][['psi','x','y','z','id1','id2']])
- print("Muons")
- print(ev[ev.muon][['psi','r','id1','id2','id3','energy1','energy2','energy3']])
- print("Neck")
- print(ev[ev.neck & ev.psi < 6][['psi','r','id1','cos_theta']])
- print("Flashers")
- print(ev[ev.flasher & ev.udotr > 0])
- print("Signal")
- print(ev[ev.signal])
+ #with pd.option_context('display.max_rows', None, 'display.max_columns', None):
+ # print("Noise events")
+ # print(ev[ev.noise][['psi','x','y','z','id1','id2']])
+ # print("Muons")
+ # print(ev[ev.muon][['psi','r','id1','id2','id3','energy1','energy2','energy3']])
+ # print("Neck")
+ # print(ev[ev.neck & ev.psi < 6][['psi','r','id1','cos_theta']])
+ # print("Flashers")
+ # print(ev[ev.flasher & ev.udotr > 0])
+ # print("Signal")
+ # print(ev[ev.signal])
# save as PDF b/c EPS doesn't support alpha values
if args.save:
diff --git a/utils/sddm/plot_energy.py b/utils/sddm/plot_energy.py
index 651064b..1a2b20e 100644
--- a/utils/sddm/plot_energy.py
+++ b/utils/sddm/plot_energy.py
@@ -308,7 +308,7 @@ def plot_corner_plot(ev, title, save=None):
variables = ['r_psup','psi','z','udotr']
labels = [r'$(r/r_\mathrm{PSUP})^3$',r'$\psi$','z',r'$\vec{u}\cdot\vec{r}$']
limits = [(0,1),(0,10),(-840,840),(-1,1)]
- cuts = [0.9,6,0,-0.5]
+ cuts = [(AV_RADIUS/PSUP_RADIUS)**3,6,0,-0.5]
ev = ev.dropna(subset=variables)