r14507 - /1.3/specific_fns/model_free/__init__.py -- August 29, 2011 - 14:21

Author: bugman
Date: Mon Aug 29 14:21:19 2011
New Revision: 14507

URL: http://svn.gna.org/viewcvs/relax?rev=14507&view=rev
Log:
The Molmol and PyMOL classes are now initialised by the model-free class and 
the methods aliased.


Modified:
    1.3/specific_fns/model_free/__init__.py

Modified: 1.3/specific_fns/model_free/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/__init__.py?rev=14507&r1=14506&r2=14507&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/__init__.py (original)
+++ 1.3/specific_fns/model_free/__init__.py Mon Aug 29 14:21:19 2011
@@ -46,7 +46,7 @@
 from specific_fns.api_common import API_common
 
 
-class Model_free(Model_free_main, Mf_minimise, Molmol, Pymol, Results, Bmrb, 
API_base, API_common):
+class Model_free(Model_free_main, Mf_minimise, Results, Bmrb, API_base, 
API_common):
     """Parent class containing all the model-free specific functions."""
 
     def __init__(self):
@@ -58,3 +58,11 @@
         self.return_value = self._return_value_general
         self.sim_pack_data = self._sim_pack_relax_data
         self.test_grid_ops = self._test_grid_ops_general
+
+        # Initialise the macro classes.
+        self._molmol_macros = Molmol()
+        self._pymol_macros = Pymol()
+
+        # Alias the macro creation methods.
+        self.pymol_macro = self._pymol_macros.create_macro
+        self.molmol_macro = self._molmol_macros.create_macro