r11910 - /1.3/generic_fns/relax_data.py -- December 20, 2010 - 15:47

Author: bugman
Date: Mon Dec 20 15:47:46 2010
New Revision: 11910

URL: http://svn.gna.org/viewcvs/relax?rev=11910&view=rev
Log:
Last fix for bug #17361 (https://gna.org/bugs/index.php?17361) the loading 
1.2.x sim data.

The frequency information is now correctly updated when data is missing.


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=11910&r1=11909&r2=11910&view=diff
==============================================================================
--- 1.3/generic_fns/relax_data.py (original)
+++ 1.3/generic_fns/relax_data.py Mon Dec 20 15:47:46 2010
@@ -128,13 +128,25 @@
             spin.remap_table.pop(index)
 
         # Associated data structures.
-        spin.frq_labels = frq_labels
-        spin.frq = frq
-        spin.num_ri = len(ri_labels)
-        spin.num_frq = len(frq)
+        spin.frq_labels = []
+        spin.frq = []
+        for index in spin.remap_table:
+            if not frq_labels[index] in spin.frq_labels:
+                spin.frq_labels.append(frq_labels[index])
+                spin.frq.append(frq[index])
+
+        # Counts.
+        spin.num_ri = len(spin.relax_data)
+        spin.num_frq = len(spin.frq)
 
         # Update the NOE R1 translation table.
         update_noe_r1_table(spin)
+
+        # Convert to None.
+        if spin.num_ri == 0:
+            spin.num_ri = None
+        if spin.num_frq == 0:
+            spin.num_frq = None
 
     # Simulation data.
     else: