Closedown

2018-09-03 11:31:31 +02:00
parent d76e4a9215
commit ddc34ba164
3 changed files with 17 additions and 8 deletions
@@ -2,18 +2,27 @@
 # Area Scan: Multiple positioners, each one is one dimension.
 ################################################################################################### 

+# Scan parameters
+Y_start = -1.0
+Z_start =  9.0
+Y_end =   1.0
+Z_end =  12.0
+Y_steps = 8
+Z_steps = 8
+# NPLC (integration time) value for the Keithleys
 NPLC=10

 caput('X11MA-KEI10:NPLC', NPLC)
 caput('X11MA-KEI11:NPLC', NPLC)
 caput('X11MA-KEI12:NPLC', NPLC)

-TRY.write(-1)
-TRZ.write(9)
+# move Y and Z motors to start position
+TRY.write(Y_start)
+TRZ.write(Z_start)

-time.sleep(5)
+cawait(TRY_RBV,Y_start)
+cawait(TRZ_RBV,Z_start)

-r1 = ascan((TRY,TRZ), (Keithley_1_raw,Keithley_2_raw,Keithley_3_raw), (-1.0,9.0), (1.0,12.0), (7,7), 3.0, False, 1, True)
+# run the area scan
+r1 = ascan((TRY,TRZ), (Keithley_1_raw,Keithley_2_raw,Keithley_3_raw), (Y_start,Z_start), (Y_end,Z_end), (Y_steps-1,Z_steps-1), 3.0, False, 1, True)

-TRY.write(-1)
-TRZ.write(9)
@@ -1,6 +1,6 @@
 file_prefix = time.strftime("%Y%m%d")
 # CHANGE THE PATH IN THE OTH
-input_path =  "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/LMNO/sample08_LMNO_4_1V/"+file_prefix+"/"
+input_path =  "/sls/X11MA/data/X11MA/Data1/public/scans/1809_Armin/"+file_prefix+"/"
 #input_path =  "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/"

 output_path = input_path 
@@ -12,7 +12,7 @@ E4 = [680, 720, 6, 0] # F K-edge
 E5 = [845, 885, 6, 0] # Ni L-edge
 E6 = [772, 805, 6, 0] # Co L-edge
 E7 = [500, 900, 10, 0] # Survey
-E8 = [700, 740, 6, 0] # Fe L-edge
+E8 = [700, 740, 2, 0] # Fe L-edge
 #E  = [E5,E6,E4,E2,E1,E7]

 run('EnergyMultiScan.py',E8)