Skip to content
This repository was archived by the owner on Jan 26, 2022. It is now read-only.

Reworked CalculateProjectSASA.py #338

Open
wants to merge 1,252 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1252 commits
Select commit Hold shift + click to select a range
8312536
updated assign hierarchical test. I changed WardAssignments.h5 refere…
schwancr Nov 19, 2013
0c42bcc
changed AssignHierarchical.py to actually do what we want. This requi…
schwancr Nov 19, 2013
f89f208
Merge pull request #256 from schwancr/assign_hier
schwancr Nov 20, 2013
e227f7a
got project tests working on my mac
schwancr Nov 21, 2013
8d33c9f
Added bugfix for a project builder issue when pdb filename does not e…
schwancr May 29, 2013
7e9af3f
first attempts at getting the project builder to update the file. Thi…
schwancr Jun 3, 2013
13216ba
small fix in ProjectBuilder docstring
schwancr Jun 3, 2013
a941c76
added logger prints as well as added the error checking that was orig…
schwancr Jun 4, 2013
d596323
bugfix in builder
schwancr Jun 4, 2013
1ed6934
bugfix in updating project that was giving new trajectories the wrong…
schwancr Jun 4, 2013
b37854a
fixed typo in comment
schwancr Jun 10, 2013
78fdcd5
first attempts at getting the project builder to update the file. Thi…
schwancr Jun 3, 2013
49d2a82
small fix in ProjectBuilder docstring
schwancr Jun 3, 2013
81536da
added logger prints as well as added the error checking that was orig…
schwancr Jun 4, 2013
a7eb3c6
bugfix in builder
schwancr Jun 4, 2013
21b7b27
bugfix in updating project that was giving new trajectories the wrong…
schwancr Jun 4, 2013
205b6ea
fixed typo in comment
schwancr Jun 10, 2013
da1ace1
cleaned up a little bit.
schwancr Nov 7, 2013
c965574
bugfixes and got things to work.
schwancr Nov 7, 2013
2b4ccad
removed import IPython from builder.py
schwancr Nov 7, 2013
31c7b7e
If all XTCs are corrupt then their is a bad error raised due to tryin…
schwancr Nov 7, 2013
c22e291
changed PDBFilename to Conf in _load_traj, which means we don't have …
schwancr Nov 7, 2013
ffc74f4
bugfix, I think it's all working now, finally.
schwancr Nov 7, 2013
d574539
added a comment describing what the list comprehension thing is doing
schwancr Nov 7, 2013
cd35df4
small fixes
schwancr Nov 16, 2013
37b1be9
started messing with Trajectory.py in hopes of fixing it so that we c…
schwancr Nov 17, 2013
8b214f8
added fixes to Trajectory.py as well as project/builder to fix issues…
schwancr Nov 17, 2013
ee4ee9c
got Trajectory.load_from_xtc working
schwancr Nov 17, 2013
2bea664
got project tests working on my mac
schwancr Nov 21, 2013
2145f00
Merge branch 'proj_builder' of github.com:schwancr/msmbuilder into pr…
schwancr Nov 22, 2013
1bc4bf6
pep8 fix in ConvertDataToHDF.py
schwancr Nov 22, 2013
7797470
added os.chdir(self.td) in the setUp method of WTempDir in test_wrapp…
schwancr Nov 22, 2013
ca6b229
change in test_project to copy project info before loading in test_Fa…
schwancr Nov 22, 2013
c18dc04
typo
schwancr Nov 22, 2013
1c11bcf
another typo ...
schwancr Nov 22, 2013
5587e9c
removed old fahprojectbuilder test
schwancr Nov 22, 2013
1f9a324
Merge pull request #202 from schwancr/proj_builder
rmcgibbo Nov 22, 2013
17a4fed
Merge branch 'master' of github.com:SimTk/msmbuilder
mpharrigan Nov 22, 2013
dcd3263
transferred project.utils to use mdtraj
schwancr Nov 22, 2013
c17d0e2
mdtraj changes to project.builder
schwancr Nov 22, 2013
ff8aae3
started project.py
schwancr Nov 22, 2013
3f061f3
Updated metrics to use mdtraj.Trajectory
mpharrigan Nov 23, 2013
9ef9e9b
Removed angle.py
mpharrigan Nov 23, 2013
9750bee
finished project.py I'm just using hacky calls to pytables when that …
schwancr Nov 23, 2013
2c6a06c
finished adding mdtraj to validators
schwancr Nov 23, 2013
867e26a
Removed lots of geometry code that is now redundant with mdtraj
mpharrigan Nov 23, 2013
fff72a4
Also delete dihedral
mpharrigan Nov 23, 2013
dcea26e
added mdtraj to .travis.yml
schwancr Nov 23, 2013
8a8fc04
added simtk.unit to .travis.yml from rmcgibbo's repo
schwancr Nov 23, 2013
6c83d87
Merge branch 'msmb2.8' of github.com:schwancr/msmbuilder into msmb2.8
mpharrigan Dec 2, 2013
97aafbb
Get rid of these
mpharrigan Dec 3, 2013
aadec8a
Started to do lprmsd changes but haven't finished
mpharrigan Dec 3, 2013
c302eeb
Updated clustering for mdtraj
mpharrigan Dec 3, 2013
9375f64
Getting ready to implement getchunkedtraj
mpharrigan Dec 11, 2013
ce0516e
read_chunks implemented for Cluster.py
mpharrigan Dec 11, 2013
a9d3aea
Fix project so that it can save generators
mpharrigan Dec 11, 2013
e4c311f
fixed Trajectory.py
Dec 28, 2013
41140c9
fixed Trajectory.py redundant check
Dec 28, 2013
7df25c8
Merge pull request #270 from SimTk/trajectory-fix
rmcgibbo Dec 28, 2013
bf5fd4a
Merge pull request #269 from mlawrenz/master
rmcgibbo Dec 28, 2013
9717cf3
Remove CopernicusProject.py, since it's been depricated since 2.6 and…
rmcgibbo Jan 1, 2014
d836ae2
the SASA code is in mdtraj, and already has its tests there
rmcgibbo Jan 1, 2014
51ce13f
contact is in mdtraj
rmcgibbo Jan 1, 2014
8b49f9a
Remove io, since it's in mdtraj, fix testing, and fix cfep / test_cfep
rmcgibbo Jan 1, 2014
44815b8
Remove test_dihedral, which is in mdtraj
rmcgibbo Jan 1, 2014
5056ead
remove test_io, which is in mdtraj
rmcgibbo Jan 1, 2014
79ba5ec
Remove dcd and xtc, some small other fixes
rmcgibbo Jan 1, 2014
0ffe5e5
Rg calculation already has mdtraj tests
rmcgibbo Jan 1, 2014
fead5cf
fix new location of io
rmcgibbo Jan 1, 2014
a64e190
More assorted changes
rmcgibbo Jan 1, 2014
0690f88
more changes
rmcgibbo Jan 4, 2014
3ec09fa
Couple of bugfixes
rmcgibbo Jan 4, 2014
cdb3b1d
Tests now run without erroring out
rmcgibbo Jan 4, 2014
7e24d43
Minor
rmcgibbo Jan 4, 2014
f3ed21a
ifdef guard openmp
rmcgibbo Jan 4, 2014
c0b4ad9
remove x bit
rmcgibbo Jan 4, 2014
c4f2c85
omp
rmcgibbo Jan 4, 2014
87e9d64
lots of fixes from kyle and just finding more import bugs and stuff i…
rmcgibbo Jan 5, 2014
8bec4ff
Mind as well make this work for lh5 too
rmcgibbo Jan 5, 2014
ba3ab83
bump version to 2.8
rmcgibbo Jan 5, 2014
a49f444
execfile wierdness
rmcgibbo Jan 5, 2014
f0665ac
remove the script that I removed from test_wrappers
rmcgibbo Jan 5, 2014
c62bad8
Work on sphinx
rmcgibbo Jan 6, 2014
c057821
Moved lots of latex documents into sphinx
rmcgibbo Jan 7, 2014
e982bf2
theme
rmcgibbo Jan 7, 2014
4f33b14
add requirement
rmcgibbo Jan 7, 2014
fdd67ab
rtd
rmcgibbo Jan 7, 2014
be97679
This import seems necessary to get autodoc to work
rmcgibbo Jan 7, 2014
feedaf2
requirements
rmcgibbo Jan 7, 2014
5d5d54d
autosummary oesn't seem to work on rtfd
rmcgibbo Jan 7, 2014
21258c5
Bugfix
mpharrigan Jan 9, 2014
0cc3009
Merge pull request #2 from mpharrigan/msmb2.8rm
rmcgibbo Jan 9, 2014
7f85b51
Merge pull request #271 from rmcgibbo/mpharrigan-msmb2.8
rmcgibbo Jan 10, 2014
9b3f14b
Stride bugfix
mpharrigan Jan 10, 2014
6d61076
Typo
mpharrigan Jan 10, 2014
cf0fd6b
Merge pull request #273 from mpharrigan/msmb2.8
rmcgibbo Jan 10, 2014
4a64ae2
Fix #252 on msmb2.8
rmcgibbo Jan 14, 2014
68a21cc
Fix #252 on msmb2.8
rmcgibbo Jan 14, 2014
074d923
Fix
rmcgibbo Jan 14, 2014
60947e9
Merge pull request #276 from rmcgibbo/trim
rmcgibbo Jan 14, 2014
85f27dd
resolve the fix
rmcgibbo Jan 14, 2014
69f177b
test import fastcluster before hierarhical script test.
kyleabeauchamp Jan 20, 2014
0e13f47
Merge pull request #279 from SimTk/28fixes
rmcgibbo Jan 20, 2014
b6e13cf
reduced precision in wrapper test
kyleabeauchamp Jan 20, 2014
5f498a2
Merge pull request #281 from SimTk/fix_assign_script_test_failure
rmcgibbo Jan 20, 2014
28ee1a8
Fixed docs to ask for csr matrices.
kyleabeauchamp Jan 21, 2014
9c84456
Merge pull request #283 from SimTk/csrfix
rmcgibbo Jan 21, 2014
910cdfb
Added points on cube test.
kyleabeauchamp Jan 21, 2014
62c55d6
Merge pull request #284 from SimTk/testsystems
rmcgibbo Jan 21, 2014
f64bb5b
Added final carbon to AtomIndices.dat in reference.
kyleabeauchamp Jan 21, 2014
4f4dee5
Fix to calculateImpliedTimes.py
kyleabeauchamp Jan 21, 2014
1607d8f
Merge pull request #285 from SimTk/moar
rmcgibbo Jan 21, 2014
92c1b0e
Had to old atom indices file to match saved reference generators.
kyleabeauchamp Jan 21, 2014
b20c36d
Merge pull request #286 from SimTk/again
rmcgibbo Jan 21, 2014
af68f7c
Fix for save_structures issue.
kyleabeauchamp Jan 21, 2014
0d4eec6
Hackaround the script ConvertData test failure.
kyleabeauchamp Jan 21, 2014
bcb9035
Removed extra comment.
kyleabeauchamp Jan 21, 2014
56728b2
Reverted some changes to test_wrappers.
kyleabeauchamp Jan 21, 2014
34192d9
Reverted some changes to test_wrappers.
kyleabeauchamp Jan 21, 2014
ddb849b
Updated projectinfo to use .h5 files instead."
kyleabeauchamp Jan 21, 2014
db9f4db
Deleted reference lh5 files.
kyleabeauchamp Jan 21, 2014
29e3e04
Fix for #287
kyleabeauchamp Jan 21, 2014
ba94d7f
Fix in FAH project builder to handle possible XTC exceptions from MDTraj
kyleabeauchamp Jan 21, 2014
b4a26b2
Merge pull request #288 from SimTk/sherman
rmcgibbo Jan 21, 2014
87ba1a0
Added analytical test for FAHProject.
kyleabeauchamp Jan 22, 2014
914a0ea
Added docstrings for reference data.
kyleabeauchamp Jan 22, 2014
7efff8e
No longer need import skipif
kyleabeauchamp Jan 22, 2014
cba0d17
minor cleanup of reference data
kyleabeauchamp Jan 22, 2014
88e9d90
Added ref data
kyleabeauchamp Jan 22, 2014
60f51a9
Merge pull request #291 from SimTk/fahproject
rmcgibbo Jan 22, 2014
609af24
Added implementation for #293
kyleabeauchamp Jan 23, 2014
ace63d3
Revised zero indexed in docstring.
kyleabeauchamp Jan 23, 2014
be0dc53
Oops had hardcoded native.pdb
kyleabeauchamp Jan 23, 2014
1c60b3a
More docs, added atom_indices to ConvertDataToHDF
kyleabeauchamp Jan 23, 2014
11b736a
Forgot numpy import in ConvertData
kyleabeauchamp Jan 23, 2014
fa3d801
Minor update to comment
kyleabeauchamp Jan 23, 2014
ec99e2e
Started working on scipy.sparse.csgraph port.
kyleabeauchamp Jan 23, 2014
d609742
fix for issue #295.
schwancr Jan 23, 2014
819e4c7
Added iext flag for ConvertData
kyleabeauchamp Jan 24, 2014
fbe384f
Fixed RebuildProject to use len(mdtraj.open())
kyleabeauchamp Jan 25, 2014
0b8e111
Raise IOError if Rebuild cannot find the conformation file.
kyleabeauchamp Jan 25, 2014
2d8f1ac
Merge pull request #299 from SimTk/rebuildproject
kyleabeauchamp Jan 25, 2014
7a15c98
Merge pull request #298 from SimTk/iext
kyleabeauchamp Jan 25, 2014
ea587a8
Merge pull request #294 from SimTk/atomindices
kyleabeauchamp Jan 25, 2014
373accd
Minor update.
kyleabeauchamp Jan 28, 2014
d54b5ff
Added fix for #300 and simple test.
kyleabeauchamp Jan 28, 2014
1421767
Slightly more powerful test of trim_states
kyleabeauchamp Jan 28, 2014
062b643
Started working on scipy.sparse.csgraph port.
kyleabeauchamp Jan 23, 2014
3692af6
Minor update.
kyleabeauchamp Jan 28, 2014
19e7d24
Fixed issues in using csgraph.connected components.
kyleabeauchamp Jan 28, 2014
630b9ce
Fixed issues in using csgraph.connected components.
kyleabeauchamp Jan 28, 2014
3ce8f2d
Fixed nonsense due to my ignorance of git rebase etc
kyleabeauchamp Jan 28, 2014
519693f
Removed tmp file.
kyleabeauchamp Jan 28, 2014
f26b913
Added scipy 0.11 check in setup.py
kyleabeauchamp Jan 28, 2014
c765566
trying scipy.version.version
kyleabeauchamp Jan 28, 2014
4117ffe
hasattr check in scipy version
kyleabeauchamp Jan 28, 2014
a9ff44c
Merge pull request #301 from SimTk/msmlibfix
rmcgibbo Jan 28, 2014
118dbf3
Merge pull request #303 from SimTk/csgraph
rmcgibbo Jan 28, 2014
d5b0a90
Sparse eigen import changes
kyleabeauchamp Jan 29, 2014
9cef607
Removed aliases for eigenvalue calculations.
kyleabeauchamp Jan 29, 2014
1617810
Merge pull request #306 from SimTk/sparseeigen
rmcgibbo Jan 29, 2014
f6e6f16
Use wheel for newer scipy, pandas, statsmodels
rmcgibbo Jan 30, 2014
152fe59
typo in file
rmcgibbo Jan 30, 2014
3f26321
add some asserts to hybrid kmedoids
rmcgibbo Jan 30, 2014
c4604fe
attempt with travis
rmcgibbo Jan 30, 2014
8ae7370
try using conda in travis.yml
rmcgibbo Jan 30, 2014
8b1113b
Update .travis.yml
rmcgibbo Jan 30, 2014
089bdca
Update .travis.yml
rmcgibbo Jan 30, 2014
7487afd
Update .travis.yml
rmcgibbo Jan 30, 2014
0522855
Update .travis.yml
rmcgibbo Jan 30, 2014
f7c40d1
Update .travis.yml
rmcgibbo Jan 30, 2014
566d0f4
Update .travis.yml
rmcgibbo Jan 30, 2014
8480740
Update .travis.yml
rmcgibbo Jan 30, 2014
9b5ad14
Update .travis.yml
rmcgibbo Jan 30, 2014
179b5e3
Update .travis.yml
rmcgibbo Jan 30, 2014
b8f21c2
Update .travis.yml
rmcgibbo Jan 30, 2014
59f00c3
Update .travis.yml
rmcgibbo Jan 30, 2014
00f8d10
Merge pull request #312 from rmcgibbo/travis-scipy11
rmcgibbo Jan 30, 2014
14771a6
Merge branch 'msmb2.8' of github.com:rmcgibbo/msmbuilder into msmb2.8
rmcgibbo Jan 30, 2014
6691dac
merge in new travis from master
rmcgibbo Jan 30, 2014
a3e96c4
add unit package to .travis.yml
rmcgibbo Jan 30, 2014
5aec174
quiet
rmcgibbo Jan 30, 2014
9c20740
remove skips on travis
rmcgibbo Jan 30, 2014
7498f36
Comment out assign test, just for fun
rmcgibbo Jan 30, 2014
16d0e17
more principled way to skip
rmcgibbo Jan 30, 2014
fc95512
Merge pull request #313 from rmcgibbo/harden-kmedoids
rmcgibbo Jan 30, 2014
bc3ad8d
fix assign hierarhical and test
rmcgibbo Jan 30, 2014
ca17493
Merge branch 'msmb2.8' of github.com:SimTk/msmbuilder into msmb2.8
rmcgibbo Jan 30, 2014
ac32a1b
Fixed bug in clustering and added test.
kyleabeauchamp Jan 30, 2014
8758fbc
Merge pull request #314 from SimTk/sorted
rmcgibbo Jan 30, 2014
5e078be
bugfix in contact.py The ContinuousContact metric was asking for resi…
schwancr Jan 31, 2014
ae511f5
change project builder to use discard_overlapping_frames=True by default
schwancr Jan 31, 2014
6872baa
Merge branch 'msmb2.8' of github.com:SimTk/msmbuilder into msmb2.8
schwancr Jan 31, 2014
6eacaa5
merge commit
rmcgibbo Feb 3, 2014
553e6da
Merge pull request #292 from SimTk/msmb2.8
rmcgibbo Feb 3, 2014
9237013
Reversible eigensolvers
rmcgibbo Feb 4, 2014
db60d4d
Merge pull request #322 from rmcgibbo/reversible-eigenvector2
rmcgibbo Feb 4, 2014
f47347a
travis
rmcgibbo Feb 4, 2014
eb919ed
Merge branch 'master' of github.com:rmcgibbo/msmbuilder into travis
rmcgibbo Feb 4, 2014
fb69fae
Push to s3
rmcgibbo Feb 4, 2014
f23f5c2
+x on ci
rmcgibbo Feb 4, 2014
37b96f3
python version
rmcgibbo Feb 4, 2014
0b1d2a2
Merge pull request #323 from SimTk/travis
rmcgibbo Feb 4, 2014
ae3a6d7
debug push to s3
rmcgibbo Feb 4, 2014
97c08d2
turn off nosetests while debugging
rmcgibbo Feb 4, 2014
fdc2f2b
one more thing
rmcgibbo Feb 4, 2014
b879b79
need to say yes
rmcgibbo Feb 4, 2014
d326c2b
correct sphinx not being found in path I think
rmcgibbo Feb 4, 2014
3a1ccb1
typo
rmcgibbo Feb 4, 2014
79f866f
attempt
rmcgibbo Feb 4, 2014
f964be0
searching for sphinx
rmcgibbo Feb 4, 2014
3619b7c
sphinx with pip
rmcgibbo Feb 4, 2014
fdde10f
push only html directory?
rmcgibbo Feb 4, 2014
fa63991
theme
rmcgibbo Feb 4, 2014
4ef271b
renable the actual tests
rmcgibbo Feb 4, 2014
a1a6b29
Add picture to index page, link to downloads
rmcgibbo Feb 5, 2014
d234d7d
Minor cleanup
rmcgibbo Feb 5, 2014
12e1f51
-q
rmcgibbo Feb 5, 2014
eb296dc
Change bucket name for S3 docs in preparation for new domain name
rmcgibbo Feb 5, 2014
e40e73b
Merge pull request #327 from rmcgibbo/cleanup
rmcgibbo Feb 5, 2014
bf4d426
Check for mle and not ergodic trimming
mpharrigan Feb 5, 2014
8b668b4
Merge pull request #329 from mpharrigan/fix
rmcgibbo Feb 5, 2014
5abeec4
Minor fix
rmcgibbo Feb 6, 2014
de778dc
Merge pull request #331 from SimTk/check-empty
rmcgibbo Feb 6, 2014
1074a31
Cleaned up __init__.py
kyleabeauchamp Feb 6, 2014
d6c3665
Merge pull request #333 from SimTk/clustering_namespace
rmcgibbo Feb 6, 2014
5c673f7
reworked (copied) sphinx-rtd-theme to include our new logo instead of…
schwancr Feb 7, 2014
7966212
Merge pull request #336 from SimTk/logo
rmcgibbo Feb 7, 2014
643a759
needed to get the logo working
rmcgibbo Feb 7, 2014
a800b7b
small docs edits
rmcgibbo Feb 7, 2014
51da979
Updated init for msmb namespace
kyleabeauchamp Feb 7, 2014
b7c997e
Merge pull request #337 from SimTk/init
kyleabeauchamp Feb 7, 2014
a8d2398
reworked CalculateProjectSASA.py to be a bit clearer. Basically it do…
schwancr Feb 7, 2014
bf6787a
moved parser declaration outside the boilerplate
schwancr Feb 7, 2014
0b8f13b
remove chunk_ind
schwancr Feb 7, 2014
0964b29
bugfix in CalculateProjectDistance.py that wasn't using mdtraj
schwancr Feb 7, 2014
a8bd978
Merge pull request #339 from schwancr/project_distance
rmcgibbo Feb 7, 2014
565b1e0
add more description to ergodic trim
mpharrigan Feb 8, 2014
a1fc28b
It's actually a lil matrix
mpharrigan Feb 8, 2014
0b41857
Merge pull request #342 from mpharrigan/doc
rmcgibbo Feb 8, 2014
ec0d36e
Data types
mpharrigan Feb 8, 2014
677521d
Being explicit and correct about datatypes
mpharrigan Feb 8, 2014
820c846
Merge pull request #344 from mpharrigan/doc
rmcgibbo Feb 8, 2014
014e7d0
Simplify setup.py
rmcgibbo Feb 8, 2014
b827cd3
Merge pull request #345 from SimTk/setup
rmcgibbo Feb 8, 2014
cc1d30a
Merge branch 'master' of github.com:SimTk/msmbuilder into sasa
schwancr Feb 11, 2014
d4e0c4d
Merge remote-tracking branch 'parent/master'
schwancr Mar 29, 2014
5b4416c
the merge didn't delete the src directory. This means I guess that th…
schwancr Mar 29, 2014
5cccb38
Merge branch 'master' into sasa
schwancr Mar 29, 2014
d41f69c
just brought in the new version of CalculateProjectSASA.py and then m…
schwancr Mar 29, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Tutorial/DCD/RUN00/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN01/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN02/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN03/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN04/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN05/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN06/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN07/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN08/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN09/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN10/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN11/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN12/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN13/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN14/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN15/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN16/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN17/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN18/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN19/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN20/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN21/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN22/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN23/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN24/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN25/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN26/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN27/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN28/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN29/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN30/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN31/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN32/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN33/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN34/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN35/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN36/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN37/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN38/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN39/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN40/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN41/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN42/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN43/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN44/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN45/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN46/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN47/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN48/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN49/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN50/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN51/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN52/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN53/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN54/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN55/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN56/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN57/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN58/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN59/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN60/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN61/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN62/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN63/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN64/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN65/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN66/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN67/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN68/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN69/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN70/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN71/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN72/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN73/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN74/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN75/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN76/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN77/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN78/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN79/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN80/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN81/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN82/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN83/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN84/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN85/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN86/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN87/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN88/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN89/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN90/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN91/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN92/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN93/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN94/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN95/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN96/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN97/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN98/frame0.dcd
Binary file not shown.
Binary file added Tutorial/DCD/RUN99/frame0.dcd
Binary file not shown.
Binary file added Tutorial/Dihedrals.h5
Binary file not shown.
3 changes: 3 additions & 0 deletions Tutorial/F_test.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
0
1
2
175 changes: 175 additions & 0 deletions Tutorial/GetDihedrals.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@

def GetAtomIndicesAndPosition(C1):
a=C1["AtomNames"]
aC=np.where(a=="C")[0]
aN=np.where(a=="N")[0]
aCA=np.where(a=="CA")[0]
X=C1["XYZ"]
NumResi=C1.GetNumberOfResidues()
return(NumResi,a,aC,aN,aCA,X)


def GetAllPsi(C1,NumResi=None,a=None,aC=None,aN=None,aCA=None,X=None):
if a==None:
NumResi,a,aC,aN,aCA,X=GetAtomIndicesAndPosition(C1)
Data=[]
for i in xrange(NumResi-1):
print(i)
x0=X[aN[i]]
x1=X[aCA[i+1]]
x2=X[aC[i+1]]
x3=X[aN[i+1]]
Psi=Torsion(x0,x1,x2,x3)
Data.append(Psi)
return(np.array(Data))


def GetAllPhi(C1,NumResi=None,a=None,aC=None,aN=None,aCA=None,X=None):
if a==None:
NumResi,a,aC,aN,aCA,X=GetAtomIndicesAndPosition(C1)
Data=[]
for i in xrange(NumResi-1):
print(i)
x0=X[aC[i]]
x1=X[aN[i+1]]
x2=X[aCA[i+1]]
x3=X[aC[i+1]]
Phi=Torsion(x0,x1,x2,x3)
Data.append(Phi)
return(np.array(Data))

def GetAllPsiDipeptide(C1,NumResi=None,a=None,aC=None,aN=None,aCA=None,X=None):
if a==None:
NumResi,a,aC,aN,aCA,X=GetPsiAtomIndicesAndPosition(C1)

a0=aN[0]
a1=aCA[0]#Corrected because resi 0 has no CA
a2=aC[1]
a3=aN[1]
x0=X[a0]
x1=X[a1]
x2=X[a2]
x3=X[a3]
Psi=Torsion(x0,x1,x2,x3)
return(np.array([Psi]))

def GetAllPhiDipeptide(C1,NumResi=None,a=None,aC=None,aN=None,aCA=None,X=None):
if a==None:
NumResi,a,aC,aN,aCA,X=GetPhiAtomIndicesAndPosition(C1)
a0=aC[0]
a1=aN[0]
a2=aCA[0]#Corrected because resi 0 has no CA
a3=aC[1]
x0=X[a0]
x1=X[a1]
x2=X[a2]
x3=X[a3]
Phi=Torsion(x0,x1,x2,x3)
return(np.array([Phi]))

def Torsion(x0,x1,x2,x3,Degrees=True):
"""Calculate the signed dihedral angle between 4 positions."""
#Calculate Bond Vectors b1, b2, b3
b1=x1-x0
b2=x2-x1
b3=x3-x2

#Calculate Normal Vectors c1,c2. This numbering scheme is idiotic, so care.
c1=np.cross(b2,b3)
c2=np.cross(b1,b2)

Arg1=np.dot(b1,c1)
Arg1*=np.linalg.norm(b2)

Arg2=np.dot(c2,c1)

phi=np.arctan2(Arg1,Arg2)

if Degrees==True:
phi*=180./np.pi
return(phi)

def get_angles(pdb_path = "./native.pdb", project_path = "./ProjectInfo.yaml", assignments_path = "./Macro4/MacroAssignments.h5",
samplesPerState = 10):
# Load conformation and project
C1=Conformation.load_from_pdb(pdb_path)
P1=Project.load_from(project_path)

# Extract information from the topology file
NumResi,a,aC,aN,aCA,X=GetAtomIndicesAndPosition(C1)


def GetPhi(X):
return GetAllPhiDipeptide(C1,NumResi=NumResi,a=a,aC=aC,aN=aN,aCA=aCA,X=X)
def GetPsi(X):
return GetAllPsiDipeptide(C1,NumResi=NumResi,a=a,aC=aC,aN=aN,aCA=aCA,X=X)

# Load assignments
assign = io.loadh(assignments_path, "arr_0")
numStates = assign.max() - assign.min() + 1

# Lambda function to get max number of conformations per macrostate
max_per_state = lambda x: len(np.where(assign == x)[0])
# Number of conformations to sample
if samplesPerState < 0:
num_confs = [max_per_state(i) for i in xrange(numStates)]
else:
num_confs = [min(samplesPerState, max_per_state(i)) for i in xrange(numStates)]
# Total number of conformations
num_confs_tot = sum(num_confs)

print(num_confs)

# Sample conformations
confs = P1.get_random_confs_from_states(assign, range(numStates), num_confs, replacement = False)

# Initialize arrays
phi = np.zeros(num_confs_tot)
psi = np.zeros(num_confs_tot)
ind = np.array(num_confs, dtype=np.int)

# Loop through conformations and get phi and psi angles
i_tot = 0
for c in confs:
cxyz = c["XYZList"]
for i_conf in xrange(len(cxyz)):
phi[i_tot] = GetPhi(c["XYZList"][i_conf])
psi[i_tot] = GetPsi(c["XYZList"][i_conf])
i_tot+=1

io.saveh("Dihedrals.h5", Phi = phi, Psi = psi, StateIndex = ind)

return phi, psi


import numpy as np
from msmbuilder import Conformation,Project,io
from argparse import ArgumentParser
import os


def main():
parser = ArgumentParser(os.path.split(__file__)[1], description = '''
A simple script to extract Phi and Psi angles for Alanine dipeptide.
This script will only work with Alanine dipeptide due to its unique naming convention.''')

parser.add_argument('--pdb', dest = 'pdb_path',
help = 'The path to the topology file. Default: native.pdb',
default = 'native.pdb', metavar = 'pdb_path')
parser.add_argument('-p', '--project', dest='project_path',
help = 'MSMBuilder project file. Default: ProjectInfo.yaml',
default = 'ProjectInfo.yaml', metavar = 'project')
parser.add_argument('-a', dest='assignments_path',
help = 'Path to Macrostate assignments. Default: Macro4/MacroAssignments.h5',
default = 'Macro4/MacroAssignments.h5', metavar = 'assignments')
parser.add_argument('-n', dest = 'samples',
help = 'The number of states to sample per macrostate. Use -1 for all. Default: 1000',
default=1000, metavar = 'samples', type=int)

args = parser.parse_args()
get_angles(pdb_path = args.pdb_path, project_path = args.project_path,
assignments_path = args.assignments_path, samplesPerState = args.samples)

if __name__ == '__main__':
main()

35 changes: 35 additions & 0 deletions Tutorial/PlotMacrostateImpliedTimescales.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/usr/bin/env python

from numpy import *
from matplotlib import *
from matplotlib.pyplot import *

Unit = "ps"
NumStates = 4
DataDir = "./Macro4/"
LagTime = 1

x,y = LagTime*loadtxt(DataDir+"/ImpliedTimescales.dat").transpose()

plot(x,y,'o')

title("Implied Timescales")
xlabel("Lagtime")
ylabel("Implied Timescale")

K = loadtxt(DataDir+"/Rate.dat")
lam,ev = linalg.eig(K)
lam = sort(abs(lam))
for i in range(1,NumStates):
plot(x,LagTime/lam[i]*(x*0+1),'g-')


plot([],[],'g-',label="SCRE")
plot([],[],'bo',label="Fixed Lagtime")
xlabel("Lagtime [%s]"%Unit)
ylabel("Implied Timescale [%s]"%Unit)
legend(loc=0,numpoints=1)

axis([0,26,0,26])

show()
2 changes: 2 additions & 0 deletions Tutorial/U_test.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
71
72
Binary file added Tutorial/XTC.tar
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions reference/hub_ref/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

HUB SCORE REFERENCE DATA FOR UNIT TEST
--------------------------------------

Data provided by Alex Dickson, deposted by TJL (9.14.12). Here is his msg
regarding the format of the data.

"Here's a test case. It is a 11-node network with cuu = 0.5.

node_1.csv and edge_1.csv are data files to plot the network,
hub_msm_1.dat has the hub scores (format: "node weight hubscore"),
hub_msm_data_1.dat has the h_c values (format: "node from to fraction"),
ratemat_1.dat is the rate matrix (column index = "to", row index = "from").

(for the purposes of the paper, index 0 is the "folded" state)

Let me know if you have any problems, or if everything turns out well :)

-Alex"

TJL renamed the following files:

hub_msm_1.dat --> hub_scores.dat
hub_msm_data_1.dat --> fraction_visited.dat

which is a little clearer in his mind.


65 changes: 65 additions & 0 deletions reference/hub_ref/edge_1.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
Source Target num
0 1 1.000000e-04
0 2 1.000000e-04
0 3 1.000000e-04
0 4 1.000000e-04
0 5 1.000000e-04
0 6 1.000000e-04
0 7 1.000000e-04
0 8 1.000000e-04
0 9 1.000000e-04
0 10 1.000000e-04
1 0 2.500000e-02
1 5 2.315625e-01
1 6 2.315625e-01
1 9 2.315625e-01
1 10 2.315625e-01
2 0 2.500000e-02
2 3 3.087500e-01
2 4 3.087500e-01
2 9 3.087500e-01
3 0 2.500000e-02
3 2 3.087500e-01
3 4 3.087500e-01
3 6 3.087500e-01
4 0 2.500000e-02
4 2 1.323214e-01
4 3 1.323214e-01
4 5 1.323214e-01
4 6 1.323214e-01
4 8 1.323214e-01
4 9 1.323214e-01
4 10 1.323214e-01
5 0 2.500000e-02
5 1 2.315625e-01
5 4 2.315625e-01
5 6 2.315625e-01
5 8 2.315625e-01
6 0 2.500000e-02
6 1 1.543750e-01
6 3 1.543750e-01
6 4 1.543750e-01
6 5 1.543750e-01
6 9 1.543750e-01
6 10 1.543750e-01
7 0 2.500000e-02
7 8 4.631250e-01
7 10 4.631250e-01
8 0 2.500000e-02
8 4 1.852500e-01
8 5 1.852500e-01
8 7 1.852500e-01
8 9 1.852500e-01
8 10 1.852500e-01
9 0 2.500000e-02
9 1 1.852500e-01
9 2 1.852500e-01
9 4 1.852500e-01
9 6 1.852500e-01
9 8 1.852500e-01
10 0 2.500000e-02
10 1 1.852500e-01
10 4 1.852500e-01
10 6 1.852500e-01
10 7 1.852500e-01
10 8 1.852500e-01
Loading