r25893 - in /branches/frame_order_cleanup/specific_analyses/frame_order: api.py parameters.py -- September 17, 2014 - 17:24

Author: bugman
Date: Wed Sep 17 17:24:15 2014
New Revision: 25893

URL: http://svn.gna.org/viewcvs/relax?rev=25893&view=rev
Log:
Turned down the verbosity of the update_model() frame order function.

The verbosity flag is now accepted and set to zero by the get_param_names() 
API method and
specific_analyses.frame_order.parameters.param_num() function.  This removes 
a lot of useless
printouts from many different user functions.


Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/api.py
    branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/api.py?rev=25893&r1=25892&r2=25893&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/api.py   
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/api.py   Wed 
Sep 17 17:24:15 2014
@@ -327,7 +327,7 @@
         """
 
         # First update the model, if needed.
-        update_model()
+        update_model(verbosity=0)
 
         # Return the parameter list object.
         return cdp.params

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py?rev=25893&r1=25892&r2=25893&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py  
  (original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py  
  Wed Sep 17 17:24:15 2014
@@ -248,23 +248,29 @@
     """
 
     # Update the model, just in case.
-    update_model()
+    update_model(verbosity=0)
 
     # Simple parameter list count.
     return len(cdp.params)
 
 
-def update_model():
-    """Update the model parameters as necessary."""
+def update_model(verbosity=1):
+    """Update the model parameters as necessary.
+
+    @keyword verbosity: If this value is greater than zero, then a number of 
printouts will occur.
+    @type verbosity:    int
+    """
 
     # Printout.
-    print("Reinitialising the list of model parameters:")
+    if verbosity:
+        print("Reinitialising the list of model parameters:")
 
     # Re-initialise the list of model parameters.
     cdp.params = []
 
     # The pivot parameters.
-    print("    - pivot parameters.")
+    if verbosity:
+        print("    - pivot parameters.")
     if not pivot_fixed():
         cdp.params.append('pivot_x')
         cdp.params.append('pivot_y')
@@ -275,7 +281,8 @@
         cdp.params.append('pivot_disp')
 
     # The average domain position translation parameters.
-    print("    - average domain position.")
+    if verbosity:
+        print("    - average domain position.")
     cdp.params.append('ave_pos_x')
     cdp.params.append('ave_pos_y')
     cdp.params.append('ave_pos_z')
@@ -287,7 +294,8 @@
     cdp.params.append('ave_pos_gamma')
 
     # Frame order eigenframe - the full frame.
-    print("    - frame order eigenframe.")
+    if verbosity:
+        print("    - frame order eigenframe.")
     if cdp.model in MODEL_LIST_PSEUDO_ELLIPSE + [MODEL_DOUBLE_ROTOR]:
         cdp.params.append('eigen_alpha')
         cdp.params.append('eigen_beta')
@@ -303,7 +311,8 @@
         cdp.params.append('axis_alpha')
 
     # Cone parameters - pseudo-elliptic cone parameters.
-    print("    - cone opening half-angles.")
+    if verbosity:
+        print("    - cone opening half-angles.")
     if cdp.model in MODEL_LIST_PSEUDO_ELLIPSE:
         cdp.params.append('cone_theta_x')
         cdp.params.append('cone_theta_y')
@@ -315,7 +324,8 @@
         cdp.params.append('cone_s1')
 
     # Cone parameters - torsion angle.
-    print("    - cone torsion half-angles.")
+    if verbosity:
+        print("    - cone torsion half-angles.")
     if cdp.model in [MODEL_DOUBLE_ROTOR, MODEL_ROTOR, MODEL_ISO_CONE, 
MODEL_PSEUDO_ELLIPSE]:
         cdp.params.append('cone_sigma_max')