diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/chi2 | 4 | ||||
| -rwxr-xr-x | utils/dc | 2 | ||||
| -rwxr-xr-x | utils/dc-closure-test | 2 | ||||
| -rwxr-xr-x | utils/dm-search | 4 | ||||
| -rwxr-xr-x | utils/plot-michels | 2 | ||||
| -rw-r--r-- | utils/sddm/plot_energy.py | 10 |
6 files changed, 14 insertions, 10 deletions
@@ -438,9 +438,9 @@ if __name__ == '__main__': # and otherwise the GTIDs will clash ev_mcs = [] for filename in args.mc: - ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False)) + ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)) ev_mc = pd.concat(ev_mcs) - muon_mc = get_events(args.muon_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, mc=True) weights = pd.concat([read_hdf(filename, "weights") for filename in args.weights],ignore_index=True) ev_mc = correct_energy_bias(ev_mc) @@ -316,7 +316,7 @@ if __name__ == '__main__': # and otherwise the GTIDs will clash ev_mcs = [] for filename in args.mc: - ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False)) + ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)) ev_mc = pd.concat(ev_mcs) ev_mc = ev_mc[ev_mc.prompt] diff --git a/utils/dc-closure-test b/utils/dc-closure-test index 738e4f3..82ca005 100755 --- a/utils/dc-closure-test +++ b/utils/dc-closure-test @@ -472,7 +472,7 @@ if __name__ == '__main__': # and otherwise the GTIDs will clash ev_mcs = [] for filename in args.mc: - ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False)) + ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)) ev_mc = pd.concat(ev_mcs) ev_mc = ev_mc[ev_mc.prompt] diff --git a/utils/dm-search b/utils/dm-search index e24114c..c6d2d3a 100755 --- a/utils/dm-search +++ b/utils/dm-search @@ -481,9 +481,9 @@ if __name__ == '__main__': # and otherwise the GTIDs will clash ev_mcs = [] for filename in args.mc: - ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False)) + ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)) ev_mc = pd.concat(ev_mcs) - muon_mc = get_events(args.muon_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, mc=True) weights = pd.concat([read_hdf(filename, "weights") for filename in args.weights],ignore_index=True) ev_mc = correct_energy_bias(ev_mc) diff --git a/utils/plot-michels b/utils/plot-michels index b2727ca..dbd6fd5 100755 --- a/utils/plot-michels +++ b/utils/plot-michels @@ -120,7 +120,7 @@ if __name__ == '__main__': # and otherwise the GTIDs will clash ev_mcs = [] for filename in args.mc: - ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, apply_nhit_trigger=False)) + ev_mcs.append(get_events([filename], merge_fits=True, nhit_thresh=args.nhit_thresh, mc=True)) ev_mc = pd.concat(ev_mcs) ev_mc = correct_energy_bias(ev_mc) diff --git a/utils/sddm/plot_energy.py b/utils/sddm/plot_energy.py index bba0e75..be13d78 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, apply_nhit_trigger=True): +def get_events(filenames, merge_fits=False, nhit_thresh=None, mc=False): 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) @@ -576,7 +576,11 @@ def get_events(filenames, merge_fits=False, nhit_thresh=None, apply_nhit_trigger ev = ev.groupby('run',group_keys=False).apply(breakdown_follower_cut) # retrigger cut - ev = ev.groupby('run',group_keys=False).apply(retrigger_cut) + if not mc: + # We don't apply the retrigger cut to MC because it requires that the + # previous GTID be in the run, but quite a few of the MC events failed + # to simulate + ev = ev.groupby('run',group_keys=False).apply(retrigger_cut) # Label instrumentals ev['noise'] = ev.dc & (DC_JUNK | DC_CRATE_ISOTROPY | DC_QVNHIT | DC_ITC | DC_ESUM) != 0 @@ -604,7 +608,7 @@ def get_events(filenames, merge_fits=False, nhit_thresh=None, apply_nhit_trigger ev = ev[ev.nhit_cal >= 100] # Require at least 1 NHIT trigger to fire - if apply_nhit_trigger: + if not mc: 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 |