r4837 - in /branches/N_state_model: generic_fns/value.py specific_fns/n_state_model.py -- January 17, 2008 - 18:07

Author: bugman
Date: Thu Jan 17 18:07:13 2008
New Revision: 4837

URL: http://svn.gna.org/viewcvs/relax?rev=4837&view=rev
Log:
Reverted r4836 as it contained changes which should not have been committed.

The command used was:
svn merge -r4836:4835 .


Modified:
    branches/N_state_model/generic_fns/value.py
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/generic_fns/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/value.py?rev=4837&r1=4836&r2=4837&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/value.py (original)
+++ branches/N_state_model/generic_fns/value.py Thu Jan 17 18:07:13 2008
@@ -117,7 +117,20 @@
     else:
         # List of values.
         if type(val) == list or isinstance(val, ndarray):
+            # Parameter name.
+            for i in xrange(len(val)):
+                spin_params.append(param)
+
+            # Parameter value.
             spin_values = val
+
+        # Single value.
+        else:
+            # Parameter name.
+            spin_params.append(param)
+
+            # Parameter value.
+            spin_values.append(val)
 
     # Return the partitioned parameters and values.
     return spin_params, spin_values, other_params, other_values
@@ -154,7 +167,6 @@
     if spin_params:
         # Test if the sequence data is loaded.
         if not exists_mol_res_spin_data():
-            raise RelaxError, `partition_params(val, param)`
             raise RelaxNoSequenceError
 
         # First test if parameter value already exists, prior to setting any 
params.

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=4837&r1=4836&r2=4837&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Thu Jan 17 18:07:13 
2008
@@ -30,7 +30,7 @@
 from float import isNaN, isInf
 from maths_fns.n_state_model import N_state_opt
 from minfx.generic import generic_minimise
-from relax_errors import RelaxInfError, RelaxNaNError, RelaxNoModelError
+from relax_errors import RelaxNoModelError
 from specific_fns.base_class import Common_functions