Closedown

script/XPSSpectrum.py

@@ -75,8 +75,8 @@ try:
         data1d = [1,2,3,4,5]
         path="scan" + str(cur_range+1) + "/"
         save_dataset(path + "ScientaSpectrum", ydata)
-        save_dataset(path + "channels", xdata)
-        set_attribute(path + "channels", ATTR_WRITABLE_DIMENSION, 1)
+        save_dataset(path + "ScientaChannels", xdata)
+        set_attribute(path + "ScientaChannels", ATTR_WRITABLE_DIMENSION, 1)
         set_attribute(path, "Range Low", ranges[cur_range].min)
         set_attribute(path, "Range High", ranges[cur_range].max)
         set_attribute(path, "Step Time",vars[0])
@@ -84,7 +84,7 @@ try:
         set_attribute(path, "Pass Energy",pass_energy)
         set_attribute(path, "Iterations",cur_iteration+1)
         set_attribute(path, "Readables", ["ScientaSpectrum",])
-        set_attribute(path, "Writables", ["channels",])
+        set_attribute(path, "Writables", ["ScientaChannels",])
 
         create_diag_datasets(path)
         append_diag_datasets(path)
@@ -96,4 +96,7 @@ finally:
         Scienta.stop()
     Scienta.update()
     task[0].cancel(True)
+    if ENDSCAN:
+        after_scan()    
+    
 set_return(to_array(ret,'o'))