r26076 - in /branches/frame_order_cleanup: ./ lib/ pipe_control/ pipe_control/structure/ specific_analyses/ specific_analyse... -- September 26, 2014

Author: bugman
Date: Fri Sep 26 19:19:44 2014
New Revision: 26076

URL: http://svn.gna.org/viewcvs/relax?rev=26076&view=rev
Log:
Merged revisions 26058-26062 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26058 | bugman | 2014-09-26 14:38:48 +0200 (Fri, 26 Sep 2014) | 6 lines
  
  Fixes for the lib.checks.Check object.
  
  The __call__() method keyword arguments **kargs needs to be processed 
inside the method to strip out
  the escalate argument.
........
  r26059 | bugman | 2014-09-26 14:45:05 +0200 (Fri, 26 Sep 2014) | 5 lines
  
  The default value of the escalate argument of the Check.__call__() method 
is now 2.
  
  This will cause the calls to the check_*() function/objects to default to 
raising RelaxErrors.
........
  r26060 | bugman | 2014-09-26 15:06:55 +0200 (Fri, 26 Sep 2014) | 16 lines
  
  Reverted r26053, as this is no longer the case.
  
  The command used was:
  svn merge -r26053:r26052 .
  
  .....
    r26053 | bugman | 2014-09-26 11:44:00 +0200 (Fri, 26 Sep 2014) | 5 lines
    Changed paths:
       M /trunk/test_suite/system_tests/bmrb.py
    
    Updated the Bmrb.test_bug_22703_display_empty system/GUI test.
    
    The RelaxError type is now different.
  .....
........
  r26061 | bugman | 2014-09-26 15:17:39 +0200 (Fri, 26 Sep 2014) | 6 lines
  
  Changed the behaviour of the lib.checks.Check object again.
  
  This time the registered function is stored rather than converted into a 
class instance method.
  That way the check_*() function-like objects do not need to accept the 
unused 'self' argument.
........
  r26062 | bugman | 2014-09-26 15:29:07 +0200 (Fri, 26 Sep 2014) | 5 lines
  
  The data pipe testing function has been converted to the strategy design 
pattern of the Check object.
  
  The function pipe_control.pipes.test() has also been renamed to 
check_pipe().
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/lib/checks.py
    branches/frame_order_cleanup/pipe_control/align_tensor.py
    branches/frame_order_cleanup/pipe_control/angles.py
    branches/frame_order_cleanup/pipe_control/bruker.py
    branches/frame_order_cleanup/pipe_control/chemical_shift.py
    branches/frame_order_cleanup/pipe_control/dasha.py
    branches/frame_order_cleanup/pipe_control/diffusion_tensor.py
    branches/frame_order_cleanup/pipe_control/eliminate.py
    branches/frame_order_cleanup/pipe_control/error_analysis.py
    branches/frame_order_cleanup/pipe_control/exp_info.py
    branches/frame_order_cleanup/pipe_control/fix.py
    branches/frame_order_cleanup/pipe_control/grace.py
    branches/frame_order_cleanup/pipe_control/interatomic.py
    branches/frame_order_cleanup/pipe_control/j_coupling.py
    branches/frame_order_cleanup/pipe_control/minimise.py
    branches/frame_order_cleanup/pipe_control/mol_res_spin.py
    branches/frame_order_cleanup/pipe_control/molmol.py
    branches/frame_order_cleanup/pipe_control/noesy.py
    branches/frame_order_cleanup/pipe_control/palmer.py
    branches/frame_order_cleanup/pipe_control/paramag.py
    branches/frame_order_cleanup/pipe_control/pcs.py
    branches/frame_order_cleanup/pipe_control/pipes.py
    branches/frame_order_cleanup/pipe_control/pymol_control.py
    branches/frame_order_cleanup/pipe_control/rdc.py
    branches/frame_order_cleanup/pipe_control/relax_data.py
    branches/frame_order_cleanup/pipe_control/results.py
    branches/frame_order_cleanup/pipe_control/selection.py
    branches/frame_order_cleanup/pipe_control/sequence.py
    branches/frame_order_cleanup/pipe_control/spectrometer.py
    branches/frame_order_cleanup/pipe_control/spectrum.py
    branches/frame_order_cleanup/pipe_control/structure/geometric.py
    branches/frame_order_cleanup/pipe_control/structure/main.py
    branches/frame_order_cleanup/pipe_control/value.py
    branches/frame_order_cleanup/specific_analyses/api.py
    branches/frame_order_cleanup/specific_analyses/consistency_tests/uf.py
    branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
    branches/frame_order_cleanup/specific_analyses/hybrid.py
    branches/frame_order_cleanup/specific_analyses/jw_mapping/uf.py
    branches/frame_order_cleanup/specific_analyses/model_free/uf.py
    branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
    branches/frame_order_cleanup/specific_analyses/n_state_model/uf.py
    branches/frame_order_cleanup/specific_analyses/noe/api.py
    branches/frame_order_cleanup/specific_analyses/noe/uf.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/api.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/cpmgfit.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/nessy.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/sherekhan.py
    branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py
    branches/frame_order_cleanup/specific_analyses/relax_fit/uf.py
    branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
    
branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_pipes.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/frame_order_cleanup/lib/checks.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/checks.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/align_tensor.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/angles.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/bruker.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/bruker.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/chemical_shift.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/chemical_shift.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/dasha.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/diffusion_tensor.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/eliminate.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/eliminate.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/error_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/error_analysis.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/exp_info.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/fix.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/fix.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/grace.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/interatomic.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/j_coupling.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/j_coupling.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/minimise.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/mol_res_spin.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/molmol.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/noesy.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/noesy.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/palmer.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/paramag.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/paramag.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/pcs.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/pipes.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/pymol_control.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/rdc.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/relax_data.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/results.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/selection.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/sequence.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/spectrometer.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/spectrometer.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/spectrum.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/structure/geometric.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/structure/main.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/pipe_control/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/value.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/api.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: 
branches/frame_order_cleanup/specific_analyses/consistency_tests/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/consistency_tests/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/hybrid.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/hybrid.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/jw_mapping/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/jw_mapping/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/model_free/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/model_free/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: 
branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/n_state_model/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/n_state_model/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/noe/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/noe/api.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/noe/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/noe/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/api.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/cpmgfit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/cpmgfit.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/data.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/nessy.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/nessy.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: 
branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: 
branches/frame_order_cleanup/specific_analyses/relax_disp/sherekhan.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/sherekhan.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/relax_fit/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_fit/uf.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/bmrb.py?rev=26076&r1=26075&r2=26076&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_pipes.py?rev=26076&r1=26075&r2=26076&view=diff
r26076 - in /branches/frame_order_cleanup: ./ lib/ pipe_control/ pipe_control/structure/ specific_analyses/ specific_analyse...

Header

Content

Related Messages
