Author: bugman Date: Mon Jan 21 11:30:49 2008 New Revision: 4865 URL: http://svn.gna.org/viewcvs/relax?rev=4865&view=rev Log: Merged revisions 4858-4860 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r4858 | semor | 2008-01-18 22:41:55 +0100 (Fri, 18 Jan 2008) | 3 lines Uniformized the format of constants. ........ r4859 | bugman | 2008-01-21 11:15:41 +0100 (Mon, 21 Jan 2008) | 5 lines When None, the param variable is converted to a list of None with the length equal to that of val. This affects the generic_fns.value.set() function when no parameters are supplied. ........ r4860 | bugman | 2008-01-21 11:19:40 +0100 (Mon, 21 Jan 2008) | 6 lines Reverted the last change as param needs to be passed to set_non_spin_params() as None. The command used was: svn merge -r4859:4858 . ........ Modified: branches/N_state_model/ (props changed) branches/N_state_model/physical_constants.py Propchange: branches/N_state_model/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: branches/N_state_model/physical_constants.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/physical_constants.py?rev=4865&r1=4864&r2=4865&view=diff ============================================================================== --- branches/N_state_model/physical_constants.py (original) +++ branches/N_state_model/physical_constants.py Mon Jan 21 11:30:49 2008 @@ -25,10 +25,10 @@ # Planck's constant. -h = 6.62606876e-34 +h = 6.62606876 * 1e-34 # Dirac's constant. -h_bar = h / (2.0*pi) +h_bar = h / (2.0 * pi) # The magnetic constant or the permeability of vacuum. mu0 = 4.0 * pi * 1e-7 @@ -41,16 +41,16 @@ # The 13C gyromagnetic ratio. -g13C = 6.728e7 +g13C = 6.728 * 1e7 # The 1H gyromagnetic ratio. -g1H = 26.7522212e7 +g1H = 26.7522212 * 1e7 # The 15N gyromagnetic ratio. -g15N = -2.7126e7 +g15N = -2.7126 * 1e7 # The 17O gyromagnetic ratio. -g17O = -3.628e7 +g17O = -3.628 * 1e7 # The 31P gyromagnetic ratio. -g31P = 1.0841e8 +g31P = 10.841 * 1e7