diff --git a/script/users/TUM_PhD.py b/script/users/TUM_PhD.py index b12f9da2..3e90c793 100644 --- a/script/users/TUM_PhD.py +++ b/script/users/TUM_PhD.py @@ -10,10 +10,10 @@ MOTORS = [Eph] #200eV : KE = 70eV for Ge 3p POSITIONS_B = [200] -for nn in range(56): +for nn in range(1): POSITIONS_B.append(POSITIONS_B[-1]+4) # BORON 1s -REGION_B = {'name': 'Ge 1s peak+tail', 'elo': 60., 'ehi': 85., 'estep': 0.12, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} +REGION_B = {'name': 'Ge 3s peak+tail', 'elo': 99., 'ehi': 114., 'estep': 1, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS_B = [REGION_B] # XSP check for beam damage @@ -172,7 +172,12 @@ try: setup_live_plots(REGIONS_B) task = fork(update_live_plots) # theta (polar), phi (azimuth), x, y, z - sample_pos = [ [-9.1,-105,0.4, 0.00, 115.0]] + sample_pos = [[-9.1,-105,0.5, 0.0, 115.0], + [21,-105,0.8, 0.1, 115.0], + [21,-75, 0.8, 0.1, 115.0], + [51,-105,0.45, 1.4, 115.0], + [51,-75, 0.45, 1.4, 115.0], + [-9.1,-75,0.5, 0.0, 115.0]] for nn in sample_pos: polar = nn[0] azimuth = nn[1] @@ -180,7 +185,7 @@ try: ManipulatorY.move(nn[3]) ManipulatorZ.move(nn[4]) ManipulatorTheta.move(polar) - #ManipulatorPhi.move(azimuth) + ManipulatorPhi.move(azimuth) #do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD do_scan(MOTORS, POSITIONS_B, REGIONS_B, LATENCY, nn) #PhD