Author: bugman Date: Mon Jan 7 16:01:23 2008 New Revision: 4432 URL: http://svn.gna.org/viewcvs/relax?rev=4432&view=rev Log: Bug fix. Updated all the calls to self.find_index(). Modified: 1.3/specific_fns/relax_data.py Modified: 1.3/specific_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=4432&r1=4431&r2=4432&view=diff ============================================================================== --- 1.3/specific_fns/relax_data.py (original) +++ 1.3/specific_fns/relax_data.py Mon Jan 7 16:01:23 2008 @@ -284,8 +284,8 @@ data1 = relax_data_store.res[run1][i] data2 = relax_data_store.res[run2][i] - # Find the index corresponding to 'self.ri_label' and 'self.frq_label'. - index = self.find_index(data1) + # Find the index corresponding to 'ri_label' and 'frq_label'. + index = self.find_index(data1, ri_label, frq_label) # Catch any problems. if index == None: @@ -414,8 +414,8 @@ # Global data flag. self.global_flag = 0 - # Find the index corresponding to 'self.ri_label' and 'self.frq_label'. - index = self.find_index(data) + # Find the index corresponding to 'ri_label' and 'frq_label'. + index = self.find_index(data, ri_label, frq_label) # Catch any problems. if index == None: @@ -656,7 +656,7 @@ value = None error = None - # Find the index corresponding to 'self.ri_label' and 'self.frq_label'. + # Find the index corresponding to 'ri_label' and 'frq_label'. index = self.find_index(relax_data_store.res[self.run][i]) # Get the data. @@ -778,7 +778,7 @@ self.data_init(spin) # Find the index corresponding to 'ri_label' and 'frq_label'. - index = self.find_index(spin) + index = self.find_index(spin, ri_label, frq_label) # Append empty data. if index == None: