r3319 - in /1.2: ./ sample_scripts/full_analysis.py -- June 27, 2007 - 17:22

Author: bugman
Date: Wed Jun 27 17:22:14 2007
New Revision: 3319

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

........
  r3318 | bugman | 2007-06-27 14:43:14 +0200 (Wed, 27 Jun 2007) | 7 lines
  
  Another bug fix for the automatic looping in the full_analysis.py script.
  
  This bug was reported by Douglas Kojetin <douglas dot kojetin att gmail dot 
com> in the post located
  at https://mail.gna.org/public/relax-users/2007-06/msg00022.html, although 
the suggested code was
  highly modified.
........

Modified:
    1.2/   (props changed)
    1.2/sample_scripts/full_analysis.py

Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 27 17:22:14 2007
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318

Modified: 1.2/sample_scripts/full_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sample_scripts/full_analysis.py?rev=3319&r1=3318&r2=3319&view=diff
==============================================================================
--- 1.2/sample_scripts/full_analysis.py (original)
+++ 1.2/sample_scripts/full_analysis.py Wed Jun 27 17:22:14 2007
@@ -227,6 +227,8 @@
 
                     # Create the final run (for model selection and final 
optimisation).
                     name = 'final'
+                    if name in self.relax.data.run_names:
+                        run.delete(name)
                     run.create(name, 'mf')
 
                     # Model selection.
@@ -530,6 +532,8 @@
 
         for name in self.runs:
             # Create the run.
+            if name in self.relax.data.run_names:
+                run.delete(name)
             run.create(name, 'mf')
 
             # Load the sequence.