schain-jc Commit - r189:f1e3cc151fd3

Se agrega el archivo de test: test4NewSignalChain.py, este test funciona correctamente...

Daniel Valdez -

r189:f1e3cc151fd3

parent child

Context file:

r189:f1e3cc151fd3

Collapse all files

schainpy/controller/__init__.py created 644 +1 0

	@@ -0,0 +1,1
				1	import controller No newline at end of file

schainpy/test4NewSignalChain.py created 644 +78 0

@@ -0,0 +1,78
	1	"""
	2	$Author$
	3	$Id$
	4
	5	"""
	6	import datetime
	7	from controller import *
	8	from model import *
	9
	10
	11	class Test():
	12	def __init__(self):
	13	self.createObjects()
	14	self.run()
	15
	16	def createObjects(self):
	17
	18
	19
	20	self.upConfig = controller.UPConf(id=1, name="voltageproc", type="voltage")
	21
	22	opConf = self.upConfig.addOperation(name="init", priority=0)
	23
	24	opConf1 = self.upConfig.addOperation(name="CohInt", priority=1, type="other")
	25
	26	opConf1.addParameter(name="nCohInt", value=10)
	27
	28
	29	opConf = self.upConfig.addOperation(name="selectChannels", priority=2)
	30
	31	opConf.addParameter(name="channelList", value=[0,1])
	32
	33
	34	#########################################
	35	self.objR = jrodataIO.VoltageReader()
	36	self.objP = jroprocessing.VoltageProc()
	37
	38	self.objInt = jroprocessing.CohInt()
	39
	40	self.objP.addOperation(self.objInt, opConf1.id)
	41
	42	self.connect(self.objR, self.objP)
	43
	44	def connect(self, obj1, obj2):
	45	obj2.dataIn = obj1.dataOut
	46
	47	def run(self):
	48
	49	while(True):
	50	self.objR.run(path="/Users/dsuarez/Remote/Meteors",
	51	startDate=datetime.date(2012,1,1),
	52	endDate=datetime.date(2012,12,30),
	53	startTime=datetime.time(0,0,0),
	54	endTime=datetime.time(23,59,59),
	55	set=0,
	56	expLabel = "",
	57	ext = None,
	58	online = False)
	59
	60	for opConf in self.upConfig.getOperationObjList():
	61	kwargs={}
	62	for parm in opConf.getParameterObjList():
	63	kwargs[parm.name]=parm.value
	64
	65	self.objP.call(opConf,**kwargs)
	66
	67	if self.objR.flagNoMoreFiles:
	68	break
	69
	70	if self.objR.flagIsNewBlock:
	71	print 'Block No %04d, Time: %s' %(self.objR.nTotalBlocks,
	72	datetime.datetime.fromtimestamp(self.objR.basicHeaderObj.utc + self.objR.basicHeaderObj.miliSecond/1000.0),)
	73
	74
	75
	76
	77	if __name__ == "__main__":
	78	Test() No newline at end of file

schainpy/model/jrodata.py +1 -1

                 def isEmpty(self):
-                    return flagNoData
+                    return self.flagNoData
             class Voltage(JROData):

schainpy/model/jrodataIO.py 0 -3

                     if ext == None:
                         ext = self.ext
-                    if dataOut != None:
-                        self.dataOut = dataOut
                     if online:
                         print "Searching files in online mode..."
                         doypath, file, year, doy, set = self.__searchFilesOnLine(path=path, expLabel=expLabel, ext=ext)

schainpy/model/jroprocessing.py +8 -8

                         None
                     """
-                    object = self.objectList[objId]
+                    object = self.objectDict[objId]
                     object.run(self.dataOut, **kwargs)
                 def byProfiles(self, data):
                     self.__dataReady = False
-                    avg_data = None
+                    avgdata = None
                     nCohInt = None
                     self.putData(data)
                         avgdata, nCohInt = self.pushData()
                         self.__dataReady = True
-                    return avgdata, nCohInt
+                    return avgdata
                 def byTime(self, data, datatime):
                     self.__dataReady = False
-                    avg_data = None
+                    avgdata = None
                     nCohInt = None
                     self.putData(data)
                         self.nCohInt = nCohInt
                         self.__dataReady = True
-                    return avgdata, nCohInt
+                    return avgdata
                 def integrate(self, data, datatime=None):
                     self.__lastdatatime = datatime
                     if avgdata == None:
-                        return None
+                        return None, None
                     avgdatatime = self.__initime
                     avgdata, avgdatatime = self.integrate(dataOut.data, dataOut.utctime)
-            #        self.dataOut.timeInterval *= nCohInt
+            #        dataOut.timeInterval *= nCohInt
-                    self.dataOut.flagNoData = True
+                    dataOut.flagNoData = True
                     if self.__dataReady:
                         dataOut.data = avgdata

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