r7812 - /branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py -- October 18, 2008 - 18:18

Author: bugman
Date: Sat Oct 18 18:18:56 2008
New Revision: 7812

URL: http://svn.gna.org/viewcvs/relax?rev=7812&view=rev
Log:
Clean up and fixes for the do_feedback() method.


Modified:
    
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py

Modified: 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py?rev=7812&r1=7811&r2=7812&view=diff
==============================================================================
--- 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
 (original)
+++ 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
 Sat Oct 18 18:18:56 2008
@@ -186,24 +186,21 @@
 #                               
param_set=memo.param_set,scaling=memo.scaling,scaling_matrix=memo.scaling_matrix)
 
     def do_feedback(self):
-        # Print out.
-        
#print_flag,param_set,residue_num,residue_name,min_algor,grid_size=None
-        m_m=self.minimise_map
-        m_f=self.mf_map
-        i_m=self.info_map
-#        print 'minimising...' + i_m['res_id'] + ' '+  `i_m['index']` + ' ' 
+ `i_m['sim_index']` + ' ' + m_f['param_set'] + ' '  + `m_m['print_flag']`
-#        sys.stdout.flush())
-        if m_m['print_flag'] >= 1:
+        """Minimisation print out."""
+
+        # Only print out if verbosity is turned on.
+        if self.minimise_map['verbosity'] >= 1:
             # montecarlo stuff
-            if i_m['sim_index'] != None and i_m['index'] == 0:
-                print 'Simulation '+ `i_m['sim_index']`+ '\n'
+            if self.info_map['sim_index'] != None and self.info_map['index'] 
== 0:
+                print 'Simulation '+ `self.info_map['sim_index']`+ '\n'
             # Individual residue stuff.
-            if m_f['param_set'] == 'mf' or m_f['param_set'] == 'local_tm':
-                if m_m['print_flag'] >= 2:
+            if self.mf_map['param_set'] == 'mf' or self.mf_map['param_set'] 
== 'local_tm':
+                if self.minimise_map['verbosity'] >= 2:
                     print "\n\n"
-                string = "Fitting to residue: " + i_m['res_id']
+                string = "Fitting to residue: " + self.info_map['res_id']
                 print "\n\n" + string
                 print len(string) * '~'
+
 
     # rename confusing with processor process_results
     def process_results(self,results,processor,completed):