From 7d75c1f8654fed31b5bb26ca7cedb5ae5826a9e0 Mon Sep 17 00:00:00 2001 From: Patrick de Perio Date: Mon, 27 Mar 2023 15:20:26 +0900 Subject: [PATCH 1/2] Modifications from Koun for SKG4 (and fiTQun) --- SK_preprocess/preprocess_skroot_wit.py | 53 +++++++++++++++++++------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/SK_preprocess/preprocess_skroot_wit.py b/SK_preprocess/preprocess_skroot_wit.py index 21a1e31..fc8195e 100644 --- a/SK_preprocess/preprocess_skroot_wit.py +++ b/SK_preprocess/preprocess_skroot_wit.py @@ -7,39 +7,66 @@ import uproot3 import numpy as np import h5py - -fsig = uproot3.open('/Users/Alejandro/Desktop/skdetsim.b8.detsim_rdir.r062361.r077336.prepreprocess.root') -fbg = uproot3.open('/Users/Alejandro/Documents/mcwit/data/redwit.074129.077889.lowfitwitE.root') -fout = h5py.File('SKROOT_B8_redwit_4MeV.h5','w') -findex = 'SKROOT_B8_redwit_4MeV_idxs.npz' +print(h5py.__version__) + +#fsig = uproot3.open('/Users/Alejandro/Desktop/skdetsim.b8.detsim_rdir.r062361.r077336.prepreprocess.root') +fsig = uproot3.open('./copy_branches/electron.root') +#fbg = uproot3.open('/Users/Alejandro/Documents/mcwit/data/redwit.074129.077889.lowfitwitE.root') +#fbg = uproot3.open('/disk1/disk02/lowe9/ayankele/redwit_lowe_cuts_spal_fixed_076919.root') +fbg = uproot3.open('./copy_branches/gamma.root') +#fout = h5py.File('SKROOT_B8_redwit_4MeV.h5','w') +fout = h5py.File('E30_electron_E30_gamma.h5','w') +#findex = 'SKROOT_B8_redwit_4MeV_idxs.npz' +findex = 'E30_electron_E30_gamma_idxs.npz' treesig=fsig['data'] -treebg=fbg['wit'] +#treebg=fbg['wit'] +treebg=fbg['data'] nhitsig = treesig.array("nhits") -nhitbg = treebg.array("nhit") +#nhitbg = treebg.array("nhit") +nhitbg = treebg.array("nhits") nsig=len(nhitsig) nbg=len(nhitbg) +print(nsig,nbg) +nevsk_sig = np.arange(0,nsig,1) +nevsk_bg = np.arange(0,nbg,1) +print(nevsk_sig) hits_index_sig = np.append(0,np.cumsum(nhitsig)[:-1]) hits_index_bg = np.append(0,np.cumsum(nhitbg)[:-1])+hits_index_sig[-1]+nhitsig[-1] fout.create_dataset("labels",data=np.append(np.ones(nsig,dtype="i4"),np.zeros(nbg,dtype="i4"))) fout.create_dataset("event_hits_index", data=np.append(hits_index_sig, hits_index_bg)) fout.create_dataset("nhit",data=np.append(nhitsig, nhitbg)) -fout.create_dataset("hit_pmt",data=np.append(np.bitwise_and(treesig.array("cables").flatten(),int(0xffff)),treebg.array("cable").flatten()),dtype='i4') -fout.create_dataset("hit_charge",data=np.append(treesig.array("Q").flatten(),treebg.array("q").flatten())) +#fout.create_dataset("hit_pmt",data=np.append(np.bitwise_and(treesig.array("cables").flatten(),int(0xffff)),treebg.array("cable").flatten()),dtype='i4') +fout.create_dataset("hit_pmt",data=np.append(np.bitwise_and(treesig.array("cables").flatten(),int(0xffff)),np.bitwise_and(treebg.array("cables").flatten(),int(0xffff)))) +#fout.create_dataset("hit_charge",data=np.append(treesig.array("Q").flatten(),treebg.array("q").flatten())) +fout.create_dataset("hit_charge",data=np.append(treesig.array("Q").flatten(),treebg.array("Q").flatten())) # Calculate relative hit times below instead of the absolute times within the triggering window. #fout.create_dataset("hit_time",data=np.append(treesig.array("T").flatten(),treebg.array("t").flatten())) +fout.create_dataset("bsenergy",data=np.append(treesig.array("bsenergy").flatten(),treebg.array("bsenergy").flatten())) #koun +fout.create_dataset("nring",data=np.append(treesig.array("nring").flatten(),treebg.array("nring").flatten())) #koun +fout.create_dataset("angle",data=np.append(treesig.array("angle").flatten(),treebg.array("angle").flatten())) #koun +fout.create_dataset("evis",data=np.append(treesig.array("evis").flatten(),treebg.array("evis").flatten())) #koun +fout.create_dataset("ip",data=np.append(treesig.array("ip").flatten(),treebg.array("ip").flatten())) #koun +#fout.create_dataset("event_ids",data=np.append(treesig.array("nevsk").flatten(),treebg.array("nevsk").flatten())) #koun +fout.create_dataset("event_ids",data=np.append(nevsk_sig, nevsk_bg)) #koun +#fout.create_dataset("root_files",data=np.append(treesig.array("nrunsk").flatten(),treebg.array("nrunsk").flatten())) #koun + times_sig = treesig.array("T").tolist() -times_bg = treebg.array("t").tolist() +#times_bg = treebg.array("t").tolist() +times_bg = treebg.array("T").tolist() for iEvt in range(nsig): - times_sig[iEvt] = np.array(times_sig[iEvt]) - (times_sig[iEvt][0] + times_sig[iEvt][-1])/2 + if len(times_sig[iEvt])!=0: +# print(iEvt, nsig) + times_sig[iEvt] = np.array(times_sig[iEvt]) - (times_sig[iEvt][0] + times_sig[iEvt][-1])/2 for iEvt in range(nbg): - times_bg[iEvt] = np.array(times_bg[iEvt]) - (times_bg[iEvt][0] + times_bg[iEvt][-1])/2 + if len(times_bg[iEvt])!=0: + times_bg[iEvt] = np.array(times_bg[iEvt]) - (times_bg[iEvt][0] + times_bg[iEvt][-1])/2 times_sig = np.array([t for evt in times_sig for t in evt]) times_bg = np.array([t for evt in times_bg for t in evt]) @@ -64,4 +91,4 @@ fsig.close() -fbg.close() \ No newline at end of file +fbg.close() From 291b1f875c999b9d6dc2d8429cb1bf7788f2a145 Mon Sep 17 00:00:00 2001 From: Patrick de Perio Date: Mon, 27 Mar 2023 15:25:35 +0900 Subject: [PATCH 2/2] Revert input changes for easier comparison (should implement command line inputs later) --- SK_preprocess/preprocess_skroot_wit.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/SK_preprocess/preprocess_skroot_wit.py b/SK_preprocess/preprocess_skroot_wit.py index fc8195e..48a8528 100644 --- a/SK_preprocess/preprocess_skroot_wit.py +++ b/SK_preprocess/preprocess_skroot_wit.py @@ -9,15 +9,10 @@ import h5py print(h5py.__version__) -#fsig = uproot3.open('/Users/Alejandro/Desktop/skdetsim.b8.detsim_rdir.r062361.r077336.prepreprocess.root') -fsig = uproot3.open('./copy_branches/electron.root') -#fbg = uproot3.open('/Users/Alejandro/Documents/mcwit/data/redwit.074129.077889.lowfitwitE.root') -#fbg = uproot3.open('/disk1/disk02/lowe9/ayankele/redwit_lowe_cuts_spal_fixed_076919.root') -fbg = uproot3.open('./copy_branches/gamma.root') -#fout = h5py.File('SKROOT_B8_redwit_4MeV.h5','w') -fout = h5py.File('E30_electron_E30_gamma.h5','w') -#findex = 'SKROOT_B8_redwit_4MeV_idxs.npz' -findex = 'E30_electron_E30_gamma_idxs.npz' +fsig = uproot3.open('/Users/Alejandro/Desktop/skdetsim.b8.detsim_rdir.r062361.r077336.prepreprocess.root') +fbg = uproot3.open('/Users/Alejandro/Documents/mcwit/data/redwit.074129.077889.lowfitwitE.root') +fout = h5py.File('SKROOT_B8_redwit_4MeV.h5','w') +findex = 'SKROOT_B8_redwit_4MeV_idxs.npz' treesig=fsig['data'] #treebg=fbg['wit'] @@ -29,11 +24,10 @@ nsig=len(nhitsig) nbg=len(nhitbg) -print(nsig,nbg) nevsk_sig = np.arange(0,nsig,1) nevsk_bg = np.arange(0,nbg,1) -print(nevsk_sig) + hits_index_sig = np.append(0,np.cumsum(nhitsig)[:-1]) hits_index_bg = np.append(0,np.cumsum(nhitbg)[:-1])+hits_index_sig[-1]+nhitsig[-1]