[r27930]
by
bugman
Merged revisions 23650,23668-23673 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23650 | bugman | 2014-06-05 13:15:07 +0200 (Thu, 05 Jun 2014) | 8 lines
Expanded the CaM isotropic cone test data frame_order.py optimisation script and added the results.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
........
r23668 | bugman | 2014-06-05 19:00:23 +0200 (Thu, 05 Jun 2014) | 6 lines
Important fix for the 2nd rotor model of the CaM frame order test data.
The tilt angle was not set, and therefore the old data matched the non-tilted 1st rotor model. All
PCS and RDC data has been regenerated to the highest quality using 20,000,000 structures.
........
r23669 | bugman | 2014-06-05 19:05:20 +0200 (Thu, 05 Jun 2014) | 3 lines
Updated the 3 Frame_order.test_cam_rotor2* system tests for the higher quality data.
........
r23670 | bugman | 2014-06-06 08:38:25 +0200 (Fri, 06 Jun 2014) | 10 lines
Expanded the 2nd CaM pseudo-ellipse test data frame_order.py optimisation script.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
The results of the new optimisation have been added to the repository.
........
r23671 | bugman | 2014-06-06 08:39:27 +0200 (Fri, 06 Jun 2014) | 10 lines
Expanded the CaM free-rotor isotropic cone test data frame_order.py optimisation script.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
The results of the new optimisation have been added to the repository.
........
r23672 | bugman | 2014-06-06 08:59:05 +0200 (Fri, 06 Jun 2014) | 8 lines
Expanded all remaining CaM test data frame_order.py optimisation scripts.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
........
r23673 | bugman | 2014-06-06 09:01:17 +0200 (Fri, 06 Jun 2014) | 5 lines
Updated the CaM 2-site to rotor model frame_order.py optimisation script for the parameter reduction.
The rotor frame order model axis spherical angles have now been converted to a single alpha angle.
........
|
2015-10-01 19:25:06
|
Tree
|
[r27929]
by
bugman
Merged revisions 23641-23646 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23641 | bugman | 2014-06-04 19:21:24 +0200 (Wed, 04 Jun 2014) | 6 lines
Removed a terrible hack for handling the frame order analysis without constraints.
This is no longer needed as the log-barrier method is now used to constrain the optimisation, so
that the torsion angle can no longer be negative.
........
r23642 | bugman | 2014-06-04 19:36:43 +0200 (Wed, 04 Jun 2014) | 6 lines
Constraints are now implemented in the frame order grid search.
This is useful for the pseudo-elliptic models as the cone theta_x < theta_y constraint halves the
optimisation space.
........
r23643 | bugman | 2014-06-05 08:36:47 +0200 (Thu, 05 Jun 2014) | 10 lines
Expanded the CaM rotor test data frame_order.py optimisation script.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
The results of the new optimisation are included.
........
r23644 | bugman | 2014-06-05 08:51:23 +0200 (Thu, 05 Jun 2014) | 10 lines
Expanded the CaM pseudo-ellipse test data frame_order.py optimisation script.
The optimisation is now implemented as in the auto-analysis, with an iterative increase in accuracy
of the quasi-random numerical integration together with an decrease of the function tolerance cutoff
for optimisation. The accuracy of the initial chi-squared calculation is now much higher. And the
accuracy of the initial grid search and the Monte Carlo simulations is now much lower.
The results of the new optimisation are included.
........
r23645 | bugman | 2014-06-05 10:28:34 +0200 (Thu, 05 Jun 2014) | 9 lines
Added one more iteration for the zooming optimisation of the frame order auto-analysis.
This is to improve the speed of optimisation when all RDC and PCS data is being used. The previous
iterations where with [100, 1000, 200000] Sobol' integration points and [1e-2, 1e-3, 1e-4] function
tolerances. This has been increased to [100, 1000, 10000, 100000] and [1e-2, 1e-3, 5e-3, 1e-4].
The final number of points has been decreased as that level of accuracy does not appear to be
necessary. These are also only default values that the user can change for themselves.
........
r23646 | bugman | 2014-06-05 10:50:12 +0200 (Thu, 05 Jun 2014) | 6 lines
Updated the CaM frame order data generation base script to print out more information.
This is for the first axis system so that the same amount of information as the second system is
printed.
........
|
2015-10-01 19:23:53
|
Tree
|
[r27928]
by
bugman
Merged revisions 23632-23635 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23632 | bugman | 2014-06-04 10:56:18 +0200 (Wed, 04 Jun 2014) | 8 lines
Expanded the capabilities of the pymol.frame_order user function.
The isotropic and pseudo-elliptic cones are now represented as they used to be under the
pymol.cone_pdb user function. To avoid code duplication, the new represent_cone_axis(),
represent_cone_object() and represent_rotor_object() functions have been created to send the
commands into PyMOL.
........
r23633 | bugman | 2014-06-04 11:24:12 +0200 (Wed, 04 Jun 2014) | 7 lines
Increased the precision of all of the CaM frame order system tests by 40 times.
The number of Sobol' integration points have been significantly increased while only increasing the
frame order system test timings by ~10%. This allows for checking for chi-squared values at the
minima much closer to zero, and is much better for demonstrating bugs.
........
r23634 | bugman | 2014-06-04 13:54:40 +0200 (Wed, 04 Jun 2014) | 6 lines
Optimisation constraints are no longer turned off in the frame order auto-analysis.
Constraints are now supported by all frame order models, or automatically turned off for those which
do not have parameter constraints.
........
r23635 | bugman | 2014-06-04 13:56:59 +0200 (Wed, 04 Jun 2014) | 5 lines
Fix for the frame order visualisation script created by the auto-analysis.
The call to pymol.frame_order is now correct for the current version of this user function.
........
|
2015-10-01 19:19:08
|
Tree
|
[r27927]
by
bugman
Merged revisions 23624-23627 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23624 | bugman | 2014-06-03 18:09:00 +0200 (Tue, 03 Jun 2014) | 3 lines
The frame_order.num_int_pts user function now throws a RelaxWarning if not enough points are used.
........
r23625 | bugman | 2014-06-03 18:12:00 +0200 (Tue, 03 Jun 2014) | 6 lines
Changed the creation of Sobol' points for numerical integration in the frame order target functions.
The points are now all created at once using the i4_sobol_generate() rather than i4_sobol() function
from the extern.sobol.sobol_lib module.
........
r23626 | bugman | 2014-06-03 18:29:44 +0200 (Tue, 03 Jun 2014) | 6 lines
Increased the number of integration points from 50 or 100 to 5000.
This is for all CaM frame_order.py test data optimisation scripts. The higher number of points are
essential for optimising the frame order models and hence for checking the relax implementation.
........
r23627 | bugman | 2014-06-04 09:04:34 +0200 (Wed, 04 Jun 2014) | 6 lines
Updated the frame_order.py optimisation script for the small angle CaM rotor frame order test data.
This now has the correct rotor torsion angle of 1 degree, and the spherical coordinates are now
converted to the axis alpha parameter.
........
|
2015-10-01 19:17:49
|
Tree
|
[r27926]
by
bugman
Merged revisions 23616-23622 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23616 | bugman | 2014-06-03 11:16:38 +0200 (Tue, 03 Jun 2014) | 6 lines
Created a new CaM frame order test data set.
This is for the rotor model with a very small torsion angle of 1 degree, and will be used as a
comparison to the rigid model and for testing the performance of the rotor model for an edge case.
........
r23617 | bugman | 2014-06-03 11:18:44 +0200 (Tue, 03 Jun 2014) | 7 lines
Updated the frame order representations in all of the frame_order.py scripts for the CaM test data.
All PDB files are now gzipped to save space, the old pymol.cone_pdb user function calls replaced
with pymol.frame_order, and an average domain PDB file for the exact solution is now created in all
cases.
........
r23618 | bugman | 2014-06-03 11:20:51 +0200 (Tue, 03 Jun 2014) | 3 lines
The minimisation constraints are now turned on for all CaM test data frame_order.py optimisation scripts.
........
r23619 | bugman | 2014-06-03 11:24:59 +0200 (Tue, 03 Jun 2014) | 6 lines
Updated the rotor CaM test data frame_order.py script for the parameter reduction.
The rotor axis {theta, phi} polar angles have been replaced by the single axis alpha angle. This
now matches the script for the 2nd rotor model.
........
r23620 | bugman | 2014-06-03 11:26:59 +0200 (Tue, 03 Jun 2014) | 3 lines
Fix for a fatal typo in r23618.
........
r23621 | bugman | 2014-06-03 11:47:09 +0200 (Tue, 03 Jun 2014) | 7 lines
Updated the parameters in all of the frame_order.py scripts for the CaM test data.
The parameters are now specified at the top of the script as variables. All scripts now handle the
change to the translation + CoM rotation for the average domain position rather than having a pure
rotation about a fixed pivot, which is no longer supported.
........
r23622 | bugman | 2014-06-03 11:49:00 +0200 (Tue, 03 Jun 2014) | 3 lines
Fix for a missing import in the isotropic cone CaM test data frame_order.py scripts.
........
|
2015-10-01 19:15:16
|
Tree
|
[r27925]
by
bugman
Merged revisions 23613-23615 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23613 | bugman | 2014-06-03 08:53:25 +0200 (Tue, 03 Jun 2014) | 5 lines
Optimisation of the rotor model to the rigid CaM frame order test data.
The optimisation script and all results files have been added to the repository.
........
r23614 | bugman | 2014-06-03 09:00:25 +0200 (Tue, 03 Jun 2014) | 4 lines
Increased the grid search bounds for the frame order average domain translation.
Instead of being a 10 Angstrom box centred at {0, 0, 0}, now the translation search has been
increased to a 100 Angstrom box.
........
r23615 | bugman | 2014-06-03 09:16:09 +0200 (Tue, 03 Jun 2014) | 8 lines
Proper edge case handling and slight speed up of the frame order PCS integration functions.
The case whereby no Sobol' points in the numerical integration lie within the motional distribution
is now caught and the rotation matrix set to the motional eigenframe to simulate the rigid state.
As the code for averaging the PCS was changed, it was also simplified by removing an unnecessary
loop over all spins. This should speed up the PCS integration by a tiny amount.
........
|
2015-10-01 19:08:55
|
Tree
|
[r27924]
by
bugman
Merged revisions 23612 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23612 | bugman | 2014-05-30 12:49:16 +0200 (Fri, 30 May 2014) | 3 lines
Preformed a frame order analysis on the rigid CaM test data set.
This is to demonstrate that everything is operating correctly.
........
|
2015-10-01 19:00:39
|
Tree
|
[r27923]
by
bugman
Merged revisions 23611 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23611 | bugman | 2014-05-30 11:48:40 +0200 (Fri, 30 May 2014) | 4 lines
Preformed a frame order analysis on a number of the CaM test data sets.
This includes the rotor, isotropic cone, and pseudo-ellipse, and the analyses demonstrate a common
bug between all these models.
........
|
2015-10-01 18:59:30
|
Tree
|
[r27922]
by
bugman
Merged revisions 23544 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23544 | bugman | 2014-05-28 17:47:55 +0200 (Wed, 28 May 2014) | 7 lines
Attempt to speed up the pseudo-elliptic frame order models.
The quasi-random numerical integration of the PCS for the pseudo-ellipse has been modified so that
the torsion angle check for each Sobol' point is preformed before the tmax_pseudo_ellipse() function
call. A new check that the tilt angle is less than cone_theta_y, the larger of the two cone angles,
has also been added to avoid tmax_pseudo_ellipse() when the theta tilt angle is outside of an
isotropic cone defined by cone_theta_y.
........
|
2015-10-01 18:44:41
|
Tree
|
[r27921]
by
bugman
Merged revisions 23427-23430,23466-23467 via svnmerge from
svn+ssh://bugman@.../svn/relax/branches/frame_order_cleanup
........
r23427 | bugman | 2014-05-26 17:00:03 +0200 (Mon, 26 May 2014) | 3 lines
The minimisation verbosity flag now effects the frame order RelaxWarning about turning constraints off.
........
r23428 | bugman | 2014-05-26 18:15:06 +0200 (Mon, 26 May 2014) | 3 lines
Preformed a frame order analysis on the 2nd CaM free-rotor model test data.
This is to check that everything is operating as expected.
........
r23429 | bugman | 2014-05-26 19:07:55 +0200 (Mon, 26 May 2014) | 4 lines
Small speed up for the frame order target functions for most models.
The rotation matrix corresponding to each Sobol' point for the numerical integration is now
pre-calculated during target function initialisation rather than once for each function call.
........
r23430 | bugman | 2014-05-26 19:08:02 +0200 (Mon, 26 May 2014) | 5 lines
Updates for some of the frame order system tests for the rotation matrix pre-calculation change.
As the rotation matrix is being pre-calculated, one consequence is that the Sobol' angles are now
full 64-bit precision rather than 32-bit. Therefore this changes the chi-squared value a little,
requiring updates to the tests.
........
r23466 | bugman | 2014-05-27 13:54:09 +0200 (Tue, 27 May 2014) | 3 lines
Preformed a frame order analysis on the CaM free-rotor mode test data set.
This is to demonstrate that everything is operating correctly.
........
r23467 | bugman | 2014-05-27 13:54:14 +0200 (Tue, 27 May 2014) | 3 lines
Preformed a frame order analysis on the CaM free-rotor mode test data set with missing data.
This is to demonstrate that everything is operating correctly.
........
|
2015-10-01 18:41:31
|
Tree
|