schain-jc Commit - r1014:c5cbd628ce0f

merge from master

José Chávez -

r1014:c5cbd628ce0f

parent child

Context file:

r1014:c5cbd628ce0f

Collapse all files

.vscode/c_cpp_properties.json created 644 +69 0

@@ -0,0 +1,69
	1	{
	2	"configurations": [
	3	{
	4	"name": "Mac",
	5	"includePath": [
	6	"/usr/include",
	7	"/usr/local/include",
	8	"${workspaceRoot}"
	9	],
	10	"defines": [],
	11	"intelliSenseMode": "clang-x64",
	12	"browse": {
	13	"path": [
	14	"/usr/include",
	15	"/usr/local/include",
	16	"${workspaceRoot}"
	17	],
	18	"limitSymbolsToIncludedHeaders": true,
	19	"databaseFilename": ""
	20	}
	21	},
	22	{
	23	"name": "Linux",
	24	"includePath": [
	25	"/usr/include/c++/4.8.4",
	26	"/usr/include/x86_64-linux-gnu/c++/4.8",
	27	"/usr/local/include",
	28	"/usr/include",
	29	"/usr/include/x86_64-linux-gnu",
	30	"${workspaceRoot}"
	31	],
	32	"defines": [],
	33	"intelliSenseMode": "clang-x64",
	34	"browse": {
	35	"path": [
	36	"/usr/include/c++/4.8.4",
	37	"/usr/include/x86_64-linux-gnu/c++/4.8",
	38	"/usr/local/include",
	39	"/usr/include",
	40	"/usr/include/x86_64-linux-gnu",
	41	"${workspaceRoot}"
	42	],
	43	"limitSymbolsToIncludedHeaders": true,
	44	"databaseFilename": ""
	45	}
	46	},
	47	{
	48	"name": "Win32",
	49	"includePath": [
	50	"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
	51	"${workspaceRoot}"
	52	],
	53	"defines": [
	54	"_DEBUG",
	55	"UNICODE"
	56	],
	57	"intelliSenseMode": "msvc-x64",
	58	"browse": {
	59	"path": [
	60	"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
	61	"${workspaceRoot}"
	62	],
	63	"limitSymbolsToIncludedHeaders": true,
	64	"databaseFilename": ""
	65	}
	66	}
	67	],
	68	"version": 2
	69	} No newline at end of file

.vscode/settings.json created 644 +7 0

@@ -0,0 +1,7
	1	{
	2	"files.associations": {
	3	"arrayobject.h": "c",
	4	"ndarrayobject.h": "c",
	5	"complex": "c"
	6	}
	7	} No newline at end of file

.gitignore +10 -1

             # eclipse
             .project
             .pydevproject
+            <<<<<<< HEAD
             # vscode
             .vscode
             schainpy/scripts/
-            schaingui/node_modules/
  No newline at end of file
+            schaingui/node_modules/
+            =======
+            .svn/
+            *.png
+            *.pyc
+            schainpy/scripts
+            schaingui/node_modules
+            >>>>>>> master

README.md +1 -1

@@ -129,4 +129,4 op.addParameter(name='wintitle', value='RTI', format='str')
129		129
130	controller.start()	130	controller.start()
131		131
132	```	132	``` No newline at end of file

schainpy/controller.py +30 -30

                 def getParameterValue(self, parameterName):
                     parameterObj = self.getParameterObj(parameterName)
                 #         if not parameterObj:
-                    #             return None
+                #             return None
                     value = parameterObj.getValue()
                     return value
                 def printattr(self):
                     print "%s[%s]: name = %s, datatype = %s, inputId = %s" %(self.ELEMENTNAME,
-                                                                         self.id,
+                                                                            self.id,
-                                                                         self.name,
+                                                                            self.name,
-                                                                         self.datatype,
+                                                                            self.datatype,
-                                                                         self.inputId)
+                                                                            self.inputId)
                     for opConfObj in self.opConfObjList:
                         opConfObj.printattr()
                         sts = self.procUnitObj.call(opType = opConfObj.type,
                                                     opName = opConfObj.name,
                                                     opId = opConfObj.id,
+                                                    **kwargs)
-                    #             total_time = time.time() - ini
+                        #             total_time = time.time() - ini
+                        #
-                    #             if total_time > 0.002:
+                        #             if total_time > 0.002:
-                    #                 print "%s::%s took %f seconds" %(self.name, opConfObj.name, total_time)
+                        #                 print "%s::%s took %f seconds" %(self.name, opConfObj.name, total_time)
                         is_ok = is_ok or sts
                     return is_ok
                         opObj.addParameter(name=key, value=value, format=type(value).__name__)
                     return opObj
                     #     def makeXml(self, projectElement):
+                    #
                     #         procUnitElement = SubElement(projectElement, self.ELEMENTNAME)
                     #         procUnitElement.set('id', str(self.id))
                     #         procUnitElement.set('name', self.name)
                     #         procUnitElement.set('datatype', self.datatype)
                     #         procUnitElement.set('inputId', str(self.inputId))
+                    #
                     #         for opConfObj in self.opConfObjList:
                     #             opConfObj.makeXml(procUnitElement)
                 def readXml(self, upElement):
                     self.id = upElement.get('id')
                     self.id = self.projectElement.get('id')
                     self.name = self.projectElement.get('name')
                     self.description = self.projectElement.get('description')
                     readUnitElementList = self.projectElement.iter(ReadUnitConf().getElementName())
                     for readUnitElement in readUnitElementList:
                 def printattr(self):
                     print "Project[%s]: name = %s, description = %s" %(self.id,
-                                                                          self.name,
+                                                                        self.name,
-                                                                          self.description)
+                                                                        self.description)
                     for procUnitConfObj in self.procUnitConfObjDict.values():
                         procUnitConfObj.printattr()
                     import socket
                     err = traceback.format_exception(sys.exc_info()[0],
-                                                     sys.exc_info()[1],
+                                                    sys.exc_info()[1],
-                                                     sys.exc_info()[2])
+                                                    sys.exc_info()[2])
                     print "***** Error occurred in %s *****" %(procUnitConfObj.name)
                     print "***** %s" %err[-1]
                     adminObj = schainpy.admin.SchainNotify()
                     adminObj.sendAlert(message=message,
-                                       subject=subject,
+                                    subject=subject,
-                                       subtitle=subtitle,
+                                    subtitle=subtitle,
-                                       filename=self.filename)
+                                    filename=self.filename)
                 def isPaused(self):
                     return 0

schainpy/controller_api.py +3 -3

                     self.setDaemon(True)
                     self.lock = threading.Lock()
-                    self.control = {'stop':False, 'pause':False}
+                    self.control = { 'stop':False, 'pause':False }
                 def __del__(self):
                     self.control['stop'] = True
                                 continue
                             if thisOpObj.name in plotterList:
-                                thisOpObj.type = "plotter"
+                                thisOpObj.type = "other"
                 def setPlotterQueue(self, plotter_queue):

schainpy/model/graphics/jroplotter.py +1 -1

                     subtitle = "%s:\n" %(name)
                     subtitle += "Hostname: %s\n" %socket.gethostbyname(socket.gethostname())
                     subtitle += "Working directory: %s\n" %os.path.abspath("./")
-            #         subtitle += "Configuration file: %s\n" %self.filename
+                    #         subtitle += "Configuration file: %s\n" %self.filename
                     subtitle += "Time: %s\n" %str(datetime.datetime.now())
                     adminObj = schainpy.admin.SchainNotify()

schainpy/model/io/jroIO_base.py +30 -30

                     dateList, pathList = self.findDatafiles(path, startDate, endDate, expLabel, ext, walk, include_path=True)
                     if dateList == []:
-            #             print "[Reading] Date range selected invalid [%s - %s]: No *%s files in %s)" %(startDate, endDate, ext, path)
+                    #             print "[Reading] Date range selected invalid [%s - %s]: No *%s files in %s)" %(startDate, endDate, ext, path)
                         return None, None
                     if len(dateList) > 1:
                     datetimeList = []
                     for thisPath in pathList:
-            #             thisPath = pathList[pathDict[file]]
+                    #             thisPath = pathList[pathDict[file]]
                         fileList = glob.glob1(thisPath, "*%s" %ext)
                         fileList.sort()
                         idFile += 1
                         if not(idFile < len(self.filenameList)):
                             self.flagNoMoreFiles = 1
-            #                 print "[Reading] No more Files"
+                    #                 print "[Reading] No more Files"
                             return 0
                         filename = self.filenameList[idFile]
                     self.fileSize = fileSize
                     self.fp = fp
-            #         print "[Reading] Setting the file: %s"%self.filename
+                    #         print "[Reading] Setting the file: %s"%self.filename
                     return 1
                         if self.fp != None: self.fp.close()
                         self.fp = open(fullfilename, 'rb')
                         self.flagNoMoreFiles = 0
-            #             print '[Reading] Setting the file: %s' % fullfilename
+                    #             print '[Reading] Setting the file: %s' % fullfilename
                     else:
                         self.fileSize = 0
                         self.filename = None
                         self.flagIsNewFile = 0
                         self.fp = None
                         self.flagNoMoreFiles = 1
-            #             print '[Reading] No more files to read'
+                    #             print '[Reading] No more files to read'
                     return fileOk_flag
                             return 1
                         if self.fileSize == self.fileSizeByHeader:
-            #                self.flagEoF = True
+                    #                self.flagEoF = True
                             return 0
                         print "[Reading] Waiting %0.2f seconds for the next block, try %03d ..." % (self.delay, nTries+1)
                         else:
                             self.fp.seek(self.fp.tell() - neededsize)
                             break
-            #        csize = self.fileSize - self.fp.tell()
+                    #        csize = self.fileSize - self.fp.tell()
-            #        neededsize = self.processingHeaderObj.blockSize + self.basicHeaderSize
+                    #        neededsize = self.processingHeaderObj.blockSize + self.basicHeaderSize
-            #        factor = int(csize/neededsize)
+                    #        factor = int(csize/neededsize)
-            #        if factor > 0:
+                    #        if factor > 0:
-            #            self.fp.seek(self.fp.tell() + factor*neededsize)
+                    #            self.fp.seek(self.fp.tell() + factor*neededsize)
                     self.flagIsNewFile = 0
                     self.__isFirstTimeOnline = 0
                     #if self.server is None:
                     if self.fp == None:
                         return 0
-            #         if self.online:
+                    #         if self.online:
-            #             self.__jumpToLastBlock()
+                    #             self.__jumpToLastBlock()
                     if self.flagIsNewFile:
                         self.lastUTTime = self.basicHeaderObj.utc
                         return 1
                     if self.verbose:
                         print "[Reading] Block No. %d/%d -> %s" %(self.nReadBlocks,
-                                                                  self.processingHeaderObj.dataBlocksPerFile,
+                                                                self.processingHeaderObj.dataBlocksPerFile,
-                                                                  self.dataOut.datatime.ctime())
+                                                                self.dataOut.datatime.ctime())
                     return 1
                 def __readFirstHeader(self):
                     self.dtype = datatype_str
                     #self.ippSeconds = 2 * 1000 * self.radarControllerHeaderObj.ipp / self.c
                     self.fileSizeByHeader = self.processingHeaderObj.dataBlocksPerFile * self.processingHeaderObj.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.processingHeaderObj.dataBlocksPerFile - 1)
-            #        self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels)
+                    #        self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels)
-            #        self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
+                    #        self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
                     self.getBlockDimension()
                 def __verifyFile(self, filename, msgFlag=True):
                                                                             skip=skip, queue=queue)
                             if not(pathList):
-                        #      print "[Reading] No *%s files in %s (%s - %s)"%(ext, path,
+                            #      print "[Reading] No *%s files in %s (%s - %s)"%(ext, path,
-                        #                                          datetime.datetime.combine(startDate,startTime).ctime(),
+                            #                                          datetime.datetime.combine(startDate,startTime).ctime(),
-                        #                                           datetime.datetime.combine(endDate,endTime).ctime())
+                            #                                           datetime.datetime.combine(endDate,endTime).ctime())
-                        #     sys.exit(-1)
+                            #     sys.exit(-1)
                                 self.fileIndex = -1
                                 self.pathList = []
                                 self.filenameList = []
                                 return
-                #         self.getBasicHeader()
+                        #   self.getBasicHeader()
-                        if last_set != None:
+                    if last_set != None:
-                            self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
+                        self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
                     return
                 def getBasicHeader(self):

schainpy/model/utils/jroutils_ftp.py +5 -3

                     return fullfilenameList
                 def run(self, **kwargs):
                     if not self.isConfig:
                         self.init = time.time()
                         self.setup(**kwargs)
                         self.isConfig = True
+                    if not self.clientObj.is_alive():
+                        print "[Remote Server]: Restarting connection "
+                        self.setup(**kwargs)
                     if time.time() - self.init >= self.period:
                         fullfilenameList = self.findFiles()
                         if self.clientObj.updateFileList(fullfilenameList):
                             print "[Remote Server]: Sending the next files ", str(fullfilenameList)
                         self.init = time.time()
                 def close(self):

schainpy/scripts/optimun_offset.py +4 0

             #----------------------     Setup    ---------------------------
+            <<<<<<< HEAD
             path = '/home/nanosat/Pictures/JASMET30_mp/201608/phase'
+            =======
+            path = '/home/jespinoza/Pictures/JASMET30/201608/phase'
+            >>>>>>> master
             stdvLimit = 0.5
             #----------------------   Script     ---------------------------

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