| @@ -53,7 +53,6 def getlastFileFromPath( pathList, ext ): | |||
|
|
53 | 53 | filesList.append(filename) |
|
|
54 | 54 | |
|
|
55 | 55 | if len( filesList ) > 0: |
|
|
56 | #filesList.sort() | |
|
|
57 | 56 | filesList = sorted( filesList, key=str.lower ) |
|
|
58 | 57 | filename = filesList[-1] |
|
|
59 | 58 | |
| @@ -296,6 +295,8 class SpectraReader( DataReader ): | |||
|
|
296 | 295 | |
|
|
297 | 296 | self.nCrossPairs = 0 |
|
|
298 | 297 | |
|
|
298 | self.datablock_id = 9999 | |
|
|
299 | ||
|
|
299 | 300 | self.__delay = 7 #seconds |
|
|
300 | 301 | self.__nTries = 3 #quantity tries |
|
|
301 | 302 | self.__nFiles = 3 #number of files for searching |
| @@ -304,7 +305,6 class SpectraReader( DataReader ): | |||
|
|
304 | 305 | self.__set = 0 |
|
|
305 | 306 | self.__ext = None |
|
|
306 | 307 | self.__path = None |
|
|
307 | self.datablock_id = 9999 | |
|
|
308 | 308 | |
|
|
309 | 309 | |
|
|
310 | 310 | def __rdSystemHeader( self, fp=None ): |
| @@ -455,6 +455,8 class SpectraReader( DataReader ): | |||
|
|
455 | 455 | |
|
|
456 | 456 | self.__blocksize = self.__pts2read_SelfSpectra + self.__pts2read_CrossSpectra + self.__pts2read_DCchannels |
|
|
457 | 457 | |
|
|
458 | print "SIZEEEE ",self.__blocksize, self.m_ProcessingHeader.blockSize | |
|
|
459 | ||
|
|
458 | 460 | self.m_Spectra.nChannels = self.nChannels |
|
|
459 | 461 | self.m_Spectra.nPairs = self.nPairs |
|
|
460 | 462 | |
| @@ -729,7 +731,7 class SpectraReader( DataReader ): | |||
|
|
729 | 731 | |
|
|
730 | 732 | if deltaTime > self.__maxTimeStep: |
|
|
731 | 733 | self.flagResetProcessing = 1 |
|
|
732 | self.ns = 0 | |
|
|
734 | self.nReadBlocks = 0 | |
|
|
733 | 735 | |
|
|
734 | 736 | return 1 |
|
|
735 | 737 | |
| @@ -1052,11 +1054,11 class SpectraReader( DataReader ): | |||
|
|
1052 | 1054 | nTries = 0 |
|
|
1053 | 1055 | while( nTries < self.__nTries ): |
|
|
1054 | 1056 | nTries += 1 |
|
|
1055 | subfolder = "D%04d%03d" % ( startDateTime.timetuple().tm_year,startDateTime.timetuple().tm_yday ) | |
|
|
1056 | file = os.path.join( path, subfolder ) | |
|
|
1057 | print "Searching first file in \"%s\", try %03d ..." % ( file, nTries ) | |
|
|
1057 | subfolder = "D%04d%03d" % ( startDateTime.timetuple().tm_year, startDateTime.timetuple().tm_yday ) | |
|
|
1058 | 1058 | year, doy, set, filename, dirfilename = self.__searchFilesOnLine( path, startDateTime, ext ) |
|
|
1059 | 1059 | if filename == None: |
|
|
1060 | file = os.path.join( path, subfolder ) | |
|
|
1061 | print "Searching first file in \"%s\", try %03d ..." % ( file, nTries ) | |
|
|
1060 | 1062 | time.sleep( self.__delay ) |
|
|
1061 | 1063 | else: |
|
|
1062 | 1064 | break |
| @@ -1083,7 +1085,7 class SpectraReader( DataReader ): | |||
|
|
1083 | 1085 | self.online = online |
|
|
1084 | 1086 | self.__ext = ext |
|
|
1085 | 1087 | |
|
|
1086 | if not(self.__setNextFile()): | |
|
|
1088 | if not( self.__setNextFile() ): | |
|
|
1087 | 1089 | if (startDateTime != None) and (endDateTime != None): |
|
|
1088 | 1090 | print "No files in range: %s - %s" %(startDateTime.ctime(), endDateTime.ctime()) |
|
|
1089 | 1091 | elif startDateTime != None: |
| @@ -1112,7 +1114,7 class SpectraReader( DataReader ): | |||
|
|
1112 | 1114 | return 1 |
|
|
1113 | 1115 | |
|
|
1114 | 1116 | |
|
|
1115 | def readNextBlock(self): | |
|
|
1117 | def readNextBlock( self ): | |
|
|
1116 | 1118 | """ |
|
|
1117 | 1119 | Establece un nuevo bloque de datos a leer y los lee, si es que no existiese |
|
|
1118 | 1120 | mas bloques disponibles en el archivo actual salta al siguiente. |
| @@ -1133,7 +1135,7 class SpectraReader( DataReader ): | |||
|
|
1133 | 1135 | return 1 |
|
|
1134 | 1136 | |
|
|
1135 | 1137 | |
|
|
1136 | def getData(self): | |
|
|
1138 | def getData( self ): | |
|
|
1137 | 1139 | """ |
|
|
1138 | 1140 | Copia el buffer de lectura a la clase "Spectra", |
|
|
1139 | 1141 | con todos los parametros asociados a este (metadata). cuando no hay datos en el buffer de |
| @@ -1143,7 +1145,7 class SpectraReader( DataReader ): | |||
|
|
1143 | 1145 | 0 : Si no hay mas archivos disponibles |
|
|
1144 | 1146 | 1 : Si hizo una buena copia del buffer |
|
|
1145 | 1147 | |
|
|
1146 |
|
|
|
|
1148 | Affected: | |
|
|
1147 | 1149 | self.m_Spectra |
|
|
1148 | 1150 | self.__datablockIndex |
|
|
1149 | 1151 | self.flagResetProcessing |
| @@ -1399,7 +1401,7 class SpectraWriter( DataWriter ): | |||
|
|
1399 | 1401 | self.__writeBasicHeader() |
|
|
1400 | 1402 | return 1 |
|
|
1401 | 1403 | |
|
|
1402 | if not(self.__setNextFile()): | |
|
|
1404 | if not( self.__setNextFile() ): | |
|
|
1403 | 1405 | return 0 |
|
|
1404 | 1406 | |
|
|
1405 | 1407 | return 1 |
| @@ -1533,7 +1535,8 class SpectraWriter( DataWriter ): | |||
|
|
1533 | 1535 | self.m_ProcessingHeader = self.m_Spectra.m_ProcessingHeader.copy() |
|
|
1534 | 1536 | self.__dataType = self.m_Spectra.dataType |
|
|
1535 | 1537 | |
|
|
1536 | def __setHeaderByFile(self): | |
|
|
1538 | ||
|
|
1539 | def __setHeaderByFile( self ): | |
|
|
1537 | 1540 | |
|
|
1538 | 1541 | format = self.__format |
|
|
1539 | 1542 | header = ['Basic','System','RadarController','Processing'] |
| @@ -1611,6 +1614,7 class SpectraWriter( DataWriter ): | |||
|
|
1611 | 1614 | else: |
|
|
1612 | 1615 | print "file access denied:%s"%fileTable |
|
|
1613 | 1616 | sys.exit(0) |
|
|
1617 | ||
|
|
1614 | 1618 | |
|
|
1615 | 1619 | def setup( self, path, format='pdata' ): |
|
|
1616 | 1620 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now