diff --git a/t29_optical_digi/runAnalysis.py b/t29_optical_digi/runAnalysis.py index 2888979..6f4c8a3 100755 --- a/t29_optical_digi/runAnalysis.py +++ b/t29_optical_digi/runAnalysis.py @@ -196,13 +196,13 @@ def compare_with_previous_version(filename_new, filename_old): wd_globalPosZ=wasserstein_distance(globalPosZ_new,globalPosZ_old) wd_time=wasserstein_distance(time_new,time_old) - #print("wd_energy",wd_energy) - #print("wd_globalPosX",wd_globalPosX) - #print("wd_globalPosY",wd_globalPosY) - #print("wd_globalPosZ",wd_globalPosZ) - #print("wd_time",wd_time) + print("wd_energy",wd_energy) + print("wd_globalPosX",wd_globalPosX) + print("wd_globalPosY",wd_globalPosY) + print("wd_globalPosZ",wd_globalPosZ) + print("wd_time",wd_time) - if (wd_energy>4e-9): + if (wd_energy>4.5e-9): print(CRED+"Wasserstein distance test for energy failed"+CEND) exit() returnBool = False diff --git a/t31_vpgTLE-tt/runAnalysis.py b/t31_vpgTLE-tt/runAnalysis.py index d49a587..71d6d32 100755 --- a/t31_vpgTLE-tt/runAnalysis.py +++ b/t31_vpgTLE-tt/runAnalysis.py @@ -114,6 +114,7 @@ def compare_branch_mhd(f1, f2, tol): def analyse_one_folder(folder, previous_folder): # read first phsp + print(f'Look into {folder}') tree1 = uproot.open(f'{folder}/detector_vpg_Carbon.root')['PhaseSpace'] #tree1 = tree1.arrays(library="numpy") tree1 = tree1.arrays(["AtomicNumber", "X", "Ekine", "Time", "IonTime"], library="np") @@ -122,7 +123,8 @@ def analyse_one_folder(folder, previous_folder): # read second phsp tree2 = uproot.open(f'{previous_folder}/detector_vpg_Carbon.root')['PhaseSpace'] - tree2 = tree2.arrays(library="numpy") + #tree2 = tree2.arrays(library="numpy") + tree2 = tree2.arrays(["AtomicNumber", "X", "Ekine", "Time", "IonTime"], library="np") n2 = len(tree2['X']) print(f'Second (read) phsp {n2} {tree2.keys()}')