Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pycgtool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
James Graham
pycgtool
Commits
120b1034
Commit
120b1034
authored
8 years ago
by
James Graham
Browse files
Options
Downloads
Patches
Plain Diff
Handle trajectories that don't return box dims with MDTraj
parent
57932278
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pycgtool/framereader.py
+13
-3
13 additions, 3 deletions
pycgtool/framereader.py
with
13 additions
and
3 deletions
pycgtool/framereader.py
+
13
−
3
View file @
120b1034
...
@@ -39,9 +39,10 @@ def get_frame_reader(top, traj=None, frame_start=0, name=None):
...
@@ -39,9 +39,10 @@ def get_frame_reader(top, traj=None, frame_start=0, name=None):
for
name
,
reader
in
readers
.
items
():
# Return first reader that accepts given files
for
name
,
reader
in
readers
.
items
():
# Return first reader that accepts given files
try
:
try
:
return
reader
(
top
,
traj
,
frame_start
)
return
reader
(
top
,
traj
,
frame_start
)
except
(
UnsupportedFormatException
,
ImportError
):
except
(
UnsupportedFormatException
,
ImportError
)
as
e
:
print
(
e
)
continue
continue
raise
UnsupportedFormatException
(
"
None of the available readers support the trajector format provided
"
)
raise
UnsupportedFormatException
(
"
None of the available readers support the trajector format provided
, {0} {1}
"
.
format
(
top
,
traj
)
)
class
FrameReader
(
metaclass
=
abc
.
ABCMeta
):
class
FrameReader
(
metaclass
=
abc
.
ABCMeta
):
...
@@ -65,6 +66,8 @@ class FrameReader(metaclass=abc.ABCMeta):
...
@@ -65,6 +66,8 @@ class FrameReader(metaclass=abc.ABCMeta):
def
read_frame_number
(
self
,
number
,
frame
):
def
read_frame_number
(
self
,
number
,
frame
):
try
:
try
:
time
,
coords
,
box
=
self
.
_read_frame_number
(
number
)
time
,
coords
,
box
=
self
.
_read_frame_number
(
number
)
if
box
is
None
:
box
=
np
.
zeros
(
3
)
frame
.
time
=
time
frame
.
time
=
time
frame
.
box
=
box
frame
.
box
=
box
...
@@ -114,6 +117,10 @@ class FrameReaderSimpleTraj(FrameReader):
...
@@ -114,6 +117,10 @@ class FrameReaderSimpleTraj(FrameReader):
raise
FileNotFoundError
(
trajname
)
from
e
raise
FileNotFoundError
(
trajname
)
from
e
e
.
args
=
(
"
Error opening file
'
{0}
'"
.
format
(
trajname
),)
e
.
args
=
(
"
Error opening file
'
{0}
'"
.
format
(
trajname
),)
raise
raise
except
Exception
as
e
:
if
"
extension
"
in
repr
(
e
)
and
"
not supported
"
in
repr
(
e
):
raise
UnsupportedFormatException
from
e
raise
if
self
.
_traj
.
numatoms
!=
self
.
num_atoms
:
if
self
.
_traj
.
numatoms
!=
self
.
num_atoms
:
raise
UnsupportedFormatException
raise
UnsupportedFormatException
...
@@ -233,7 +240,10 @@ class FrameReaderMDTraj(FrameReader):
...
@@ -233,7 +240,10 @@ class FrameReaderMDTraj(FrameReader):
"""
"""
Read next frame from XTC using mdtraj library.
Read next frame from XTC using mdtraj library.
"""
"""
try
:
return
self
.
_traj
.
time
[
number
],
self
.
_traj
.
xyz
[
number
],
self
.
_traj
.
unitcell_lengths
[
number
]
return
self
.
_traj
.
time
[
number
],
self
.
_traj
.
xyz
[
number
],
self
.
_traj
.
unitcell_lengths
[
number
]
except
TypeError
:
return
self
.
_traj
.
time
[
number
],
self
.
_traj
.
xyz
[
number
],
None
class
FrameReaderMDAnalysis
(
FrameReader
):
class
FrameReaderMDAnalysis
(
FrameReader
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment