r19898 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- June 06, 2013 - 17:47

Author: bugman
Date: Thu Jun  6 17:47:47 2013
New Revision: 19898

URL: http://svn.gna.org/viewcvs/relax?rev=19898&view=rev
Log:
The find_intensity_keys() function can now handle the reference spectrum.

This function in the specific_analyses.relax_disp.disp_data module was 
failing if the relaxation
time period for the reference spectrum was missing.  Time information 
shouldn't be needed for the
reference, so is no longer checked. 


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=19898&r1=19897&r2=19898&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Thu Jun  6 
17:47:47 2013
@@ -177,8 +177,15 @@
         if hasattr(cdp, 'spectrometer_frq'):
             frq2 = cdp.spectrometer_frq[id]
 
-        if frq2 == frq and disp_data[id] == point and cdp.relax_times[id] == 
time:
-            ids.append(id)
+        # Matching frequency and dispersion point.
+        if frq2 == frq and disp_data[id] == point:
+            # The reference point, so checking the time is pointless (and 
can fail as specifying the time should not be necessary).
+            if point == None:
+                ids.append(id)
+
+            # Matching time.
+            elif cdp.relax_times[id] == time:
+                ids.append(id)
 
     # Check for missing IDs.
     if len(ids) == 0: