r10147 - /branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py -- January 07, 2010 - 18:04

Author: bugman
Date: Thu Jan  7 18:04:46 2010
New Revision: 10147

URL: http://svn.gna.org/viewcvs/relax?rev=10147&view=rev
Log:
Absorbed initial_printout() into run() in the MF_minimise_command class.


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=10147&r1=10146&r2=10147&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
 Thu Jan  7 18:04:46 2010
@@ -170,20 +170,6 @@
         self.silence = False
 
 
-    def initial_printout(self):
-        """Generate some print outs for normal analysis."""
-
-        # Print out.
-        if self.minimise_map['print_flag'] >= 1:
-            # Individual spin stuff.
-            if self.model_type == 'mf' or self.model_type == 'local_tm':
-                if self.minimise_map['print_flag'] >= 2:
-                    print("\n\n")
-                string = "Fitting to spin " + repr(self.info_map['spin_id'])
-                print("\n\n" + string)
-                print(len(string) * '~')
-
-
     # rename confusing with processor process_results
     def process_results(self, results, processor, completed):
 
@@ -210,8 +196,15 @@
 
         # Run catching all errors.
         try:
-            # Initial print outs.
-            self.initial_printout()
+            # Print out.
+            if self.minimise_map['print_flag'] >= 1:
+                # Individual spin stuff.
+                if self.model_type == 'mf' or self.model_type == 'local_tm':
+                    if self.minimise_map['print_flag'] >= 2:
+                        print("\n\n")
+                    string = "Fitting to spin " + 
repr(self.info_map['spin_id'])
+                    print("\n\n" + string)
+                    print(len(string) * '~')
 
             # Minimisation.
             results = generic_minimise(func=self.mf.func, 
dfunc=self.mf.dfunc, d2func=self.mf.d2func, **self.minimise_map)