diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 81208f5..851391c 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-40) #detune ID2 + caput(OTF_OFF2,OFFSET2) #detune ID2 wait_channel(OTF_DONE, 1, type = 'i') print "Offsets are set" import sys @@ -30,8 +30,8 @@ if str(SET_OFFSETS) == "1": else: print "Running full script" -file_prefix = time.strftime("%y%m%d") -input_path = "/sls/X11MA/data/X11MA/beamtime_oct2017/"+file_prefix+"/" +file_prefix = time.strftime("%Y%m%d") +input_path = "/sls/X11MA/data/X11MA/Data1/public/PshellData/2017_11/"+file_prefix+"/" output_path = input_path #+file_Data1/beamtime_oct2017prefix+"/" #"/sls/X11MA/Data1/public/e10989/"+file_prefix+"/" @@ -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="+str(TRX.getValue())+", Y="+str(TRY.getValue())+", Z="+str(TRZ.getValue())+", THT="+str(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 +"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 + "-------------------------------------------------------------------------------------------------------------"+line_sep Logout.write(sLogout) Logout.close()