r4766 - /branches/N_state_model/specific_fns/n_state_model.py -- January 16, 2008 - 09:28

Author: bugman
Date: Wed Jan 16 09:28:23 2008
New Revision: 4766

URL: http://svn.gna.org/viewcvs/relax?rev=4766&view=rev
Log:
The list of the full alignment tensors in matrix form is now created and 
passing into __init__().


Modified:
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/n_state_model.py?rev=4766&r1=4765&r2=4766&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Wed Jan 16 09:28:23 
2008
@@ -243,6 +243,16 @@
         if constraints:
             A, b = self.linear_constraints()
 
+        # Create a list of matricies consisting of all the full alignment 
tensors.
+        full_tensors = []
+        for tensor in cdp.align_tensors:
+            # Ignore the reduced tensors.
+            if tensor.red:
+                continue
+
+            # Append the tensor (in matrix form).
+            full_tensors.append(tensor.tensor)
+
         # Create a list of all the reduced alignment tensor elements and 
their errors (for the chi-squared function).
         red_tensor_elem = []
         red_tensor_err = []
@@ -275,7 +285,7 @@
         red_tensor_err = array(red_tensor_err, float64)
 
         # Set up the class instance containing the target function.
-        model = N_state_opt(N=cdp.N, init_params=param_vector, 
red_data=red_tensor_elem, red_errors=red_tensor_err)
+        model = N_state_opt(N=cdp.N, init_params=param_vector, 
full_tensors=full_tensors, red_data=red_tensor_elem, 
red_errors=red_tensor_err)
 
         # Minimisation.
         if constraints: