diff --git a/t30_dna/runAnalysis.py b/t30_dna/runAnalysis.py index 766be54..733863d 100755 --- a/t30_dna/runAnalysis.py +++ b/t30_dna/runAnalysis.py @@ -69,7 +69,7 @@ def analyse(f1, f2, f3): m2 = find_min_energy(v2) m3 = find_min_energy(v3) - return m1 < .0025 and m2 >= .0025 and m3 < .0025 + return m1 < .0025 and m2 >= .0005 and m3 < .0025 if __name__ == '__main__': diff --git a/t31_vpgTLE-tt/runAnalysis.py b/t31_vpgTLE-tt/runAnalysis.py index 3f97466..d49a587 100755 --- a/t31_vpgTLE-tt/runAnalysis.py +++ b/t31_vpgTLE-tt/runAnalysis.py @@ -115,7 +115,8 @@ def compare_branch_mhd(f1, f2, tol): def analyse_one_folder(folder, previous_folder): # read first phsp tree1 = uproot.open(f'{folder}/detector_vpg_Carbon.root')['PhaseSpace'] - tree1 = tree1.arrays(library="numpy") + #tree1 = tree1.arrays(library="numpy") + tree1 = tree1.arrays(["AtomicNumber", "X", "Ekine", "Time", "IonTime"], library="np") n1 = len(tree1['X']) print(f'First (write) phsp {n1} {tree1.keys()}') diff --git a/t8_LETActor/mac/main.mac b/t8_LETActor/mac/main.mac index 04ec578..72a5fb5 100644 --- a/t8_LETActor/mac/main.mac +++ b/t8_LETActor/mac/main.mac @@ -31,7 +31,7 @@ # PHYSICS #===================================================== -/gate/physics/addPhysicsList FTFP_INCLXX_EMZ +/gate/physics/addPhysicsList QGSP_BIC_HP #FFTFP_INCLXX_EMZ #/control/execute mac/physicslist_HAD_std_6_2_2.mac /gate/physics/Gamma/SetCutInRegion world 100 m