Author: bugman Date: Wed Mar 27 13:03:12 2013 New Revision: 19180 URL: http://svn.gna.org/viewcvs/relax?rev=19180&view=rev Log: Ported r8329 from the old relax_disp branch into the new branch. The command used was: svn merge -r8328:8329 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses ..... r8329 | semor | 2009-01-08 00:23:28 +0100 (Thu, 08 Jan 2009) | 5 lines Changed paths: M /branches/relax_disp/specific_fns/relax_disp.py Renamed 'cdp.frq' to 'cdp.cpmg_frqs' so it is not confusing with the spectrometer frequency. Indeed, 'cdp.cpmg_frqs' points to the CPMG pulse train frequency (nu_cpmg). ..... Modified: branches/relax_disp/specific_analyses/relax_disp.py Modified: branches/relax_disp/specific_analyses/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19180&r1=19179&r2=19180&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp.py (original) +++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 13:03:12 2013 @@ -191,18 +191,18 @@ index = cdp.spectrum_ids.index(spectrum_id) # Initialise the global CPMG frequency data structure if needed. - if not hasattr(cdp, 'frq'): - cdp.frq = [None] * len(cdp.spectrum_ids) + if not hasattr(cdp, 'cpmg_frqs'): + cdp.cpmg_frqs = [None] * len(cdp.spectrum_ids) # Index not present in the global CPMG frequency data structure. while 1: - if index > len(cdp.frq) - 1: - cdp.frq.append(None) + if index > len(cdp.cpmg_frqs) - 1: + cdp.cpmg_frqs.append(None) else: break # Add the frequency at the correct position. - cdp.frq[index] = frq + cdp.cpmg_frqs[index] = frq def create_mc_data(self, spin_id):