mwtkrayer
/
suspendtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mwtkrayer:5f56e95d3174bb74b54cb8507cd30c0d76cdd0c3
Branches Tags
mwtkrayer:master
..
compare: mwtkrayer:1b46b2d1881229d1864272dbd2c83c2eed59dbdc
Branches Tags
mwtkrayer:master

2 Commits
5f56e95d31 ... 1b46b2d188

Author SHA1 Message Date
Michael Krayer 1b46b2d188 Merge branch 'master' of git.mkray.de:mwtkrayer/suspendtools 2021-12-03 10:39:00 +01:00
Michael Krayer fe004f2b38 name of pp variable can be provided 2021-12-03 10:38:48 +01:00
1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
particle.py
View File

@ -333,9 +333,9 @@ class Trajectories:
return self._slice(slice_part=sl[0],slice_time=sl[1]) return self._slice(slice_part=sl[0],slice_time=sl[1])
@classmethod @classmethod
def from_mat(cls,file,unraveled=False,select_col=None): def from_mat(cls,file,unraveled=False,select_col=None,varpp='pp'):
from .helper import load_mat from .helper import load_mat
pp = load_mat(file,'pp',cast_integer=False) # int casting is expensive and useless on potentially large array pp = load_mat(file,varpp,cast_integer=False) # int casting is expensive and useless on potentially large array
col,time,ccinfo = load_mat(file,['colpy','time','ccinfo'],cast_integer=True) col,time,ccinfo = load_mat(file,['colpy','time','ccinfo'],cast_integer=True)
period = [None,None,None] period = [None,None,None]
if bool(ccinfo['xperiodic']): period[0]=ccinfo['b'] if bool(ccinfo['xperiodic']): period[0]=ccinfo['b']