r6921 - /branches/rdc_analysis/maths_fns/n_state_model.py -- July 09, 2008 - 19:40

Author: bugman
Date: Wed Jul  9 19:40:11 2008
New Revision: 6921

URL: http://svn.gna.org/viewcvs/relax?rev=6921&view=rev
Log:
The population weights are now taken into account in the func_population() 
target function.


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=6921&r1=6920&r2=6921&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:40:11 2008
@@ -209,6 +209,9 @@
         # Initial chi-squared (or SSE) value.
         chi2_sum = 0.0
 
+        # Unpack the probabilities.
+        probs = params[-(self.N-1):]
+
         # Loop over each alignment.
         for n in xrange(self.num_align):
             # Extract tensor n from the parameters.
@@ -217,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])
+                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)
 
             # 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])