r14094 - /branches/gui_testing/generic_fns/minimise.py -- August 03, 2011 - 21:32

Author: bugman
Date: Wed Aug  3 21:32:57 2011
New Revision: 14094

URL: http://svn.gna.org/viewcvs/relax?rev=14094&view=rev
Log:
The Monte Carlo simulation number is now stored in the auto-analysis part of 
the status object.

This is only when an auto-analysis is running.


Modified:
    branches/gui_testing/generic_fns/minimise.py

Modified: branches/gui_testing/generic_fns/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/minimise.py?rev=14094&r1=14093&r2=14094&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/minimise.py (original)
+++ branches/gui_testing/generic_fns/minimise.py Wed Aug  3 21:32:57 2011
@@ -61,13 +61,19 @@
                 print(("Simulation " + repr(i+1)))
 
             # Status.
-            status.mc_number = i
+            if status.current_analysis:
+                status.auto_analysis[status.current_analysis].mc_number = i
+            else:
+                status.mc_number = i
 
             # Calculation.
             calculate(verbosity=verbosity-1, sim_index=i)
 
         # Unset the status.
-        status.mc_number = None
+        if status.current_analysis:
+            status.auto_analysis[status.current_analysis].mc_number = None
+        else:
+            status.mc_number = None
 
     # Minimisation.
     else:
@@ -114,13 +120,19 @@
                 print(("Simulation " + repr(i+1)))
 
             # Status.
-            status.mc_number = i
+            if status.current_analysis:
+                status.auto_analysis[status.current_analysis].mc_number = i
+            else:
+                status.mc_number = i
 
             # Optimisation.
             grid_search(lower=lower, upper=upper, inc=inc, 
constraints=constraints, verbosity=verbosity-1, sim_index=i)
 
         # Unset the status.
-        status.mc_number = None
+        if status.current_analysis:
+            status.auto_analysis[status.current_analysis].mc_number = None
+        else:
+            status.mc_number = None
 
     # Grid search.
     else:
@@ -177,13 +189,19 @@
                 print(("Simulation " + repr(i+1)))
 
             # Status.
-            status.mc_number = i
+            if status.current_analysis:
+                status.auto_analysis[status.current_analysis].mc_number = i
+            else:
+                status.mc_number = i
 
             # Optimisation.
             minimise(min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, max_iterations=max_iterations, 
constraints=constraints, scaling=scaling, verbosity=verbosity-1, sim_index=i)
 
         # Unset the status.
-        status.mc_number = None
+        if status.current_analysis:
+            status.auto_analysis[status.current_analysis].mc_number = None
+        else:
+            status.mc_number = None
 
     # Standard minimisation.
     else: