This commit is contained in:
X11MA
2016-02-16 10:09:09 +01:00
parent 3f1dcc2b4f
commit 66b86d22ed
2 changed files with 17 additions and 9 deletions

View File

@@ -1,10 +1,12 @@
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;-5.1;-5.7
Ni=825.0;890.0;2.0;10.0;-8.6;-10.4
Ni=825.0;890.0;2.0;10.0;-3.5;3.0
Ni Linear=825.0;890.0;2.0;10.0;-3.5;-5.5
O=500.0;560.0;2.0;10.0;-5.1;-5.7
Gd=1170.0;1240.0;2.0;10.0;-13.0;-11.5
Cr=560.0;610.0;2.0;10.0;-6.2;-7.2
Co=750.0;825.0;2.0;10.0;-8.8;-9.5
Mn=620.0;670.0;2.0;10.0;-6.7;-8.1
Fe=680.0;750.0;2.0;10.0;-7.2;-9.0
Fe Linear=680.0;750.0;2.0;10.0;-1.5;-1.0

View File

@@ -100,16 +100,19 @@ def _startPlot(type):
MCP1.append(e)
for i in xrange(0,480):
Sum1a1 = Sum1a1 + a1r[i]
for i in xrange(Cam_start,Cam_end+1):
Cam1a1 = Cam1a1 + a1r[i]
#for i in xrange(Cam_start,Cam_end+1):
# Cam1a1 = Cam1a1 + a1r[i]
Cam1a1 = a1r[Cam_start]
MCP1.append(Sum1a1)
MCP1.append(Cam1a1)
MCP1.append(aK1norm)
if NrCounters.read() > 460:
for i in xrange(480,960):
Sum2a1 = Sum2a1 + a1r[i]
for i in xrange(Cam_start+480,Cam_end+481):
Cam2a1 = Cam2a1 + a1r[i]
#for i in xrange(Cam_start+480,Cam_end+481):
# Cam2a1 = Cam2a1 + a1r[i]
Cam2a1 = a1r[Cam_start+480]
MCP1.append(Sum2a1)
MCP1.append(Cam2a1)
if Save_array_data == 1:
@@ -127,16 +130,19 @@ def _startPlot(type):
MCP2.append(e)
for j in xrange(0,480):
Sum1a2 = Sum1a2 + a2r[j]
for j in xrange(Cam_start,Cam_end+1):
Cam1a2 = Cam1a2 + a2r[j]
#for j in xrange(Cam_start,Cam_end+1):
# Cam1a2 = Cam1a2 + a2r[j]
Cam1a2 = a2r[Cam_end]
MCP2.append(Sum1a2)
MCP2.append(Cam1a2)
MCP2.append(aK1norm)
if NrCounters.read() > 460:
for j in xrange(480,960):
Sum2a2 = Sum2a2 + a2r[j]
for j in xrange(Cam_start+480,Cam_end+481):
Cam2a2 = Cam2a2 + a2r[j]
#for j in xrange(Cam_start+480,Cam_end+481):
# Cam2a2 = Cam2a2 + a2r[j]
Cam2a2 = a2r[Cam_end+481]
MCP2.append(Sum2a2)
MCP2.append(Cam2a2)
if Save_array_data == 1: