r7767 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- October 16, 2008 - 17:34

Author: bugman
Date: Thu Oct 16 17:34:41 2008
New Revision: 7767

URL: http://svn.gna.org/viewcvs/relax?rev=7767&view=rev
Log:
Clean up of the disassemble_result() method.


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

Modified: 
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=7767&r1=7766&r2=7767&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Thu 
Oct 16 17:34:41 2008
@@ -1022,7 +1022,9 @@
         #self.relax.processor.run_queue()
 
 
-    def 
disassemble_result(self,param_vector,func,iter,fc,gc,hc,warning,run,index,sim_index,
 param_set,scaling,scaling_matrix):
+    def disassemble_result(self, param_vector, func, iter, fc, gc, hc, 
warning, spin, sim_index, param_set, scaling, scaling_matrix):
+        """Disassemble the optimisation results."""
+
             #print 
'***',param_vector,func,iter,fc,gc,hc,warning,run,index,sim_index, 
param_set,scaling
             #self.write_columnar_line(file=sys.stdout)
             #self.param_vector=param_vector
@@ -1048,8 +1050,6 @@
 #            self.h_count = hc
 #            self.run=run
 
-
-
             self.func=func
             self.warning=warning
             self.iter_count = self.iter_count + iter
@@ -1057,9 +1057,6 @@
             self.g_count = self.g_count + gc
             self.h_count = self.h_count + hc
 
-
-
-
             # Catch infinite chi-squared values.
             if isInf(func):
                 raise RelaxInfError, 'chi-squared'
@@ -1123,16 +1120,6 @@
             else:
                 # Sequence specific minimisation statistics.
                 if model_type == 'mf' or model_type == 'local_tm':
-# FIXME: remove me
-#                    import traceback
-#                    if self.relax.data.res[run][index].num ==  4:
-#                        print '***1',run,param_set
-#                        print 
'***2',index,self.relax.data.res[run][index].num,self.relax.data.res['m1'][index].name
-#                        print 
'***3',self.relax.data.res[run][index].num,self.relax.data.res['m1'][index].name,param_set,run,index,sim_index,self.param_vector
-#                        print 
'***4',self.relax.data.res['m1'][index].s2,id(self.relax.data.res['m1'][index])
-#                        print '***5'
-#                        traceback.print_stack(file=sys.stdout)
-
                     # Chi-squared statistic.
                     spin.chi2 = self.func