r4420 - in /branches/N_state_model: generic_fns/nuclei.py physical_constants.py -- January 07, 2008 - 13:51

Author: bugman
Date: Mon Jan  7 13:51:39 2008
New Revision: 4420

URL: http://svn.gna.org/viewcvs/relax?rev=4420&view=rev
Log:
Reverted r4185 and r4186 as these conflict with changes now in the 1.3 line.

The command used was:
svn merge -r4186:4184 .


Modified:
    branches/N_state_model/generic_fns/nuclei.py
    branches/N_state_model/physical_constants.py

Modified: branches/N_state_model/generic_fns/nuclei.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/nuclei.py?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/nuclei.py (original)
+++ branches/N_state_model/generic_fns/nuclei.py Mon Jan  7 13:51:39 2008
@@ -25,8 +25,11 @@
 
 # relax module imports.
 from data import Data as relax_data_store
-from physical_constants import gC, gH, gN, gO, gP
 from relax_errors import RelaxInvalidError
+
+
+# The relax data storage object.
+
 
 
 class Nuclei:
@@ -47,7 +50,6 @@
         if relax_data_store.gx == self.gn():
             return 'N'
 
-
         # Carbon
         if relax_data_store.gx == self.gc():
             return 'C'
@@ -64,31 +66,34 @@
     def gc(self):
         """The 13C gyromagnetic ratio."""
 
-        return gC
+        return 6.728e7
 
 
     def gh(self):
         """The 1H gyromagnetic ratio."""
 
-        return gH
+        # Old, low precision gyromagnetic ratio.
+        #return 26.7522e7
+
+        return 26.7522212e7
 
 
     def gn(self):
         """The 15N gyromagnetic ratio."""
 
-        return gN
+        return -2.7126e7
 
 
     def go(self):
         """The 17O gyromagnetic ratio."""
 
-        return gO
+        return -3.628e7
 
 
     def gp(self):
         """The 31P gyromagnetic ratio."""
 
-        return gP
+        return 1.0841e8
 
 
     def set_values(self, heteronuc):

Modified: branches/N_state_model/physical_constants.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/physical_constants.py?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================
--- branches/N_state_model/physical_constants.py (original)
+++ branches/N_state_model/physical_constants.py Mon Jan  7 13:51:39 2008
@@ -39,22 +39,3 @@
 # The length of the NH bond (default value).
 NH_BOND_LENGTH = 1.02 * 1e-10
 
-
-# Gyromagentic ratios.
-######################
-
-# 13C.
-gC = 6.728e7
-
-# 1H.
-#gH = 26.7522e7    # Old, low precision gyromagnetic ratio.
-gH = 26.7522212e7
-
-# 15N.
-gN = -2.7126e7
-
-# 17O.
-gO = -3.628e7
-
-# 31P.
-gP = 1.0841e8