This commit is contained in:
X11MA
2017-10-11 18:55:09 +02:00
parent 57489d7d54
commit d3e59b824c
2 changed files with 10 additions and 4 deletions

View File

@@ -15,5 +15,5 @@ Gd=1170.0;1240.0;2.0;10.0;-13.0;-11.5
Cr=560.0;610.0;2.0;5.0;-6.5;-7.5
Co=750.0;825.0;2.0;5.0;-10.0;-12.5
Mn=620.0;670.0;2.0;5.0;-7.5;-8.5
Fe=680.0;750.0;2.0;5.0;-8.2;-9.6
Fe=680.0;750.0;2.0;5.0;-7.5;-8.0
Fe Linear=680.0;750.0;2.0;10.0;1.2;2.9

View File

@@ -100,6 +100,9 @@ def _startPlot(type):
aK1=keithley_1a.read()
aK2=keithley_2a.read()
aK3=keithley_3a.read()
aK1raw=Keithley_1_raw.read()
aK2raw=Keithley_2_raw.read()
aK3raw=Keithley_3_raw.read()
aTEYnorm=aK2/aK1
TEY.append(line_sep)
TEY.append(e)
@@ -109,7 +112,10 @@ def _startPlot(type):
TEY.append(aK1)
TEY.append(aK2)
TEY.append(aK3)
TEY.append(pol_str)
TEY.append(pol_str)
TEY.append(aK1raw)
TEY.append(aK2raw)
TEY.append(aK3raw)
if (abs(e-cur)) > 0.1:
v = abs((keithley_2a.read() / ((keithley_1a if (type==1) else keithley_3a).read() )))
s.appendData(e,v)
@@ -121,8 +127,8 @@ def _startPlot(type):
output_file_TEY = output_path+"TEY_"+file_prefix+"_" + suffix + ".dat"
TEYout = open(output_file_TEY, "w+")
sTEY = sep.join(str(x) for x in TEY) #+ line_sep # MCP1.write("%s" + sep % i)
sTEYout = sep + "rbkenergy" + sep + "ID1_en" + sep + "ID2_en" + sep + "TEY_norm" + sep + "Keithley1" + sep + "Keithley2" + sep + "Keithley3"+ sep + "Polarisation"
sTEYout = sTEYout + line_sep + sTEY
sTEYout = sep + "rbkenergy" + sep + "ID1_en" + sep + "ID2_en" + sep + "TEY_norm" + sep + "Keithley1" + sep + "Keithley2" + sep + "Keithley3"+ sep + "Polarisation"+ sep + "Keithley1raw" + sep + "Keithley2raw" + sep + "Keithley3raw"
sTEYout = sTEYout + sTEY
TEYout.write(sTEYout)
TEYout.close()
print "Saved TEY signal data"