r24310 - /branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py -- June 25, 2014 - 09:37

Author: bugman
Date: Wed Jun 25 09:37:14 2014
New Revision: 24310

URL: http://svn.gna.org/viewcvs/relax?rev=24310&view=rev
Log:
Corrected the printout from the CaM frame order data generation base script.

The number of states used in the distribution of domain positions is now 
correctly reported for the
models with multiple modes of motion.


Modified:
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py?rev=24310&r1=24309&r2=24310&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
        (original)
+++ 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/generate_base.py
        Wed Jun 25 09:37:14 2014
@@ -120,7 +120,7 @@
         """Calculate the averaged PCS for all states."""
 
         # Printout.
-        sys.stdout.write("\n\nRotating %s states for the PCS:\n\n" % 
locale.format("%d", self.N, grouping=True))
+        sys.stdout.write("\n\nRotating %s states for the PCS:\n\n" % 
locale.format("%d", self.N**self.MODES, grouping=True))
 
         # Turn off the relax interpreter echoing to allow the progress meter 
to be shown correctly.
         self.interpreter.off()
@@ -221,7 +221,7 @@
             rot_file = open_write_file('rotations', dir=self.save_path, 
compress_type=1, force=True)
 
         # Printout.
-        sys.stdout.write("\n\nRotating %s states for the RDC:\n\n" % 
locale.format("%d", self.N, grouping=True))
+        sys.stdout.write("\n\nRotating %s states for the RDC:\n\n" % 
locale.format("%d", self.N**self.MODES, grouping=True))
 
         # Turn off the relax interpreter echoing to allow the progress meter 
to be shown correctly.
         self.interpreter.off()
@@ -331,7 +331,7 @@
         """Generate the distribution of structures."""
 
         # Printout.
-        sys.stdout.write("\n\nRotating %s states to create the PDB 
distribution:\n\n" % self.N)
+        sys.stdout.write("\n\nRotating %s states to create the PDB 
distribution:\n\n" % self.N**self.MODES)
 
         # Load N copies of the original C-domain for the distribution.
         for global_index, mode_indices in self._state_loop():