diff --git a/script/users/DepthProfile-MilosB.py b/script/users/DepthProfile-MilosB.py index 5e078786..64f666f8 100644 --- a/script/users/DepthProfile-MilosB.py +++ b/script/users/DepthProfile-MilosB.py @@ -25,7 +25,7 @@ RefCurrentAveraging.write(1660) set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) try: - """# C + # C Scienta.getLowEnergy().write(190.0) Scienta.getHighEnergy().write(222.0) Scienta.getStepSize().write(0.1) @@ -34,13 +34,13 @@ try: Eph.move(505.0) theta = [-9.0,6.0,21.0,31.0,41.0,51.0,61.0,71.0] - x = [2.37*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] - y = [2.37*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] + x = [2.42*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] + y = [2.42*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] VECTOR = [[theta[i], x[i], y[i]] for i in range(len(theta))] - vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout)""" + vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout) # C - to avoid Zn2p secondary features - Scienta.getLowEnergy().write(200.0) + Scienta.getLowEnergy().write(210.0) Scienta.getHighEnergy().write(240.0) Scienta.getStepSize().write(0.1) Scienta.getStepTime().write(0.2) @@ -48,8 +48,8 @@ try: Eph.move(520.0) theta = [-9.0,6.0,21.0,31.0,41.0,51.0,61.0,71.0] - x = [2.57*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] - y = [2.57*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] + x = [2.42*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] + y = [2.42*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] VECTOR = [[theta[i], x[i], y[i]] for i in range(len(theta))] vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout) @@ -81,7 +81,7 @@ try: VECTOR = [[theta[i], x[i], y[i]] for i in range(len(theta))] vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout)""" - """# Mn + # Mn Scienta.getLowEnergy().write(175.0) Scienta.getHighEnergy().write(235.0) Scienta.getStepSize().write(0.1) @@ -90,9 +90,9 @@ try: Eph.move(860.0) theta = [-9.0,6.0,21.0,31.0,41.0,51.0,61.0,71.0] - x = [2.57*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] - y = [2.57*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] + x = [2.42*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] + y = [2.42*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] VECTOR = [[theta[i], x[i], y[i]] for i in range(len(theta))] - vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout)""" + vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout) finally: after_scan()