From 34c56d7822e414bde7e424d0de91ba2e0006688f Mon Sep 17 00:00:00 2001
From: gac-ISS <gac-ISS@MPC2631.psi.ch>
Date: Wed, 18 Jan 2023 17:07:49 +0100
Subject: [PATCH]

---
 config/variables.properties | 6 +++---
 plugins/XPS.java            | 9 ++++++++-
 script/templates/XPS.py     | 4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 32ac6b1..b62c7e9 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Wed Jan 18 15:55:04 CET 2023
+#Wed Jan 18 17:07:27 CET 2023
 LastRunDate=230118
-FileSequentialNumber=189
-DaySequentialNumber=51
+FileSequentialNumber=197
+DaySequentialNumber=59
diff --git a/plugins/XPS.java b/plugins/XPS.java
index c52266b..a8c04bc 100644
--- a/plugins/XPS.java
+++ b/plugins/XPS.java
@@ -143,7 +143,14 @@ public class XPS extends ScriptProcessor {
             }
         
             try{
-                textCurScan.setText(getGlobalVar("CURRENT_REGION").toString());
+                Object region = getGlobalVar("CURRENT_REGION");
+                Object pass = getGlobalVar("CURRENT_PASS");
+                Number no_pases = (Number) getGlobalVar("PASSES");
+                String text = region.toString();
+                if (no_pases.intValue()>1){
+                    text = text + " [" + pass + "]";
+                }
+                textCurScan.setText(text);
             } catch(Exception ex){
                 getLogger().log(Level.FINER, null, ex);            
                 textCurScan.setText("");
diff --git a/script/templates/XPS.py b/script/templates/XPS.py
index 5cc006d..6b6a6c9 100644
--- a/script/templates/XPS.py
+++ b/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)