diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/plot | 2 | ||||
| -rwxr-xr-x | utils/plot-energy | 12 | ||||
| -rwxr-xr-x | utils/plot-fit-results | 2 |
3 files changed, 9 insertions, 7 deletions
@@ -90,7 +90,7 @@ if __name__ == '__main__': fits = pd.read_hdf(filename, "fits") # get rid of 2nd events like Michel electrons - ev = ev.sort_values(['run','gtid']).groupby(['evn'],as_index=False).first() + ev = ev.sort_values(['run','gtid']).groupby(['evn'],as_index=False).nth(0) # Now, we merge all three datasets together to produce a single # dataframe. To do so, we join the ev dataframe with the mcgn frame diff --git a/utils/plot-energy b/utils/plot-energy index 4a8521b..969cc4b 100755 --- a/utils/plot-energy +++ b/utils/plot-energy @@ -149,7 +149,9 @@ if __name__ == '__main__': fits['psi'] /= fits.merge(ev,on=['run','gtid'])['nhit'] fits['ke'] = fits['energy1'] - fits['id'] = fits['id1'] + fits['id2']*100 + fits['id3']*10000 + fits['id'] = fits['id1'] + fits.loc[fits['n'] == 2, 'id'] = fits['id1']*100 + fits['id2'] + fits.loc[fits['n'] == 3, 'id'] = fits['id1']*10000 + fits['id2']*100 + fits['id3'] fits['theta'] = fits['theta1'] # Make sure events are in order. We use run number and GTID here which @@ -347,10 +349,10 @@ if __name__ == '__main__': michel = michel[~nan_michel] # get the best fit - prompt = prompt.sort_values('fmin').groupby(['run','gtid']).first() - atm = atm.sort_values('fmin').groupby(['run','gtid']).first() - michel_best_fit = michel.sort_values('fmin').groupby(['run','gtid']).first() - muon_best_fit = muons.sort_values('fmin').groupby(['run','gtid']).first() + prompt = prompt.sort_values('fmin').groupby(['run','gtid']).nth(0) + atm = atm.sort_values('fmin').groupby(['run','gtid']).nth(0) + michel_best_fit = michel.sort_values('fmin').groupby(['run','gtid']).nth(0) + muon_best_fit = muons.sort_values('fmin').groupby(['run','gtid']).nth(0) muons = muons[muons.id == 22] # require r < 6 meters diff --git a/utils/plot-fit-results b/utils/plot-fit-results index 7115b81..cb90c8d 100755 --- a/utils/plot-fit-results +++ b/utils/plot-fit-results @@ -97,7 +97,7 @@ if __name__ == '__main__': mcgn = pd.concat([pd.read_hdf(filename, "mcgn").assign(filename=filename) for filename in args.filenames]) # get rid of 2nd events like Michel electrons - ev = ev.sort_values(['run','gtid']).groupby(['filename','evn'],as_index=False).first() + ev = ev.sort_values(['run','gtid']).groupby(['filename','evn'],as_index=False).nth(0) # Now, we merge all three datasets together to produce a single # dataframe. To do so, we join the ev dataframe with the mcgn frame |