Author: bugman Date: Tue May 20 16:19:30 2014 New Revision: 23260 URL: http://svn.gna.org/viewcvs/relax?rev=23260&view=rev Log: Converted the Mf.test_opendx_s2_te_rex system test into a GUI test. This is to demonstrate bug #22035 (https://gna.org/bugs/?22035), the dx.map user function being broken in the GUI. Modified: trunk/test_suite/gui_tests/model_free.py trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py Modified: trunk/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/model_free.py?rev=23260&r1=23259&r2=23260&view=diff ============================================================================== --- trunk/test_suite/gui_tests/model_free.py (original) +++ trunk/test_suite/gui_tests/model_free.py Tue May 20 16:19:30 2014 @@ -518,6 +518,16 @@ self.assertAlmostEqual(interatom.r, 1.02 * 1e-10) + def test_opendx_s2_te_rex(self): + """Mapping the {S2, te, Rex} chi2 space through the OpenDX user function dx.map(). + + This is to catch U{bug #22035<https://gna.org/bugs/?22035>}, the dx.map user function being broken in the GUI. + """ + + # Execute the script. + self.script_exec(status.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'opendx_s2_te_rex.py') + + class Fake_right_click: """Simulate a grid_cell_right_click event .""" Modified: trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py?rev=23260&r1=23259&r2=23260&view=diff ============================================================================== --- trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py (original) +++ trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py Tue May 20 16:19:30 2014 @@ -12,34 +12,34 @@ path = status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'S2_0.970_te_2048_Rex_0.149' # Set up the 15N spins. -sequence.read(file='noe.500.out', dir=path, res_num_col=1, res_name_col=2) -spin.name('N') -spin.element('N') -spin.isotope('15N', spin_id='@N') +self._execute_uf(uf_name='sequence.read', file='noe.500.out', dir=path, res_num_col=1, res_name_col=2) +self._execute_uf(uf_name='spin.name', name='N') +self._execute_uf(uf_name='spin.element', element='N') +self._execute_uf(uf_name='spin.isotope', isotope='15N', spin_id='@N') # Read the relaxation data. -relax_data.read(ri_id='R1_600', ri_type='R1', frq=600.0*1e6, file='r1.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) -relax_data.read(ri_id='R2_600', ri_type='R2', frq=600.0*1e6, file='r2.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) -relax_data.read(ri_id='NOE_600', ri_type='NOE', frq=600.0*1e6, file='noe.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) -relax_data.read(ri_id='R1_500', ri_type='R1', frq=500.0*1e6, file='r1.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) -relax_data.read(ri_id='R2_500', ri_type='R2', frq=500.0*1e6, file='r2.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) -relax_data.read(ri_id='NOE_500', ri_type='NOE', frq=500.0*1e6, file='noe.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='R1_600', ri_type='R1', frq=600.0*1e6, file='r1.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='R2_600', ri_type='R2', frq=600.0*1e6, file='r2.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='NOE_600', ri_type='NOE', frq=600.0*1e6, file='noe.600.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='R1_500', ri_type='R1', frq=500.0*1e6, file='r1.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='R2_500', ri_type='R2', frq=500.0*1e6, file='r2.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) +self._execute_uf(uf_name='relax_data.read', ri_id='NOE_500', ri_type='NOE', frq=500.0*1e6, file='noe.500.out', dir=path, res_num_col=1, res_name_col=2, data_col=3, error_col=4) # Initialise the diffusion tensor. -diffusion_tensor.init(1e-8, fixed=True) +self._execute_uf(uf_name='diffusion_tensor.init', params=1e-8, fixed=True) # Create all attached protons. -sequence.attach_protons() +self._execute_uf(uf_name='sequence.attach_protons') # Define the magnetic dipole-dipole relaxation interaction. -interatom.define(spin_id1='@N', spin_id2='@H', direct_bond=True) -interatom.set_dist(spin_id1='@N', spin_id2='@H', ave_dist=1.02 * 1e-10) +self._execute_uf(uf_name='interatom.define', spin_id1='@N', spin_id2='@H', direct_bond=True) +self._execute_uf(uf_name='interatom.set_dist', spin_id1='@N', spin_id2='@H', ave_dist=1.02 * 1e-10) # Define the CSA relaxation interaction. -value.set(N15_CSA, 'csa') +self._execute_uf(uf_name='value.set', val=N15_CSA, param='csa') # Select the model. -model_free.select_model(model='m4') +self._execute_uf(uf_name='model_free.select_model', model='m4') # Map the space. -dx.map(params=['s2', 'te', 'rex'], spin_id=':2@N', inc=2, lower=[0.0, 0, 0], upper=[1.0, 10000e-12, 3.0 / (2.0 * pi * 600000000.0)**2], point=[0.970, 2048.0e-12, 0.149 / (2.0 * pi * 600000000.0)**2], file_prefix='devnull', point_file='devnull') +self._execute_uf(uf_name='dx.map', params=['s2', 'te', 'rex'], spin_id=':2@N', inc=2, lower=[0.0, 0, 0], upper=[1.0, 10000e-12, 3.0 / (2.0 * pi * 600000000.0)**2], point=[0.970, 2048.0e-12, 0.149 / (2.0 * pi * 600000000.0)**2], file_prefix='devnull', point_file='devnull')