r21834 - /trunk/specific_analyses/relax_disp/disp_data.py -- December 06, 2013 - 15:06

Author: bugman
Date: Fri Dec  6 15:06:18 2013
New Revision: 21834

URL: http://svn.gna.org/viewcvs/relax?rev=21834&view=rev
Log:
Reverted r21803 as this change was rubbish.

The command used was:
svn merge -r21803:r21802 .

.....
  r21803 | bugman | 2013-12-06 09:07:56 +0100 (Fri, 06 Dec 2013) | 5 lines
  Changed paths:
     M /trunk/specific_analyses/relax_disp/disp_data.py
  
  Neutralised the negative sign of the 15N gyromagnetic ratio in the 
return_offset_data() method.
  
  This is to match the behaviour of Dmitry Korzhnev's cpmg_fit software.
.....


Modified:
    trunk/specific_analyses/relax_disp/disp_data.py

Modified: trunk/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/disp_data.py?rev=21834&r1=21833&r2=21834&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/disp_data.py (original)
+++ trunk/specific_analyses/relax_disp/disp_data.py Fri Dec  6 15:06:18 2013
@@ -2636,11 +2636,6 @@
         spin = spins[si]
         spin_id = spin_ids[si]
 
-        # The sign to multiply shifts and offsets by.
-        sign = 1.0
-        if spin.isotope == '15N':
-            sign = -1.0
-
         # No data.
         shift = 0.0
         if hasattr(spin, 'chemical_shift'):
@@ -2673,7 +2668,7 @@
                     fields = return_spin_lock_nu1_single(exp_type=exp_type, 
frq=frq, offset=offset, ref_flag=False)
 
             # Convert the shift from ppm to rad/s and store it.
-            shifts[ei][si][mi] = sign * frequency_to_rad_per_s(frq=shift, 
B0=frq, isotope=spin.isotope)
+            shifts[ei][si][mi] = frequency_to_rad_per_s(frq=shift, B0=frq, 
isotope=spin.isotope)
 
             # Find a matching experiment ID.
             found = False
@@ -2701,7 +2696,7 @@
             # Store the offset in rad/s.  Only once and using the first key.
             if offsets[ei][si][mi][oi] == None:
                 if r1rho_flag and hasattr(cdp, 'spin_lock_offset'):
-                    offsets[ei][si][mi][oi] = sign * 
frequency_to_rad_per_s(frq=cdp.spin_lock_offset[id], B0=frq, 
isotope=spin.isotope)
+                    offsets[ei][si][mi][oi] = 
frequency_to_rad_per_s(frq=cdp.spin_lock_offset[id], B0=frq, 
isotope=spin.isotope)
                 else:
                     offsets[ei][si][mi][oi] = 0.0