diff --git a/script/users/Granas/XPSSpectrum.py b/script/users/Granas/XPSSpectrum.py index f5861fd4..7a9c202c 100644 --- a/script/users/Granas/XPSSpectrum.py +++ b/script/users/Granas/XPSSpectrum.py @@ -6,15 +6,12 @@ starting the xps measurement Fermi edge of C1s test """ -#my debug -def my_debug(str_): - open("/sls/X03DA/data/gac-03da/Data1/2018/10/Granas/XPSstuff/commands/debugging.txt",'a').write(time.strftime("%H:%M")+" "+ str_+"\n") - print(str_) """ here the copy of XPSSpectrum starts """ +execfile("/sls/X03DA/data/gac-x03da/Data1/2018/10/Granas/XPSstuff/commands/pearlUtils.py") #Parameters (global variables): # ranges: list of RangeSelection havinf args = (step_size, step_time, iterations) @@ -35,30 +32,40 @@ skip_iteration = False ENDSCAN = True """ -cont ="" -command_path_tmp = "/sls/X03DA/data/gac-x03da/Data1/2018/10/Granas/XPSstuff/commands/set_measure.txt" -if os.path.exists(command_path_tmp): - cont = open(command_path_tmp).read() - +cont = readCommand() ranges = [] - select_edge_tmp = cont - - pass_energy = 20 #O1s #save_scienta_image = True - skip_iteration = False ENDSCAN = True +writeCommand("test") +time.sleep(2) # (eph, min, max, step, time, iter) -if "O1s" in select_edge_tmp: - pass_energy = 50 #C1s - ranges.append((650.0, 645., 647.0, 0.1, 0.2, 10)) # O1s -elif "C1s" in select_edge_tmp: - ranges.append((390.0, 384.4, 387.0, 0.1, 0.2, 20)) # C1s +if "C1s" in select_edge_tmp: + mprint("___starting FE_C1s measure___") + loadParameterset(pearlU_path+"settings/screw_GE_pos.txt") + range1 = getParameterset(pearlU_path+"settings/FE_C1s.txt") + waitForEnergy(range1[0]) + waitForGroup("mov-") + print range1 +elif "O1s" in select_edge_tmp: + mprint("___starting FE_O1s measure___") + loadParameterset(pearlU_path+"settings/screw_GE_pos.txt") + range1 = getParameterset(pearlU_path+"settings/FE_O1s.txt") + waitForEnergy(range1[0]) + waitForGroup("mov-") + print range1 +elif "test" in select_edge_tmp: + range1 = getParameterset(pearlU_path+"settings/FE_C1s.txt") + waitForEnergy(range1[0]) else: print "no command fount" + +##########HERE starts the action (prepared) + + from ch.psi.pshell.data.LayoutDefault import ATTR_WRITABLE_DIMENSION as ATTR_WRITABLE_DIMENSION cur_range = 0 @@ -157,6 +164,10 @@ finally: Scienta.update() task[0].cancel(True) if ENDSCAN: - after_scan() + after_scan() + -set_return(to_array(ret,'o')) \ No newline at end of file +set_return(to_array(ret,'o')) + +if "O1s" in select_edge_tmp: + writeCommand(" C1s ") \ No newline at end of file