Closedown

2015-06-23 14:07:05 +02:00
parent 94cef89384
commit b2be954814
1 changed files with 5 additions and 2 deletions
@@ -11,6 +11,8 @@ OFFSET = -9.0
 FOLDER = '2015_04/20150417'
 FILE = 'MgE_plus'
 ALPHA=0
+"""
+
 """
 E1 = 710
 E2 = 720
@@ -21,6 +23,7 @@ OFFSET = -9.0
 FOLDER = '2015_04/20150417'
 FILE = 'Fe_plus'
 ALPHA=0
+"""


 print "\Starting energy scan - Parameters: ",
@@ -68,10 +71,10 @@ print "Finished Energy scan"
 cmd = "/sls/X07MA/data/x07maop/bin/modify_otf.pl "
 folder = "~/Data1/" + FOLDER + "/";
 name = caget("MSG").split(' ')[0]
-if name == "Welcome"":
+if name == "Welcome":
    name = caget("MSG").split(' ')[0]
 name = folder + name;        
-newName = folder + "/" + time.strftime("/%Y%m%d_%H%M_", start) + FILE + "_0000.txt";             
+newName = folder + time.strftime("%Y%m%d_%H%M_", start) + FILE + "_0000.txt";             
 cmd = cmd + name + " " + newName;
 print("Converting data file: " + cmd);               
 import os