r4926 - /1.3/generic_fns/molmol.py -- February 07, 2008 - 11:36

Author: bugman
Date: Thu Feb  7 11:36:08 2008
New Revision: 4926

URL: http://svn.gna.org/viewcvs/relax?rev=4926&view=rev
Log:
Updated the calls to the create_macro() function.


Modified:
    1.3/generic_fns/molmol.py

Modified: 1.3/generic_fns/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/molmol.py?rev=4926&r1=4925&r2=4926&view=diff
==============================================================================
--- 1.3/generic_fns/molmol.py (original)
+++ 1.3/generic_fns/molmol.py Thu Feb  7 11:36:08 2008
@@ -104,7 +104,7 @@
         raise RelaxNoSequenceError
 
     # Create the macro.
-    commands = create_macro()
+    commands = create_macro(data_type=data_type, style=style, 
colour_start=colour_start, colour_end=colour_end, colour_list=colour_list)
 
     # Loop over the commands and execute them.
     for command in commands:
@@ -286,9 +286,6 @@
     if not exists_mol_res_spin_data():
         raise RelaxNoSequenceError
 
-    # Create the macro.
-    commands = create_macro()
-
     # File name.
     if file == None:
         file = data_type + '.mac'
@@ -296,6 +293,9 @@
     # Open the file for writing.
     file = open_write_file(file, dir, force)
 
+    # Create the macro.
+    commands = create_macro(data_type=data_type, style=style, 
colour_start=colour_start, colour_end=colour_end, colour_list=colour_list)
+
     # Loop over the commands and write them.
     for command in commands:
         file.write(command + "\n")