r11315 - /1.3/maths_fns/n_state_model.py -- July 19, 2010 - 11:42

Author: bugman
Date: Mon Jul 19 11:42:30 2010
New Revision: 11315

URL: http://svn.gna.org/viewcvs/relax?rev=11315&view=rev
Log:
For for a bug introduced in the last revision (r11314).

The fixed probabilities were not being set for the Ln3+ optimisation case.


Modified:
    1.3/maths_fns/n_state_model.py

Modified: 1.3/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/n_state_model.py?rev=11315&r1=11314&r2=11315&view=diff
==============================================================================
--- 1.3/maths_fns/n_state_model.py (original)
+++ 1.3/maths_fns/n_state_model.py Mon Jul 19 11:42:30 2010
@@ -387,14 +387,6 @@
 
         # Pure tensor optimisation overrides.
         if model == 'fixed' and self.centre_fixed:
-            # The probability array.
-            if probs:
-                self.probs = probs
-
-            # All structures have initial equal probability.
-            else:
-                self.probs = ones(self.N, float64) / self.N
-
             # The probs are unpacked by self.func in the population model, 
so just override that function.
             self.func = self.func_tensor_opt
             self.dfunc = self.dfunc_tensor_opt
@@ -402,6 +394,16 @@
 
             # The zero Hessian.
             self.zero_hessian = zeros(self.num_spins, float64)
+
+        # Fixed probabilities.
+        if model == 'fixed':
+            # The probability array.
+            if probs:
+                self.probs = probs
+
+            # All structures have initial equal probability.
+            else:
+                self.probs = ones(self.N, float64) / self.N
 
 
     def func_2domain(self, params):