diff options
| -rwxr-xr-x | utils/chi2 | 4 | ||||
| -rwxr-xr-x | utils/dc | 2 | ||||
| -rwxr-xr-x | utils/dc-closure-test | 2 | ||||
| -rwxr-xr-x | utils/plot-michels | 2 | ||||
| -rwxr-xr-x | utils/plot-muons | 2 | ||||
| -rw-r--r-- | utils/sddm/plot_energy.py | 5 |
6 files changed, 9 insertions, 8 deletions
@@ -434,8 +434,8 @@ if __name__ == '__main__': ev = correct_energy_bias(ev) - ev_mc = get_events(args.mc, merge_fits=True, nhit_thresh=args.nhit_thresh) - muon_mc = get_events(args.muon_mc, merge_fits=True, nhit_thresh=args.nhit_thresh) + ev_mc = get_events(args.mc, merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False) + muon_mc = get_events(args.muon_mc, merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False) weights = pd.concat([read_hdf(filename, "weights") for filename in args.weights],ignore_index=True) ev_mc = correct_energy_bias(ev_mc) @@ -310,7 +310,7 @@ if __name__ == '__main__': for _, row in ev[ev[bg]].iterrows(): data[bg][row.radius_cut][row.psi_cut][row.z_cut][row.udotr_cut] += 1 - ev_mc = get_events(args.mc, merge_fits=True) + ev_mc = get_events(args.mc, merge_fits=True, apply_nhit_trigger=False) ev_mc = ev_mc[ev_mc.prompt] ev_mc = ev_mc[ev_mc.nhit_cal > 100] diff --git a/utils/dc-closure-test b/utils/dc-closure-test index bf26662..3c53a1b 100755 --- a/utils/dc-closure-test +++ b/utils/dc-closure-test @@ -466,7 +466,7 @@ if __name__ == '__main__': ev = z_cut(ev) ev = udotr_cut(ev) - ev_mc = get_events(args.mc, merge_fits=True) + ev_mc = get_events(args.mc, merge_fits=True, apply_nhit_trigger=False) ev_mc = ev_mc[ev_mc.prompt] ev_mc = ev_mc[ev_mc.nhit_cal > 100] ev_mc = ev_mc[~np.isnan(ev_mc.fmin)] diff --git a/utils/plot-michels b/utils/plot-michels index 9637e13..ff88315 100755 --- a/utils/plot-michels +++ b/utils/plot-michels @@ -113,7 +113,7 @@ if __name__ == '__main__': evs.append(get_events(df.filename.values, merge_fits=True, nhit_thresh=args.nhit_thresh)) ev = pd.concat(evs) ev = correct_energy_bias(ev) - ev_mc = get_events(args.mc, merge_fits=True) + ev_mc = get_events(args.mc, merge_fits=True, apply_nhit_trigger=False) ev_mc = correct_energy_bias(ev_mc) # Drop events without fits diff --git a/utils/plot-muons b/utils/plot-muons index 27d3423..20ee7df 100755 --- a/utils/plot-muons +++ b/utils/plot-muons @@ -95,7 +95,7 @@ if __name__ == '__main__': evs.append(get_events(df.filename.values, merge_fits=True, nhit_thresh=args.nhit_thresh)) ev = pd.concat(evs) ev = correct_energy_bias(ev) - ev_mc = get_events(args.mc, merge_fits=True) + ev_mc = get_events(args.mc, merge_fits=True, apply_nhit_trigger=False) ev_mc = correct_energy_bias(ev_mc) # Drop events without fits diff --git a/utils/sddm/plot_energy.py b/utils/sddm/plot_energy.py index 0ba4076..d9edf11 100644 --- a/utils/sddm/plot_energy.py +++ b/utils/sddm/plot_energy.py @@ -441,7 +441,7 @@ def michel_spectrum(T): y *= 2*MUON_MASS return y -def get_events(filenames, merge_fits=False, nhit_thresh=None): +def get_events(filenames, merge_fits=False, nhit_thresh=None, apply_nhit_trigger=True): ev = pd.concat([read_hdf(filename, "ev").assign(filename=filename) for filename in filenames],ignore_index=True) fits = pd.concat([read_hdf(filename, "fits") for filename in filenames],ignore_index=True) rhdr = pd.concat([read_hdf(filename, "rhdr") for filename in filenames],ignore_index=True) @@ -593,7 +593,8 @@ def get_events(filenames, merge_fits=False, nhit_thresh=None): ev = ev[ev.nhit_cal >= 100] # Require at least 1 NHIT trigger to fire - ev = ev[(ev.trg_type & (TRIG_NHIT_100_LO | TRIG_NHIT_100_MED | TRIG_NHIT_100_HI | TRIG_NHIT_20 | TRIG_NHIT_20_LB)) != 0] + if apply_nhit_trigger: + ev = ev[(ev.trg_type & (TRIG_NHIT_100_LO | TRIG_NHIT_100_MED | TRIG_NHIT_100_HI | TRIG_NHIT_20 | TRIG_NHIT_20_LB)) != 0] # Require all 10 fits fits = fits.groupby(['run','gtid']).filter(lambda x: len(x) >= 10).reset_index() |