r6961 - /branches/rdc_analysis/maths_fns/n_state_model.py -- July 24, 2008 - 17:37

Author: bugman
Date: Thu Jul 24 17:02:21 2008
New Revision: 6961

URL: http://svn.gna.org/viewcvs/relax?rev=6961&view=rev
Log:
Fixes for the setup of the N-state model optimisation code.


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=6961&r1=6960&r2=6961&view=diff
==============================================================================
--- branches/rdc_analysis/maths_fns/n_state_model.py (original)
+++ branches/rdc_analysis/maths_fns/n_state_model.py Thu Jul 24 17:02:21 2008
@@ -134,12 +134,12 @@
 
             # The total number of alignments.
             self.num_align = len(rdcs)
-            self.num_align_params = len(self.rdcs)*5
+            self.num_align_params = self.num_align * 5
 
             # RDC errors.
             if rdc_errors == None:
                 # Missing errors.
-                self.sigma_ij = ones((self.num_align, self.num_spins)), 
float64)
+                self.sigma_ij = ones((self.num_align, self.num_spins), 
float64)
             else:
                 self.sigma_ij = rdc_errors
 
@@ -148,9 +148,9 @@
             self.dA = zeros((self.total_num_params, self.num_align, 3, 3), 
float64)
 
             # RDC function, gradient, and Hessian matrices.
-            self.Dij_theta = zeros((self.num_align, self.num_spins)), 
float64)
-            self.dDij_theta = zeros((self.total_num_params, self.num_align, 
self.num_spins)), float64)
-            self.d2Dij_theta = zeros((self.total_num_params, 
self.total_num_params, self.num_align, self.num_spins)), float64)
+            self.Dij_theta = zeros((self.num_align, self.num_spins), float64)
+            self.dDij_theta = zeros((self.total_num_params, self.num_align, 
self.num_spins), float64)
+            self.d2Dij_theta = zeros((self.total_num_params, 
self.total_num_params, self.num_align, self.num_spins), float64)
 
             # Set the target function, gradient, and Hessian.
             self.func = self.func_population