This commit is contained in:
X11MA
2016-02-16 16:14:52 +01:00
parent 68f2fe17f0
commit b11615883a
2 changed files with 25 additions and 12 deletions

View File

@@ -76,10 +76,11 @@ def _startPlot(type):
e = energy.read()
if (MCP_1 == 1 or MCP_2 == 1):
aK1=keithley_1a.read()
aP=FillingPattern.read()
aPr = []
for z in aP:
aPr.append(z)
#aP=FillingPattern.read()
#aPr = []
#for z in aP:
# aPr.append(z)
aPr = FillingPattern.read().tolist()
SumaP=0
CamaP=0
for z in xrange(0,480):
@@ -88,10 +89,11 @@ def _startPlot(type):
CamaP = CamaP + aPr[z]
aK1norm = aK1 * CamaP / SumaP
if MCP_1 == 1:
a1=MCPArray1.read()
a1r = []
for i in a1:
a1r.append(i)
#a1=MCPArray1.read()
#a1r = []
#for i in a1:
# a1r.append(i)
a1r = MCPArray1.read().tolist()
Sum1a1 = 0
Cam1a1 = 0
Sum2a1 = 0
@@ -107,6 +109,7 @@ def _startPlot(type):
MCP1.append(Sum1a1)
MCP1.append(Cam1a1)
MCP1.append(aK1norm)
if NrCounters.read() > 460:
for i in xrange(480,960):
Sum2a1 = Sum2a1 + a1r[i]
@@ -118,10 +121,11 @@ def _startPlot(type):
if Save_array_data == 1:
MCP1.append(a1r)
if MCP_2 == 1:
a2=MCPArray2.read()
a2r = []
for j in a2:
a2r.append(j)
#a2=MCPArray2.read()
#a2r = []
#for j in a2:
# a2r.append(j)
a2r = MCPArray2.read().tolist()
Sum1a2 = 0
Cam1a2 = 0
Sum2a2 = 0