script/templates/XPS.py

@@ -35,6 +35,7 @@ print "PASSES: ", PASSES
 
 CURRENT_REGION = ""
 CURRENT_INDEX = -1
+CURRENT_PASS = 1
 PLOT_TYPES={"spectrum":1, "energy":1}
 SEQUENTIAL=False
 DEBUG=False
@@ -98,11 +99,12 @@ def scan(region):
     if DEBUG: print "Starting scan region ", region
     name=REGIONS[region][0]
     def before_pass(pass_num):        
-        global scanning
+        global scanning, CURRENT_PASS
         if DEBUG: print "Waiting for pass: " , pass_num, " on region: ", region 
         while (CURRENT_INDEX != (region-1)) or scanning:
             time.sleep(0.1)
         scanning = True
+        CURRENT_PASS = pass_num
         if DEBUG: print "Starting pass: " , pass_num, " on region: ", region
         set_region_index(region)