Closedown

script/XPSSpectrum.py

@@ -4,11 +4,6 @@
 #    save_scienta_image
 #
 #    skip_iteration: if set to 1 then skips after end of current iteration
-print ranges
-print pass_energy
-print save_scienta_image
-print ENDSCAN
-1/0
 
 from ch.psi.pshell.data.LayoutDefault import ATTR_WRITABLE_DIMENSION as ATTR_WRITABLE_DIMENSION
 import org.jfree.chart.axis.NumberAxis as NumberAxis
@@ -103,14 +98,21 @@ try:
         cur_iteration = 0 
         skip_iteration = False  
         vars = ranges[cur_range].vars
+        region_name = None
 
         #Check if photon energy is defined
         
         if len(vars) > 2:
             eph = vars[3]
-            if eph and (not math.isnan(eph)):
-                Eph.move(eph)
-                time.sleep(5.0)
+            #if eph and (not math.isnan(eph)):
+            #    Eph.move(eph)
+            #    time.sleep(5.0)
+            if len(vars)>4:
+                region_name = vars[4]
+        print region_name
+        if region_name:
+            set_attribute(path, "Region Name", region_name)        
+        1/0
               
         Scienta.lowEnergy.write(adjusted_ranges[cur_range][0])
         Scienta.highEnergy.write(adjusted_ranges[cur_range][1])
@@ -188,6 +190,8 @@ try:
                 set_attribute(path, "Pass Energy",pass_energy)
                 set_attribute(path, "Readables", ["ScientaSpectrum","ScientaImage"] if save_scienta_image else ["ScientaSpectrum",])
                 set_attribute(path, "Writables", ["ScientaChannels",])
+                if region_name:
+                    set_attribute(path, "Region Name", region_name)
                 create_diag_datasets(path)
                 append_diag_datasets(path)