r21859 - /trunk/specific_analyses/relax_disp/disp_data.py -- December 08, 2013 - 09:44

Author: bugman
Date: Sun Dec  8 09:44:50 2013
New Revision: 21859

URL: http://svn.gna.org/viewcvs/relax?rev=21859&view=rev
Log:
Fixes for the relax_disp.plot_disp_curves user function - the colours 
behaviour is now back to normal.

This does not affect relax 3.1.0 and is only a recent bug.


Modified:
    trunk/specific_analyses/relax_disp/disp_data.py

Modified: trunk/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/disp_data.py?rev=21859&r1=21858&r2=21859&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Sun Dec  8 09:44:50 2013
@@ -1385,7 +1385,7 @@
     proton_mmq_flag = has_proton_mmq_cpmg()
 
     # Default hardcoded colours (one colour for each magnetic field 
strength).
-    color_order = [4, 15, 2, 13, 11, 1, 3, 5, 6, 7, 8, 9, 10, 12, 14] * 1000
+    colour_order = [4, 15, 2, 13, 11, 1, 3, 5, 6, 7, 8, 9, 10, 12, 14] * 1000
 
     # Loop over each spin.
     for spin, spin_id in spin_loop(return_id=True, skip_desel=True):
@@ -1550,6 +1550,7 @@
             # Loop over the spectrometer frequencies and offsets.
             set_index = 0
             err = False
+            colour_index = 0
             for frq, offset, mi, oi in loop_frq_offset(exp_type=exp_type, 
return_indices=True):
                 # Add a new set for the data at each frequency and offset.
                 data[graph_index].append([])
@@ -1568,7 +1569,7 @@
                 set_labels[ei].append(label)
 
                 # The other settings.
-                set_colours[graph_index].append(color_order[set_index])
+                set_colours[graph_index].append(colour_order[colour_index])
                 x_axis_type_zero[graph_index].append(True)
                 symbols[graph_index].append(1)
                 symbol_sizes[graph_index].append(0.45)
@@ -1594,8 +1595,10 @@
 
                 # Increment the graph set index.
                 set_index += 1
+                colour_index += 1
 
             # Add the back calculated data.
+            colour_index = 0
             for frq, offset, mi, oi in loop_frq_offset(exp_type=exp_type, 
return_indices=True):
                 # Add a new set for the data at each frequency and offset.
                 data[graph_index].append([])
@@ -1614,7 +1617,7 @@
                 set_labels[ei].append(label)
 
                 # The other settings.
-                set_colours[graph_index].append(color_order[set_index])
+                set_colours[graph_index].append(colour_order[colour_index])
                 x_axis_type_zero[graph_index].append(True)
                 symbols[graph_index].append(4)
                 symbol_sizes[graph_index].append(0.45)
@@ -1642,9 +1645,11 @@
 
                 # Increment the graph set index.
                 set_index += 1
+                colour_index += 1
 
             # Add the interpolated back calculated data.
             if interpolated_flag:
+                colour_index = 0
                 for frq, offset, mi, oi in 
loop_frq_offset(exp_type=exp_type, return_indices=True):
                     # Add a new set for the data at each frequency and 
offset.
                     data[graph_index].append([])
@@ -1663,7 +1668,7 @@
                     set_labels[ei].append(label)
 
                     # The other settings.
-                    set_colours[graph_index].append(color_order[set_index])
+                    
set_colours[graph_index].append(colour_order[colour_index])
                     x_axis_type_zero[graph_index].append(True)
                     if spin.model in MODEL_LIST_NUMERIC_CPMG:
                         symbols[graph_index].append(8)
@@ -1690,8 +1695,10 @@
 
                     # Increment the graph set index.
                     set_index += 1
+                    colour_index += 1
 
             # Add the residuals for statistical comparison.
+            colour_index = 0
             for frq, offset, mi, oi in loop_frq_offset(exp_type=exp_type, 
return_indices=True):
                 # Add a new set for the data at each frequency and offset.
                 data[graph_index].append([])
@@ -1707,7 +1714,7 @@
                 set_labels[ei].append(label)
 
                 # The other settings.
-                set_colours[graph_index].append(color_order[set_index])
+                set_colours[graph_index].append(colour_order[colour_index])
                 x_axis_type_zero[graph_index].append(True)
                 symbols[graph_index].append(9)
                 symbol_sizes[graph_index].append(0.45)
@@ -1733,6 +1740,7 @@
 
                 # Increment the graph set index.
                 set_index += 1
+                colour_index += 1
 
             # Increment the graph index.
             graph_index += 1