Commit 6e95c290 authored by Mohcine Chraibi's avatar Mohcine Chraibi

Merge branch 'v0.7' of cst.version.fz-juelich.de:jupedsim/jpscore into v0.7

Conflicts:
	Utest/rimea_tests/test_5/runtest_rimea_5.py
parents e88e6dc9 18d1d058
......@@ -35,6 +35,7 @@ def run_rimea_test5(inifile, trajfile):
if (ydiff != 0).any():
yfr = ptraj[ydiff != 0][1, 1] # second x element, not first
else:
yfr = np.inf
if np.isinf(yfr) and np.isinf(xfr): # ped did not move at all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment