r11908 - /1.3/generic_fns/relax_data.py -- December 20, 2010 - 15:06

Author: bugman
Date: Mon Dec 20 15:06:02 2010
New Revision: 11908

URL: http://svn.gna.org/viewcvs/relax?rev=11908&view=rev
Log:
Bug fix for the relaxation data add_data_to_spin() function - missing data 
was not properly eliminated.


Modified:
    1.3/generic_fns/relax_data.py

Modified: 1.3/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=11908&r1=11907&r2=11908&view=diff
==============================================================================
--- 1.3/generic_fns/relax_data.py (original)
+++ 1.3/generic_fns/relax_data.py Mon Dec 20 15:06:02 2010
@@ -104,20 +104,28 @@
         spin.remap_table = remap_table
 
         # Remove any data with the value None.
+        indices = []
         for index, Ri in enumerate(spin.relax_data):
             if Ri == None:
-                spin.relax_data.pop(index)
-                spin.relax_error.pop(index)
-                spin.ri_labels.pop(index)
-                spin.remap_table.pop(index)
+                indices.append(index)
+        indices.reverse()
+        for index in indices:
+            spin.relax_data.pop(index)
+            spin.relax_error.pop(index)
+            spin.ri_labels.pop(index)
+            spin.remap_table.pop(index)
 
         # Remove any data with error of None.
+        indices = []
         for index, error in enumerate(spin.relax_error):
             if error == None:
-                spin.relax_data.pop(index)
-                spin.relax_error.pop(index)
-                spin.ri_labels.pop(index)
-                spin.remap_table.pop(index)
+                indices.append(index)
+        indices.reverse()
+        for index in indices:
+            spin.relax_data.pop(index)
+            spin.relax_error.pop(index)
+            spin.ri_labels.pop(index)
+            spin.remap_table.pop(index)
 
         # Associated data structures.
         spin.frq_labels = frq_labels