Author: bugman Date: Sun Oct 1 07:32:19 2006 New Revision: 2596 URL: http://svn.gna.org/viewcvs/relax?rev=2596&view=rev Log: Ported the changes of r2595 of the 1.2 line into the 1.3 line. The command used was: $ svn merge -r2594:2595 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 This changes the CSA value in the sample scripts to -172 ppm. Modified: 1.3/sample_scripts/cv.py 1.3/sample_scripts/dasha.py 1.3/sample_scripts/diff_min.py 1.3/sample_scripts/full_analysis.py 1.3/sample_scripts/generate_ri.py 1.3/sample_scripts/jw_mapping.py 1.3/sample_scripts/map.py 1.3/sample_scripts/mf_multimodel.py 1.3/sample_scripts/model-free.py 1.3/sample_scripts/palmer.py 1.3/sample_scripts/remap.py Modified: 1.3/sample_scripts/cv.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/cv.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/cv.py (original) +++ 1.3/sample_scripts/cv.py Sun Oct 1 07:32:19 2006 @@ -43,7 +43,7 @@ # Set the bond length and CSA values. value.set(cv_runs[i][j], 1.02 * 1e-10, 'bond_length') - value.set(cv_runs[i][j], -170 * 1e-6, 'csa') + value.set(cv_runs[i][j], -172 * 1e-6, 'csa') # Select the preset model-free models. model_free.select_model(run=cv_runs[i][j], model=runs[i]) Modified: 1.3/sample_scripts/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/dasha.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/dasha.py (original) +++ 1.3/sample_scripts/dasha.py Sun Oct 1 07:32:19 2006 @@ -30,7 +30,7 @@ diffusion_tensor.init(name, 10e-9, fixed=1) #diffusion_tensor.init(name, (10e-9, 0, 0, 40, 30, 80), fixed=1) value.set(name, 1.02 * 1e-10, 'bond_length') - value.set(name, -170 * 1e-6, 'csa') + value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name) Modified: 1.3/sample_scripts/diff_min.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/diff_min.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/diff_min.py (original) +++ 1.3/sample_scripts/diff_min.py Sun Oct 1 07:32:19 2006 @@ -35,7 +35,7 @@ # Setup other values. diffusion_tensor.init(name, (1e-8, 1.0, 60, 290), param_types=1, spheroid_type='oblate', fixed=1) value.set(name, 1.02 * 1e-10, 'bond_length') - value.set(name, -170 * 1e-6, 'csa') + value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name) Modified: 1.3/sample_scripts/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/full_analysis.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/full_analysis.py (original) +++ 1.3/sample_scripts/full_analysis.py Sun Oct 1 07:32:19 2006 @@ -397,7 +397,7 @@ # Set the bond length and CSA values. value.set(name, 1.02 * 1e-10, 'bond_length') - value.set(name, -170 * 1e-6, 'csa') + value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name) Modified: 1.3/sample_scripts/generate_ri.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/generate_ri.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/generate_ri.py (original) +++ 1.3/sample_scripts/generate_ri.py Sun Oct 1 07:32:19 2006 @@ -60,7 +60,7 @@ sequence.add(name, 1, 'ALA') # Set the CSA and bond lengths. -value.set(name, value=-170e-6, param='CSA') +value.set(name, value=-172e-6, param='CSA') value.set(name, value=1.02e-10, param='r') # Set the model-free parameters. Modified: 1.3/sample_scripts/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/jw_mapping.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/jw_mapping.py (original) +++ 1.3/sample_scripts/jw_mapping.py Sun Oct 1 07:32:19 2006 @@ -17,7 +17,7 @@ # Set the bond length and CSA values. value.set(name, 1.02 * 1e-10, 'bond_length') -value.set(name, -170 * 1e-6, 'csa') +value.set(name, -172 * 1e-6, 'csa') # Select the frequency. jw_mapping.set_frq(name, frq=600.0 * 1e6) Modified: 1.3/sample_scripts/map.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/map.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/map.py (original) +++ 1.3/sample_scripts/map.py Sun Oct 1 07:32:19 2006 @@ -21,7 +21,7 @@ # Setup other values. diffusion_tensor.init(name, 1e-8) value.set(name, 1.02 * 1e-10, 'bond_length') -value.set(name, -170 * 1e-6, 'csa') +value.set(name, -172 * 1e-6, 'csa') value.set(name, 2048.0e-12, 'te') # Select the model-free model. Modified: 1.3/sample_scripts/mf_multimodel.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/mf_multimodel.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/mf_multimodel.py (original) +++ 1.3/sample_scripts/mf_multimodel.py Sun Oct 1 07:32:19 2006 @@ -30,7 +30,7 @@ diffusion_tensor.init(name, 1e-8, fixed=1) #diffusion_tensor.init(name, (1e-8, 1.0, 60, 290), param_types=0, spheroid_type='oblate', fixed=0) value.set(name, 1.02 * 1e-10, 'bond_length') - value.set(name, -170 * 1e-6, 'csa') + value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name) Modified: 1.3/sample_scripts/model-free.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/model-free.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/model-free.py (original) +++ 1.3/sample_scripts/model-free.py Sun Oct 1 07:32:19 2006 @@ -26,7 +26,7 @@ #diffusion_tensor.init(name, (2e-8, 1.3, 60, 290), param_types=0, spheroid_type='prolate', fixed=1) #diffusion_tensor.init(name, (9e-8, 0.5, 0.3, 60, 290, 100), fixed=0) value.set(name, 1.02 * 1e-10, 'bond_length') -value.set(name, -170 * 1e-6, 'csa') +value.set(name, -172 * 1e-6, 'csa') #value.set(name, 1.0, 's2f') #value.set(name, 0.970, 's2') #value.set(name, 2048e-12, 'te') Modified: 1.3/sample_scripts/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/palmer.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/palmer.py (original) +++ 1.3/sample_scripts/palmer.py Sun Oct 1 07:32:19 2006 @@ -40,7 +40,7 @@ # Setup other values. diffusion_tensor.init(name, 1e-8) value.set(name, 1.02 * 1e-10, 'bond_length') - value.set(name, -170 * 1e-6, 'csa') + value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name) Modified: 1.3/sample_scripts/remap.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/remap.py?rev=2596&r1=2595&r2=2596&view=diff ============================================================================== --- 1.3/sample_scripts/remap.py (original) +++ 1.3/sample_scripts/remap.py Sun Oct 1 07:32:19 2006 @@ -43,7 +43,7 @@ # Setup other values. diffusion_tensor.init(name, 1e-8) value.set(name, 1.02 * 1e-10, 'bond_length') -value.set(name, -170 * 1e-6, 'csa') +value.set(name, -172 * 1e-6, 'csa') # Select the model-free model. model_free.select_model(run=name, model=name)