r24068 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 18, 2014 - 10:14

Author: bugman
Date: Wed Jun 18 10:14:44 2014
New Revision: 24068

URL: http://svn.gna.org/viewcvs/relax?rev=24068&view=rev
Log:
More stability fixes for the relaxation dispersion target function 
initialisation.

The target function can now be initialised when the r1 and chemical_shift 
arguments are None.


Modified:
    branches/disp_spin_speed/target_functions/relax_disp.py

Modified: branches/disp_spin_speed/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/target_functions/relax_disp.py?rev=24068&r1=24067&r2=24068&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Wed Jun 18 
10:14:44 2014
@@ -284,12 +284,14 @@
                     self.relax_times[ei, si, mi, :] = relax_time
 
                     # Fill r1.
-                    r1_l = r1[si][mi]
-                    self.r1[ei, si, mi, :] = r1_l
+                    if r1 != None:
+                        r1_l = r1[si][mi]
+                        self.r1[ei, si, mi, :] = r1_l
 
                     # Fill chemical shift.
-                    chemical_shift = chemical_shifts[ei][si][mi]
-                    self.chemical_shifts[ei, si, mi, :] = chemical_shift
+                    if chemical_shifts != None:
+                        chemical_shift = chemical_shifts[ei][si][mi]
+                        self.chemical_shifts[ei, si, mi, :] = chemical_shift
 
                     # The inverted relaxation delay.
                     if model in [MODEL_B14, MODEL_B14_FULL, MODEL_MMQ_CR72, 
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
MODEL_NS_R1RHO_3SITE_LINEAR]: