r19288 - in /branches/relax_disp: ./ test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py -- April 02, 2013 - 11:07

Author: bugman
Date: Tue Apr  2 11:07:15 2013
New Revision: 19288

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

........
  r19286 | bugman | 2013-04-02 11:06:35 +0200 (Tue, 02 Apr 2013) | 14 lines
  
  Manually merged r19282 from the 2.2 development line to trunk.
  
  The command used was:
  svn merge -r19282:19283 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/2.2 
.
  
  .....
    r19283 | bugman | 2013-04-02 10:58:10 +0200 (Tue, 02 Apr 2013) | 3 lines
    Changed paths:
       M 
/branches/2.2/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
    
    Decreased the number of Monte Carlo simulations in the 
Ct.test_bug_20674_ct_analysis_failure system test.
  .....
........

Modified:
    branches/relax_disp/   (props changed)
    
branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  2 11:07:15 2013
@@ -1,1 +1,1 @@
-/trunk:1-19285
+/trunk:1-19287

Modified: 
branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py?rev=19288&r1=19287&r2=19288&view=diff
==============================================================================
--- 
branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
 (original)
+++ 
branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
 Tue Apr  2 11:07:15 2013
@@ -49,7 +49,7 @@
 calc()
 
 # Monte Carlo simulations.
-monte_carlo.setup(number=500)
+monte_carlo.setup(number=10)
 monte_carlo.create_data()
 calc()
 monte_carlo.error_analysis()