diff --git a/config/jcae.properties b/config/jcae.properties new file mode 100644 index 0000000..64766d0 --- /dev/null +++ b/config/jcae.properties @@ -0,0 +1,9 @@ +#Tue Feb 16 16:14:17 CET 2016 +ch.psi.jcae.ContextFactory.addressList= +ch.psi.jcae.ContextFactory.maxArrayBytes=10000000 +ch.psi.jcae.ChannelFactory.retries=1 +ch.psi.jcae.ChannelFactory.timeout=500 +ch.psi.jcae.impl.DefaultChannelService.retries=2 +ch.psi.jcae.impl.DefaultChannelService.timeout=500 +ch.psi.jcae.impl.DefaultChannelService.waitTimeout=300000 +ch.psi.jcae.impl.DefaultChannelService.waitRetryPeriod=10000 diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 3a939c5..d852773 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -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