Author: bugman Date: Wed Jul 9 19:41:54 2008 New Revision: 6923 URL: http://svn.gna.org/viewcvs/relax?rev=6923&view=rev Log: The weights are passed into average_rdc_5D() as a keyword to make them optional. Modified: branches/rdc_analysis/maths_fns/n_state_model.py Modified: branches/rdc_analysis/maths_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/maths_fns/n_state_model.py?rev=6923&r1=6922&r2=6923&view=diff ============================================================================== --- branches/rdc_analysis/maths_fns/n_state_model.py (original) +++ branches/rdc_analysis/maths_fns/n_state_model.py Wed Jul 9 19:41:54 2008 @@ -220,7 +220,7 @@ # Loop over the spin systems i. for i in xrange(self.num_spins): # Calculate the average RDC. - self.rdcs_back_calc[n, i] = average_rdc_5D(self.xh_vect[i], self.N, tensor_5D[0], tensor_5D[1], tensor_5D[2], tensor_5D[3], tensor_5D[4], probs) + self.rdcs_back_calc[n, i] = average_rdc_5D(self.xh_vect[i], self.N, tensor_5D[0], tensor_5D[1], tensor_5D[2], tensor_5D[3], tensor_5D[4], weights=probs) # Calculate and sum the single alignment chi-squared value. chi2_sum = chi2_sum + chi2(self.rdcs[n], self.rdcs_back_calc[n], self.rdc_errors[n])