| @@ -70,4 +70,5 properly but the next days did not. | |||
|
|
70 | 70 | |
|
|
71 | 71 | 2.2.4: |
|
|
72 | 72 | -jroproc_spectra_lags.py added to schainpy |
|
|
73 |
-Bug fixed in schainGUI: |
|
|
|
73 | -Bug fixed in schainGUI: ProcUnit was created with the same id in some cases. | |
|
|
74 | -Bug fixed in jroHeaderIO: Header size validation. | |
| @@ -4,4 +4,4 Created on Feb 7, 2012 | |||
|
|
4 | 4 | @author $Author$ |
|
|
5 | 5 | @version $Id$ |
|
|
6 | 6 | ''' |
|
|
7 |
__version__ = "2.2. |
|
|
|
7 | __version__ = "2.2.4" No newline at end of file | |
| @@ -149,6 +149,9 class BasicHeader(Header): | |||
|
|
149 | 149 | self.timeZone = int(header['nTimezone'][0]) |
|
|
150 | 150 | self.dstFlag = int(header['nDstflag'][0]) |
|
|
151 | 151 | self.errorCount = int(header['nErrorCount'][0]) |
|
|
152 | ||
|
|
153 | if self.size < 24: | |
|
|
154 | return 0 | |
|
|
152 | 155 | |
|
|
153 | 156 | return 1 |
|
|
154 | 157 | |
| @@ -213,12 +216,13 class SystemHeader(Header): | |||
|
|
213 | 216 | endFp = self.size + startFp |
|
|
214 | 217 | |
|
|
215 | 218 | if fp.tell() > endFp: |
|
|
216 |
sys.stderr.write("Warning: System |
|
|
|
219 | sys.stderr.write("Warning %s: Size value read from System Header is lower than it has to be\n" %fp.name) | |
|
|
217 | 220 | return 0 |
|
|
218 | 221 | |
|
|
219 | 222 | if fp.tell() < endFp: |
|
|
220 |
sys.stderr.write("Warning: System |
|
|
|
221 | ||
|
|
223 | sys.stderr.write("Warning %s: Size value read from System Header size is greater than it has to be\n" %fp.name) | |
|
|
224 | return 0 | |
|
|
225 | ||
|
|
222 | 226 | return 1 |
|
|
223 | 227 | |
|
|
224 | 228 | def write(self, fp): |
| @@ -356,15 +360,15 class RadarControllerHeader(Header): | |||
|
|
356 | 360 | |
|
|
357 | 361 | if fp.tell() != endFp: |
|
|
358 | 362 | # fp.seek(endFp) |
|
|
359 |
print "Radar Controller Header is not consistent |
|
|
|
363 | print "%s: Radar Controller Header size is not consistent: from data [%d] != from header field [%d]" %(fp.name, fp.tell()-startFp, size) | |
|
|
360 | 364 | # return 0 |
|
|
361 | 365 | |
|
|
362 | 366 | if fp.tell() > endFp: |
|
|
363 |
sys.stderr.write("Warning: Radar Controller header |
|
|
|
367 | sys.stderr.write("Warning %s: Size value read from Radar Controller header is lower than it has to be\n" %fp.name) | |
|
|
364 | 368 | # return 0 |
|
|
365 | 369 | |
|
|
366 | 370 | if fp.tell() < endFp: |
|
|
367 |
sys.stderr.write("Warning: Radar Controller header |
|
|
|
371 | sys.stderr.write("Warning %s: Size value read from Radar Controller header is greater than it has to be\n" %fp.name) | |
|
|
368 | 372 | |
|
|
369 | 373 | |
|
|
370 | 374 | return 1 |
| @@ -141,9 +141,14 def isFileInTimeRange(filename, startDate, endDate, startTime, endTime): | |||
|
|
141 | 141 | print "[Reading] Skipping the file %s because it has not a valid header" %(filename) |
|
|
142 | 142 | return None |
|
|
143 | 143 | |
|
|
144 |
|
|
|
|
145 | sts = radarControllerHeaderObj.read(fp) | |
|
|
146 | sts = processingHeaderObj.read(fp) | |
|
|
144 | if not systemHeaderObj.read(fp): | |
|
|
145 | return None | |
|
|
146 | ||
|
|
147 | if not radarControllerHeaderObj.read(fp): | |
|
|
148 | return None | |
|
|
149 | ||
|
|
150 | if not processingHeaderObj.read(fp): | |
|
|
151 | return None | |
|
|
147 | 152 | |
|
|
148 | 153 | filesize = os.path.getsize(filename) |
|
|
149 | 154 | |
General Comments 0
You need to be logged in to leave comments.
Login now