diff --git a/script/users/DepthProfile-MilosB.py b/script/users/DepthProfile-MilosB.py index a2b5a88b..e6e35f55 100644 --- a/script/users/DepthProfile-MilosB.py +++ b/script/users/DepthProfile-MilosB.py @@ -34,26 +34,40 @@ try: Eph.move(505.0) theta = [-9.0,6.0,21.0,31.0,41.0,51.0,61.0,71.0] - x = [2.52*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] - y = [2.52*math.sin((th+9.0)*math.pi/180.0)-0.2 for th in theta] + 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] 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) - """# Zn + # C - to avoid Zn2p secondary features + Scienta.getLowEnergy().write(200.0) + Scienta.getHighEnergy().write(240.0) + Scienta.getStepSize().write(0.1) + Scienta.getStepTime().write(0.2) + Scienta.setIterations(4) + Eph.move(520.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] + 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) + + # Zn Scienta.getLowEnergy().write(175.0) Scienta.getHighEnergy().write(220.0) Scienta.getStepSize().write(0.1) Scienta.getStepTime().write(1.0) - Scienta.setIterations(4) + Scienta.setIterations(8) Eph.move(1240.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.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] 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) - # Fe + """# Fe Scienta.getLowEnergy().write(180.0) Scienta.getHighEnergy().write(225.0) Scienta.getStepSize().write(0.1) @@ -65,7 +79,7 @@ try: x = [2.52*math.cos((th+9.0)*math.pi/180.0)-2.67 for th in theta] y = [2.52*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)""" """# Mn Scienta.getLowEnergy().write(175.0)