Author: semor Date: Sun Jan 11 21:29:53 2009 New Revision: 8396 URL: http://svn.gna.org/viewcvs/relax?rev=8396&view=rev Log: Changed the object names so they are lower case as they should be, based on the rest of the code.
Made the equivalent change in the function assemble_param_vector() to allow the system-test to go further.. This was spotted by Ed in a post at: https://mail.gna.org/public/relax-devel/2009-01/msg00058.html (Message-id: <[email protected]>) Modified: branches/relax_disp/specific_fns/relax_disp.py Modified: branches/relax_disp/specific_fns/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_disp.py?rev=8396&r1=8395&r2=8396&view=diff ============================================================================== --- branches/relax_disp/specific_fns/relax_disp.py (original) +++ branches/relax_disp/specific_fns/relax_disp.py Sun Jan 11 21:29:53 2009 @@ -62,7 +62,7 @@ # Loop over the model parameters. for i in xrange(len(spin.params)): # Transversal relaxation rate. - if spin.params[i] == 'R2': + if spin.params[i] == 'r2': if sim_index != None: param_vector.append(spin.r2_sim[sim_index]) elif spin.r2 == None: @@ -71,7 +71,7 @@ param_vector.append(spin.r2) # Chemical exchange contribution to 'R2'. - elif spin.params[i] == 'Rex': + elif spin.params[i] == 'rex': if sim_index != None: param_vector.append(spin.rex_sim[sim_index]) elif spin.rex == None: @@ -89,7 +89,7 @@ param_vector.append(spin.kex) # Transversal relaxation rate for state A. - if spin.params[i] == 'R2A': + if spin.params[i] == 'r2a': if sim_index != None: param_vector.append(spin.r2a_sim[sim_index]) elif spin.r2a == None: @@ -98,7 +98,7 @@ param_vector.append(spin.r2a) # Exchange rate from state A to state B. - if spin.params[i] == 'kA': + if spin.params[i] == 'ka': if sim_index != None: param_vector.append(spin.ka_sim[sim_index]) elif spin.ka == None: @@ -1032,15 +1032,15 @@ | Data type | Object name | Patterns | |___________________________________________________|________________|__________________________| | | | | - | Transversal relaxation rate | 'R2' | '^[Rr]2$' | + | Transversal relaxation rate | 'r2' | '^[Rr]2$' | | | | | - | Chemical exchange contribution to 'R2' | 'Rex' | '^[Rr]ex$' | + | Chemical exchange contribution to 'R2' | 'rex' | '^[Rr]ex$' | | | | | | Exchange rate | 'kex' | '^[Kk]ex$' | | | | | - | Transversal relaxation rate for state A | 'R2A' | '^[Rr]2A$' | + | Transversal relaxation rate for state A | 'r2a' | '^[Rr]2A$' | | | | | - | Exchange rate from state A to state B | 'kA' | '^[Kk]A$' | + | Exchange rate from state A to state B | 'ka' | '^[Kk]A$' | | | | | | Chemical shift difference between states A and B | 'dw' | '^[Dd]w$' | | | | | _______________________________________________ relax (http://nmr-relax.com) This is the relax-commits mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits
