Author: bugman Date: Thu Jun 6 17:39:55 2013 New Revision: 19897 URL: http://svn.gna.org/viewcvs/relax?rev=19897&view=rev Log: The relax_disp.select_model user function now operates without the spectrometer frequency being set. The special loop_frq() function is now used as this can handle missing spectrometer frequency information. Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/__init__.py?rev=19897&r1=19896&r2=19897&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp/__init__.py (original) +++ branches/relax_disp/specific_analyses/relax_disp/__init__.py Thu Jun 6 17:39:55 2013 @@ -816,14 +816,14 @@ elif model == MODEL_NOREX: print("The model for no chemical exchange relaxation.") params = [] - for i in range(cdp.spectrometer_frq_count): + for frq in loop_frq(): params.append('r2') # LM63 model. elif model == MODEL_LM63: print("The Luz and Meiboom (1963) 2-site fast exchange model.") params = [] - for i in range(cdp.spectrometer_frq_count): + for frq in loop_frq(): params.append('r2') params += ['phi_ex', 'kex'] @@ -831,7 +831,7 @@ elif model == MODEL_CR72: print("The Carver and Richards (1972) 2-site model for all time scales.") params = [] - for i in range(cdp.spectrometer_frq_count): + for frq in loop_frq(): params.append('r2') params += ['pA', 'dw', 'kex'] @@ -839,7 +839,7 @@ elif model == MODEL_M61: print("The Meiboom (1961) 2-site fast exchange model for R1rho-type experiments.") params = [] - for i in range(cdp.spectrometer_frq_count): + for frq in loop_frq(): params.append('r2') params += ['phi_ex', 'kex']