pshell_config/x11ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
X11MA
2016-02-05 20:48:43 +01:00
parent c1cabe0ecd
commit 48ff41ab0b
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/EnergyScan-beforeThread.py
+8 -8
View File
@@ -71,10 +71,6 @@ def _startPlot(type):
MCP2 = []
a1r = []
a2r = []
output_file_MCP1 = output_path+"MCP1"+file_prefix+"_" + suffix + ".dat"
output_file_MCP2 = output_path+"MCP2"+file_prefix+"_" + suffix + ".dat"
MCP1out = open(output_file_MCP1, "a+")
MCP2out = open(output_file_MCP2, "a+")
#MCP1out.write("rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep)
#MCP2out.write("rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep)
while running:
@@ -108,8 +104,6 @@ def _startPlot(type):
if Save_array_data == 1:
MCP1.append(a1r)
a1r = []
sMCP1 = sep.join(str(x) for x in MCP1) + line_sep # MCP1.write("%s" + sep % i)
MCP1out.write(sep + "rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep + sMCP1)
for j in a2:
a2r.append(j)
Sum1a2 = 0
@@ -133,8 +127,6 @@ def _startPlot(type):
if Save_array_data == 1:
MCP2.append(a2r)
a2r = []
sMCP2 = sep.join(str(y) for y in MCP2) + line_sep
MCP2out.write(sep + "rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep + sMCP2)
time.sleep(SamplingTime.read()*0.001)
if (abs(e-cur)) > 0.00001:
v = abs((keithley_2a.read() / ((keithley_1a if (type==1) else keithley_3a).read() )))
@@ -145,7 +137,15 @@ def _startPlot(type):
pass
print "Done Plotting"
if (MCP_1 == 1 or MCP_2 == 1):
output_file_MCP1 = output_path+"MCP1"+file_prefix+"_" + suffix + ".dat"
MCP1out = open(output_file_MCP1, "a+")
sMCP1 = sep.join(str(x) for x in MCP1) + line_sep # MCP1.write("%s" + sep % i)
MCP1out.write(sep + "rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep + sMCP1)
MCP1out.close()
output_file_MCP2 = output_path+"MCP2"+file_prefix+"_" + suffix + ".dat"
MCP2out = open(output_file_MCP2, "a+")
sMCP2 = sep.join(str(y) for y in MCP2) + line_sep
MCP2out.write(sep + "rbkenergy" + sep + "Sum1" + sep + "Sum2" + sep + "Cam1" + sep + "Cam2" + sep + "Array" + line_sep + sMCP2)
MCP2out.close()
def startPlot(type = 1):
global task