Author: bugman
Date: Fri Sep 19 18:32:38 2014
New Revision: 25928
URL: http://svn.gna.org/viewcvs/relax?rev=25928&view=rev
Log:
Reverted r25927 as this should have been in the frame_order_cleanup branch, not
the trunk!!!
The command used was:
svn merge -r25927:r25926 .
.....
r25927 | bugman | 2014-09-19 18:29:51 +0200 (Fri, 19 Sep 2014) | 6 lines
Changed paths:
M /trunk/auto_analyses/frame_order.py
Updated the frame order auto-analysis to call the new frame_order.simulate
user function.
Although not implemented yet, this allows the user function to create the
simulation PDB file in the
future.
.....
Modified:
trunk/auto_analyses/frame_order.py
Modified: trunk/auto_analyses/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=25928&r1=25927&r2=25928&view=diff
==============================================================================
--- trunk/auto_analyses/frame_order.py (original)
+++ trunk/auto_analyses/frame_order.py Fri Sep 19 18:32:38 2014
@@ -406,9 +406,8 @@
# The results file already exists, so read its contents instead.
if self.read_results(model=model,
pipe_name=self.pipe_name_dict[model]):
- # The PDB representation of the model and the pseudo-Brownian
dynamics simulation (in case this was not completed correctly).
+ # The PDB representation of the model (in case this was not
completed correctly).
self.interpreter.frame_order.pdb_model(dir=self.results_dir+model,
force=True)
- self.interpreter.frame_order.simulate(dir=self.results_dir+model,
force=True)
# Nothing more to do.
return
@@ -446,9 +445,8 @@
# Save the results.
self.interpreter.results.write(dir=self.results_dir+model, force=True)
- # The PDB representation of the model and the pseudo-Brownian dynamics
simulation.
+ # The PDB representation of the model.
self.interpreter.frame_order.pdb_model(dir=self.results_dir+model,
force=True)
- self.interpreter.frame_order.simulate(dir=self.results_dir+model,
force=True)
def print_results(self):
@@ -566,9 +564,8 @@
if model != 'final' and model != cdp.model:
raise RelaxError("The model '%s' does not match the model '%s' of
the current data pipe." % (model, cdp.model))
- # The PDB representation of the model and the pseudo-Brownian dynamics
simulation.
+ # The PDB representation of the model.
self.interpreter.frame_order.pdb_model(dir=self.results_dir+model,
force=True)
- self.interpreter.frame_order.simulate(dir=self.results_dir+model,
force=True)
# Create the visualisation script.
subsection(file=sys.stdout, text="Creating a PyMOL visualisation
script.")
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
