schain Commit - r173:585618fd3a5c · Jicamarca Repository

-Modificacion de la Lectura Online,ahora funciona correctamente...

Alexander Valdez -

r173:585618fd3a5c

parent child

Context file:

r173:585618fd3a5c

Collapse all files

schainpy2/IO/JRODataIO.py +17 -19

                 nReadBlocks = 0
-                delay  = 60   #number of seconds waiting a new file
+                delay  = 10   #number of seconds waiting a new file
                 nTries  = 3  #quantity tries
                 def __init__(self):
                     pass
                 def createObjByDefault(self):
                         dataOutObj = self.createObjByDefault()
                     self.dataOutObj = dataOutObj
+                    self.delay = delay
+                    self.online = online
+                    self.ext = ext.lower()
                     if online:
                         print "Searching files in online mode..."
                             for nTries in range( self.nTries ):
                                 print '\tWaiting %0.2f sec for an valid file in %s: try %02d ...' % (self.delay, path, nTries+1)
                                 time.sleep( self.delay )
-                                doypath, file, year, doy, set = self.__searchFilesOnLine(path=path, expLabel=expLabel, ext=exp)
+                                doypath, file, year, doy, set = self.__searchFilesOnLine(path=path, expLabel=expLabel, ext=ext)
                                 if doypath:
                                     break
                         self.pathList = pathList
                         self.filenameList = filenameList
-                    self.online = online
-                    self.delay = delay
-                    ext = ext.lower()
-                    self.ext = ext
                     if not(self.setNextFile()):
                         if (startDate!=None) and (endDate!=None):
                             print "No files in range: %s - %s" %(datetime.datetime.combine(startDate,startTime).ctime(), datetime.datetime.combine(endDate,endTime).ctime())
                 def __waitNewBlock(self):
                     #si es OnLine y ademas aun no se han leido un bloque completo entonces se espera por uno valido
                     if not self.online:
-                        return
+                        return 0
-                    if (self.nReadBlocks < self.m_ProcessingHeader.dataBlocksPerFile):
+                    if (self.nReadBlocks >= self.processingHeaderObj.dataBlocksPerFile):
+                        return 0
                     currentPointer = self.fp.tell()
-                        for nTries in range( self.nTries ):
+                    neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize
-                            #self.fp.close()
-                            print "\tWaiting %0.2f seconds for the next block, try %03d ..." % (self.delay, nTries+1)
+                    for nTries in range( self.nTries ):
-                            time.sleep( self.delay )
-                            #self.fp = open( self.filename, 'rb' )
+                        self.fp.close()
-                            #self.fp.seek( fpointer )
+                        self.fp = open( self.filename, 'rb' )
+                        self.fp.seek( currentPointer )
                         self.fileSize = os.path.getsize( self.filename )
                         currentSize = self.fileSize - currentPointer
                             self.__rdBasicHeader()
                             return 1
-                        return 0
+                        print "\tWaiting %0.2f seconds for the next block, try %03d ..." % (self.delay, nTries+1)
+                        time.sleep( self.delay )
-                    return 1
+                    return 0
                 def __setNewBlock(self):
                     if self.fp == None:

schainpy2/IO/SpectraIO.py +1 -1

             import os, sys
             import numpy
-            #import pyfits
+            import pyfits
             import glob
             import fnmatch
             import time, datetime

schainpy2/IO/VoltageIO.py +1 -1

                     self.profileIndex = 9999
-                    self.delay  = 3   #seconds
+                    self.delay  = 60   #seconds
                     self.nTries  = 3  #quantity tries

schainpy2/Processing/SpectraProcessor.py +3 -3

             from Data.JROData import Spectra, SpectraHeis
             from IO.SpectraIO import SpectraWriter,SpectraHeisWriter
-            from Graphics.schainPlotTypes import ScopeFigure, SpcFigure, RTIFigure
+            #from Graphics.schainPlotTypes import ScopeFigure, SpcFigure, RTIFigure
             from Graphics.BaseGraph_mpl import LinearPlot
             #from JRONoise import Noise
                     #calculo de self-spectra
                     fft_volt = numpy.fft.fftshift(fft_volt,axes=(1,))
-                    spc = fft_volt * numpy.conjugate(fft_volt)
+                    spc = (fft_volt * numpy.conjugate(fft_volt))
                     spc = spc.real
                     blocksize = 0
                     #calculo de self-spectra
                     fft_volt = numpy.fft.fftshift(fft_volt,axes=(1,))
-                    spc = numpy.abs(fft_volt * numpy.conjugate(fft_volt))
+                    spc = numpy.abs(fft_volt * numpy.conjugate(fft_volt))/(self.dataOutObj.nFFTPoints)
                     self.dataOutObj.data_spc = spc
                 def getSpectra(self):

schainpy2/Processing/VoltageProcessor.py +1 -1

             from Data.JROData import Voltage
             from IO.VoltageIO import VoltageWriter
-            from Graphics.schainPlotTypes import ScopeFigure, RTIFigure
+            #from Graphics.schainPlotTypes import ScopeFigure, RTIFigure
             class VoltageProcessor:

schainpy2/TestSpectraHeis.py +45 -26

@@ -7,6 +7,7 Created on Jul 31, 2012
7		7
8	import os, sys	8	import os, sys
9	import time, datetime	9	import time, datetime
		10	import getopt
10	#import pylab as pl	11	#import pylab as pl
11		12
12	from Data.JROData import Voltage	13	from Data.JROData import Voltage
@@ -29,39 +30,56 class TestHeis():
29	self.i=0	30	self.i=0
30		31
31		32
32	def VerifyArguments(self):
33	pass
34
35
36
37	def setValues(self):
38
39		33
40		34	def VerifyArguments(self):
41	self.path="D:\\te"	35	arglist = ''
42		36	longarglist = ['path=','online=','N=','fpath=']
43	#self.path = ""	37	optlist,args = getopt.getopt(sys.argv[1:],arglist, longarglist)
44	# self.startDate = datetime.date(2012,10,1)	38	for opt in optlist:
45	# self.endDate = datetime.date(2012,12,30)	39	if opt[0] == '--path':
		40	self.path = opt[1]
		41	elif opt[0] == '--online':
		42	self.online = int(opt[1])
		43
		44	elif opt[0] == '--N':
		45	self.N = int(opt[1])
		46	elif opt[0] == '--fpath':
		47	self.fpath = opt[1]
		48	# if self.online==0:
		49	# if opt[0] == '--starDate':
		50	# self.StarDate = opt[1]
		51	# elif opt[0] == '--endDate':
		52	# self.EndDate = opt[1]
		53	# elif opt[0] == '--startTime':
		54	# self.StartTime = opt[1]
		55	# elif opt[0] == '--endTime':
		56	# self.EndTime = opt[1]
46	#	57	#
47	# self.startTime = datetime.time(0,0,0)	58	# elif opt[0] == '--starDate':
48	# self.endTime = datetime.time(23,0,0)	59	# self.StarDate = None
49	#	60	#
		61	# elif opt[0] == '--endDate':
		62	# self.EndDate = None
		63	#
		64	# elif opt[0] == '--startTime':
		65	# self.StartTime = None
		66	#
		67	# elif opt[0] == '--endTime':
		68	# self.EndTime = None
50		69
51		70
		71	def setValues(self):
		72	self.VerifyArguments()
		73	#stardateList=self.Stardate.split()
52		74
53	self.N=1000	75	self.startDate = datetime.date(2012,10,1)
		76	self.endDate = datetime.date(2012,12,30)
54		77
55	self.wrpath = "D:\\te\\FITS"	78	self.startTime = datetime.time(0,0,0)
		79	self.endTime = datetime.time(23,0,0)
56		80
57	self.online
58		81
59	self.startDate = None
60	self.endDate = None
61	self.startTime = None
62	self.endTime = None
63		82
64	# self.blocksPerFile = 1
65	def createObjects( self ):	83	def createObjects( self ):
66		84
67	self.readerObj = VoltageReader()	85	self.readerObj = VoltageReader()
@@ -73,7 +91,8 class TestHeis():
73	startTime = self.startTime,	91	startTime = self.startTime,
74	endTime = self.endTime,	92	endTime = self.endTime,
75	expLabel = '',	93	expLabel = '',
76	online = self.online)	94	online = self.online,
		95	delay=10)
77		96
78	if not(self.voltObj1):	97	if not(self.voltObj1):
79	sys.exit(0)	98	sys.exit(0)
@@ -91,7 +110,7 class TestHeis():
91		110
92	self.specProcObj.integrator(self.N) ## return self.dataOutObj	111	self.specProcObj.integrator(self.N) ## return self.dataOutObj
93		112
94	self.specProcObj.writedata(self.wrpath)	113	self.specProcObj.writedata(self.fpath)
95		114
96	self.specProcObj.plotMatScope(idfigure=1)	115	self.specProcObj.plotMatScope(idfigure=1)
97		116
@@ -101,7 +120,7 class TestHeis():
101		120
102		121
103	if self.readerObj.flagIsNewBlock:	122	if self.readerObj.flagIsNewBlock:
104	print 'Block No %04d, Time: %s' %(self.readerObj.~~nTotalBlocks~~,	123	print 'Block No %04d, Time: %s' %(self.readerObj.basicHeaderObj.dataBlock,
105	datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc),)	124	datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc),)
106		125
107		126

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages