r18279 - /trunk/maths_fns/n_state_model.py -- January 23, 2013 - 18:51

Author: bugman
Date: Wed Jan 23 18:51:33 2013
New Revision: 18279

URL: http://svn.gna.org/viewcvs/relax?rev=18279&view=rev
Log:
Simplified the parameter unpacking in the func_standard() N-state model 
target function.


Modified:
    trunk/maths_fns/n_state_model.py

Modified: trunk/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/n_state_model.py?rev=18279&r1=18278&r2=18279&view=diff
==============================================================================
--- trunk/maths_fns/n_state_model.py (original)
+++ trunk/maths_fns/n_state_model.py Wed Jan 23 18:51:33 2013
@@ -638,21 +638,17 @@
         # Initial chi-squared (or SSE) value.
         chi2_sum = 0.0
 
-        # Unpack both the probabilities and paramagnetic centre.
+        # Unpack both the probabilities (when the paramagnetic centre is 
also optimised).
         if not self.probs_fixed and not self.centre_fixed:
             # The probabilities.
             self.probs = params[-(self.N-1)-3:-3]
 
-            # The position (also update the paramagnetic info).
-            self.paramag_centre = params[-3:]
-            self.paramag_info()
-
         # Unpack the probabilities (located at the end of the parameter 
array).
         elif not self.probs_fixed:
             self.probs = params[-(self.N-1):]
 
         # Unpack the paramagnetic centre (also update the paramagnetic info).
-        elif not self.centre_fixed:
+        if not self.centre_fixed:
             self.paramag_centre = params[-3:]
             self.paramag_info()