diff --git a/config/energy_scan.properties b/config/energy_scan.properties index 238d322..bce15af 100644 --- a/config/energy_scan.properties +++ b/config/energy_scan.properties @@ -5,7 +5,7 @@ Cu=920.0;970.0;1.0;10.0;-2.3;-2.3 V&O_lin_FE1.25x1.25=505.0;560.0;2.0;10.0;-1.2;-2.5 V&O=505.0;560.0;2.0;10.0;-4.0;-7.0 V_FE_1.25x1.25=505.0;550.0;2.0;10.0;-5.0;-5.0 -Fe_FE1.25x1.25=680.0;750.0;0.5;10.0;-5.0;-4.0 +Fe_FE1.25x1.25=680.0;750.0;0.5;10.0;-2.0;-3.0 MCP test=778.0;779.0;0.2;0.0;-8.8;-9.5 Cr2x2=560.0;610.0;2.0;10.0;1.9;0.9 V=505.0;540.0;2.0;10.0;-7.5;-8.5 diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 851391c..48d0685 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -22,7 +22,7 @@ if str(SET_OFFSETS) == "1": raise Exception("Invalid run type: " + RUNTYPE) caput(OTF_OFF1,OFFSET1) - caput(OTF_OFF2,OFFSET2) #detune ID2 + caput(OTF_OFF2,OFFSET2-40) #detune ID2 wait_channel(OTF_DONE, 1, type = 'i') print "Offsets are set" import sys @@ -276,7 +276,7 @@ for scan_no in range(number_of_scans): output_file_Log = output_path+"Log_"+file_prefix+".dat" Logout = open(output_file_Log, "a+") sLogout = "Scan_number: "+file_prefix+"_"+suffix+line_sep+"Sample " + Sample + " Magnetized in " + sMag1 +" direction" + line_sep - sLogout = sLogout +"Settings: "+Element+", "+str(E1)+"-"+str(E2)+", "+str(TIME)+" min, "+str(OFFSET1)+", "+str(OFFSET2)+", "+pol_str+", ES="+str(ES.getValue())+", PGM:"+Grating.getValue()+", cff="+str(cff.getValue())+line_sep+"Positions: X,Y,Z,THT=?"+line_sep+"Temperature at start of the scan: "+str(T_start)+" and at the end of the scan: "+str(T_end)+line_sep + sLogout = sLogout +"Settings: "+Element+", "+str(E1)+"-"+str(E2)+", "+str(TIME)+" min, "+str(OFFSET1)+", "+str(OFFSET2)+", "+pol_str+", ES="+str(ES.getValue())+", PGM:"+Grating.getValue()+", cff="+str(cff.getValue())+line_sep+"Positions: X=?"+'''str(TRX.getValue())+", Y="+str(TRY.getValue())+", Z="+str(TRZ.getValue())+", THT="+st(THT.getValue())'''+line_sep+"Temperature at start of the scan: "+str(T_start)+" and at the end of the scan: "+str(T_end)+line_sep sLogout = sLogout + "-------------------------------------------------------------------------------------------------------------"+line_sep Logout.write(sLogout) Logout.close() diff --git a/script/PolSwitch.py b/script/PolSwitch.py index 00ac203..3ae68d3 100644 --- a/script/PolSwitch.py +++ b/script/PolSwitch.py @@ -37,9 +37,11 @@ set_preference(Preference.ENABLED_PLOTS, ['energy', 'tey_norm']) set_preference(Preference.PLOT_TYPES, {'tey_norm':1}) scan1 = ManualScan(['Energy', 'Field'], ['TEY', 'I0', 'polarization', 'RingCurrent', 'tey_norm'] , [min(setpoints), min(fields)], [max(setpoints), max(fields)], [len(setpoints)-1, len(fields)-1]) -scan1.start() - scan2 = ManualScan(['Energy', 'Field'], ['TEY', 'I0', 'polarization', 'RingCurrent', 'tey_norm'] , [min(setpoints), min(fields)], [max(setpoints), max(fields)], [len(setpoints)-1, len(fields)-1]) + +set_exec_pars(line_plots = (ai1, ai2)) + +scan1.start() scan2.start() # Main loop @@ -78,10 +80,10 @@ for E in setpoints: elif detector4 == 'CIRC -': detector4 = 2 else: detector4 = 0 - if(H>0): + if H > 0: scan1.append ([E, H], [readback1, readback2], [detector1, detector2, detector4, detector7, tey_norm]) - if(H<0): + if H < 0: scan2.append ([E, H], [readback1, readback2], [detector1, detector2, detector4, detector7, tey_norm]) scan1.end() -scan2.end() \ No newline at end of file +scan2.end()