r5226 - /1.3/maths_fns/mf.py -- March 23, 2008 - 19:19

Author: bugman
Date: Sun Mar 23 19:18:37 2008
New Revision: 5226

URL: http://svn.gna.org/viewcvs/relax?rev=5226&view=rev
Log:
Renamed all 'num_res' to 'num_spins'.


Modified:
    1.3/maths_fns/mf.py

Modified: 1.3/maths_fns/mf.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/mf.py?rev=5226&r1=5225&r2=5226&view=diff
==============================================================================
--- 1.3/maths_fns/mf.py (original)
+++ 1.3/maths_fns/mf.py Sun Mar 23 19:18:37 2008
@@ -40,7 +40,7 @@
 
 
 class Mf:
-    def __init__(self, init_params=None, param_set=None, diff_type=None, 
diff_params=None, scaling_matrix=None, num_res=None, equations=None, 
param_types=None, param_values=None, relax_data=None, errors=None, 
bond_length=None, csa=None, num_frq=0, frq=None, num_ri=None, 
remap_table=None, noe_r1_table=None, ri_labels=None, gx=0, gh=0, g_ratio=0, 
h_bar=0, mu0=0, num_params=None, vectors=None):
+    def __init__(self, init_params=None, param_set=None, diff_type=None, 
diff_params=None, scaling_matrix=None, num_spins=None, equations=None, 
param_types=None, param_values=None, relax_data=None, errors=None, 
bond_length=None, csa=None, num_frq=0, frq=None, num_ri=None, 
remap_table=None, noe_r1_table=None, ri_labels=None, gx=0, gh=0, g_ratio=0, 
h_bar=0, mu0=0, num_params=None, vectors=None):
         """The model-free minimisation class.
 
         This class should be initialised before every calculation.
@@ -200,7 +200,7 @@
         self.param_set = param_set
         self.total_num_params = len(init_params)
         self.scaling_matrix = scaling_matrix
-        self.num_res = num_res
+        self.num_spins = num_spins
         self.params = 1.0 * init_params
 
         # Data structures for tests set to some random array (in this case 
all pi).
@@ -232,7 +232,7 @@
 
         # Create the data array used to store data.
         self.data = []
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Total number of ri.
             self.total_num_ri = self.total_num_ri + num_ri[i]
 
@@ -494,7 +494,7 @@
         self.total_chi2 = 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Set self.data[i] to data.
             data = self.data[i]
 
@@ -561,7 +561,7 @@
         self.total_chi2 = 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Set self.data[i] to data.
             data = self.data[i]
 
@@ -748,7 +748,7 @@
         self.total_dchi2 = self.total_dchi2 * 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
 
             # Set self.data[i] to data.
             data = self.data[i]
@@ -830,7 +830,7 @@
         self.total_dchi2 = self.total_dchi2 * 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Set self.data[i] to data.
             data = self.data[i]
 
@@ -1014,7 +1014,7 @@
         self.total_d2chi2 = self.total_d2chi2 * 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Set self.data[i] to data.
             data = self.data[i]
 
@@ -1088,7 +1088,7 @@
         self.total_d2chi2 = self.total_d2chi2 * 0.0
 
         # Loop over the residues.
-        for i in xrange(self.num_res):
+        for i in xrange(self.num_spins):
             # Set self.data[i] to data.
             data = self.data[i]
 
@@ -1489,7 +1489,7 @@
             ri_end_index = 0
 
             # Loop over the residues.
-            for i in xrange(self.num_res):
+            for i in xrange(self.num_spins):
                 # Set self.data[i] to data.
                 data = self.data[i]
 
@@ -1514,7 +1514,7 @@
             ri_end_index = 0
 
             # Loop over the residues.
-            for i in xrange(self.num_res):
+            for i in xrange(self.num_spins):
                 # Set self.data[i] to data.
                 data = self.data[i]