r16995 - in /branches/interatomic: ./ specific_fns/ specific_fns/model_free/ -- June 20, 2012 - 01:51

Author: bugman
Date: Wed Jun 20 01:51:48 2012
New Revision: 16995

URL: http://svn.gna.org/viewcvs/relax?rev=16995&view=rev
Log:
Eliminated the RelaxProtonTypeError error and changed the RelaxSpinTypeError 
message.


Modified:
    branches/interatomic/relax_errors.py
    branches/interatomic/specific_fns/consistency_tests.py
    branches/interatomic/specific_fns/jw_mapping.py
    branches/interatomic/specific_fns/model_free/mf_minimise.py
    branches/interatomic/specific_fns/n_state_model.py

Modified: branches/interatomic/relax_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/relax_errors.py?rev=16995&r1=16994&r2=16995&view=diff
==============================================================================
--- branches/interatomic/relax_errors.py (original)
+++ branches/interatomic/relax_errors.py Wed Jun 20 01:51:48 2012
@@ -293,12 +293,7 @@
 # Spin type not set.
 class RelaxSpinTypeError(BaseError):
     def __init__(self):
-        self.text = "The spin type has not yet been set.  Please use the 
value.set user function to set the heteronucleus type."
-
-# Proton type not set.
-class RelaxProtonTypeError(BaseError):
-    def __init__(self):
-        self.text = "The type of proton attached to the spin has not yet 
been set.  Please use the value.set user function to set the proton type."
+        self.text = "The nuclear isotope type has not yet been set.  Please 
use the spin.isotope user function to set the type."
 
 
 # Argument errors.

Modified: branches/interatomic/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/consistency_tests.py?rev=16995&r1=16994&r2=16995&view=diff
==============================================================================
--- branches/interatomic/specific_fns/consistency_tests.py (original)
+++ branches/interatomic/specific_fns/consistency_tests.py Wed Jun 20 
01:51:48 2012
@@ -32,7 +32,7 @@
 from generic_fns import pipes
 from maths_fns.consistency_tests import Consistency
 from physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, 
return_gyromagnetic_ratio
-from relax_errors import RelaxError, RelaxFuncSetupError, 
RelaxNoSequenceError, RelaxNoValueError, RelaxProtonTypeError, 
RelaxSpinTypeError
+from relax_errors import RelaxError, RelaxFuncSetupError, 
RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError
 from relax_warnings import RelaxDeselectWarning
 import specific_fns
 

Modified: branches/interatomic/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/jw_mapping.py?rev=16995&r1=16994&r2=16995&view=diff
==============================================================================
--- branches/interatomic/specific_fns/jw_mapping.py (original)
+++ branches/interatomic/specific_fns/jw_mapping.py Wed Jun 20 01:51:48 2012
@@ -31,7 +31,7 @@
 from generic_fns import pipes
 from maths_fns.jw_mapping import Mapping
 from physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, 
return_gyromagnetic_ratio
-from relax_errors import RelaxError, RelaxFuncSetupError, 
RelaxNoSequenceError, RelaxNoValueError, RelaxProtonTypeError, 
RelaxSpinTypeError
+from relax_errors import RelaxError, RelaxFuncSetupError, 
RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError
 from relax_warnings import RelaxDeselectWarning
 import specific_fns
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()

Modified: branches/interatomic/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/model_free/mf_minimise.py?rev=16995&r1=16994&r2=16995&view=diff
==============================================================================
--- branches/interatomic/specific_fns/model_free/mf_minimise.py (original)
+++ branches/interatomic/specific_fns/model_free/mf_minimise.py Wed Jun 20 
01:51:48 2012
@@ -41,7 +41,7 @@
 from multi import Processor_box
 from multi_processor_commands import MF_grid_command, MF_memo, 
MF_minimise_command
 from physical_constants import h_bar, mu0, return_gyromagnetic_ratio
-from relax_errors import RelaxError, RelaxInfError, RelaxLenError, 
RelaxMultiVectorError, RelaxNaNError, RelaxNoModelError, RelaxNoPdbError, 
RelaxNoResError, RelaxNoSequenceError, RelaxNoTensorError, RelaxNoValueError, 
RelaxNoVectorsError, RelaxNucleusError, RelaxProtonTypeError, 
RelaxSpinTypeError
+from relax_errors import RelaxError, RelaxInfError, RelaxLenError, 
RelaxMultiVectorError, RelaxNaNError, RelaxNoModelError, RelaxNoPdbError, 
RelaxNoResError, RelaxNoSequenceError, RelaxNoTensorError, RelaxNoValueError, 
RelaxNoVectorsError, RelaxNucleusError, RelaxSpinTypeError
 from relax_warnings import RelaxWarning
 
 

Modified: branches/interatomic/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/n_state_model.py?rev=16995&r1=16994&r2=16995&view=diff
==============================================================================
--- branches/interatomic/specific_fns/n_state_model.py (original)
+++ branches/interatomic/specific_fns/n_state_model.py Wed Jun 20 01:51:48 
2012
@@ -50,7 +50,7 @@
 from maths_fns.potential import quad_pot
 from maths_fns.rotation_matrix import two_vect_to_R, euler_to_R_zyz
 from physical_constants import dipolar_constant, g1H, 
return_gyromagnetic_ratio
-from relax_errors import RelaxError, RelaxInfError, RelaxModelError, 
RelaxNaNError, RelaxNoModelError, RelaxNoTensorError, RelaxNoValueError, 
RelaxProtonTypeError, RelaxSpinTypeError
+from relax_errors import RelaxError, RelaxInfError, RelaxModelError, 
RelaxNaNError, RelaxNoModelError, RelaxNoTensorError, RelaxNoValueError, 
RelaxSpinTypeError
 from relax_io import open_write_file
 from relax_warnings import RelaxWarning, RelaxDeselectWarning
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()