r10333 - /branches/bieri_gui/gui_bieri/relax_gui.py -- January 25, 2010 - 21:25

Author: bugman
Date: Mon Jan 25 21:25:08 2010
New Revision: 10333

URL: http://svn.gna.org/viewcvs/relax?rev=10333&view=rev
Log:
Fix for the execution of the automatic model-free analysis.

The method start_modelfree should have been called rather than 
start_model_free.  These two names
are confusing and will have to be renamed.


Modified:
    branches/bieri_gui/gui_bieri/relax_gui.py

Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10333&r1=10332&r2=10333&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Mon Jan 25 21:25:08 2010
@@ -2226,17 +2226,17 @@
 
             # start full automatic model-free analysis
             if which_model == 'full':
-                model1 = start_model_free(self, 'local_tm', True, 
global_setting, file_setting, sequencefile)    # execute local_tm
+                model1 = start_modelfree(self, 'local_tm', True, 
global_setting, file_setting, sequencefile)    # execute local_tm
                 if model1 == 'successful':
-                    model2 = start_model_free(self, 'sphere', True, 
global_setting, file_setting, sequencefile)        # execute sphere
+                    model2 = start_modelfree(self, 'sphere', True, 
global_setting, file_setting, sequencefile)        # execute sphere
                     if model2 == 'successful':
-                        model3 = start_model_free(self, 'prolate', True, 
global_setting, file_setting, sequencefile)         # execute prolate
+                        model3 = start_modelfree(self, 'prolate', True, 
global_setting, file_setting, sequencefile)         # execute prolate
                         if model3 == 'successful':
-                            model4 = start_model_free(self, 'oblate', True, 
global_setting, file_setting, sequencefile)         # execute oblate
+                            model4 = start_modelfree(self, 'oblate', True, 
global_setting, file_setting, sequencefile)         # execute oblate
                             if model4 == 'successful':
-                                model5 = start_model_free(self, 'ellipsoid', 
True, global_setting, file_setting, sequencefile)      # execute ellipsoid
+                                model5 = start_modelfree(self, 'ellipsoid', 
True, global_setting, file_setting, sequencefile)      # execute ellipsoid
                                 if model5 == 'successful':
-                                    model6 = start_model_free(self, 'final', 
False, global_setting, file_setting, sequencefile)        # execute final 
analysis
+                                    model6 = start_modelfree(self, 'final', 
False, global_setting, file_setting, sequencefile)        # execute final 
analysis
         event.Skip()