| @@ -187,7 +187,7 class VoltageReader(DataReader): | |||
|
|
187 | 187 | |
|
|
188 | 188 | self.datablock = None |
|
|
189 | 189 | |
|
|
190 |
self.datablock |
|
|
|
190 | self.__datablockIndex = 9999 | |
|
|
191 | 191 | |
|
|
192 | 192 | def __rdSystemHeader(self,fp=None): |
|
|
193 | 193 | if fp == None: |
| @@ -354,7 +354,7 class VoltageReader(DataReader): | |||
|
|
354 | 354 | |
|
|
355 | 355 | Variables afectadas: |
|
|
356 | 356 | |
|
|
357 |
self.datablock |
|
|
|
357 | self.__datablockIndex | |
|
|
358 | 358 | |
|
|
359 | 359 | self.datablock |
|
|
360 | 360 | |
| @@ -376,7 +376,7 class VoltageReader(DataReader): | |||
|
|
376 | 376 | |
|
|
377 | 377 | data = junk['real'] + junk['imag']*1j |
|
|
378 | 378 | |
|
|
379 |
self.datablock |
|
|
|
379 | self.__datablockIndex = 0 | |
|
|
380 | 380 | |
|
|
381 | 381 | self.datablock = data |
|
|
382 | 382 | |
| @@ -389,7 +389,7 class VoltageReader(DataReader): | |||
|
|
389 | 389 | self.nReadBlocks += 1 |
|
|
390 | 390 | |
|
|
391 | 391 | def __hasNotDataInBuffer(self): |
|
|
392 |
if self.datablock |
|
|
|
392 | if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock: | |
|
|
393 | 393 | return 1 |
|
|
394 | 394 | |
|
|
395 | 395 | return 0 |
| @@ -533,7 +533,6 class VoltageReader(DataReader): | |||
|
|
533 | 533 | |
|
|
534 | 534 | self.startYear = startDateTime.timetuple().tm_year |
|
|
535 | 535 | self.endYear = endDateTime.timetuple().tm_year |
|
|
536 | ||
|
|
537 | 536 | self.startDoy = startDateTime.timetuple().tm_yday |
|
|
538 | 537 | self.endDoy = endDateTime.timetuple().tm_yday |
|
|
539 | 538 | |
| @@ -582,7 +581,7 class VoltageReader(DataReader): | |||
|
|
582 | 581 | |
|
|
583 | 582 | Variables afectadas: |
|
|
584 | 583 | self.m_Voltage |
|
|
585 |
self.datablock |
|
|
|
584 | self.__datablockIndex | |
|
|
586 | 585 | self.idProfile |
|
|
587 | 586 | |
|
|
588 | 587 | Excepciones: |
| @@ -608,16 +607,16 class VoltageReader(DataReader): | |||
|
|
608 | 607 | |
|
|
609 | 608 | #data es un numpy array de 3 dmensiones (perfiles, alturas y canales) |
|
|
610 | 609 | |
|
|
611 |
time = self.m_BasicHeader.utc + self.datablock |
|
|
|
610 | time = self.m_BasicHeader.utc + self.__datablockIndex*self.__ippSeconds | |
|
|
612 | 611 | self.m_Voltage.m_BasicHeader.utc = time |
|
|
613 | self.m_Voltage.data = self.datablock[self.datablock_id,:,:] | |
|
|
614 | 612 | self.m_Voltage.flagNoData = False |
|
|
615 | 613 | self.m_Voltage.flagResetProcessing = self.flagResetProcessing |
|
|
616 | 614 | |
|
|
615 | self.m_Voltage.data = self.datablock[self.__datablockIndex,:,:] | |
|
|
617 | 616 | self.m_Voltage.idProfile = self.idProfile |
|
|
618 | 617 | |
|
|
619 | 618 | |
|
|
620 |
self.datablock |
|
|
|
619 | self.__datablockIndex += 1 | |
|
|
621 | 620 | self.idProfile += 1 |
|
|
622 | 621 | |
|
|
623 | 622 | #call setData - to Data Object |
| @@ -648,7 +647,7 class VoltageWriter(DataWriter): | |||
|
|
648 | 647 | |
|
|
649 | 648 | self.datablock = None |
|
|
650 | 649 | |
|
|
651 |
self.datablock |
|
|
|
650 | self.__datablockIndex = 0 | |
|
|
652 | 651 | |
|
|
653 | 652 | self.__dataType = None |
|
|
654 | 653 | |
| @@ -673,6 +672,13 class VoltageWriter(DataWriter): | |||
|
|
673 | 672 | self.m_ProcessingHeader = ProcessingHeader() |
|
|
674 | 673 | |
|
|
675 | 674 | |
|
|
675 | def __writeFirstHeader(self): | |
|
|
676 | self.__writeBasicHeader() | |
|
|
677 | self.__wrSystemHeader() | |
|
|
678 | self.__wrRadarControllerHeader() | |
|
|
679 | self.__wrProcessingHeader() | |
|
|
680 | self.__dataType = self.m_Voltage.dataType | |
|
|
681 | ||
|
|
676 | 682 | def __writeBasicHeader(self, fp=None): |
|
|
677 | 683 | if fp == None: |
|
|
678 | 684 | fp = self.__fp |
| @@ -697,14 +703,6 class VoltageWriter(DataWriter): | |||
|
|
697 | 703 | |
|
|
698 | 704 | self.m_ProcessingHeader.write(fp) |
|
|
699 | 705 | |
|
|
700 | def __writeFirstHeader(self): | |
|
|
701 | self.__writeBasicHeader() | |
|
|
702 | self.__wrSystemHeader() | |
|
|
703 | self.__wrRadarControllerHeader() | |
|
|
704 | self.__wrProcessingHeader() | |
|
|
705 | self.__dataType = self.m_Voltage.dataType | |
|
|
706 | ||
|
|
707 | ||
|
|
708 | 706 | def __setNextFile(self): |
|
|
709 | 707 | |
|
|
710 | 708 | setFile = self.__setFile |
| @@ -771,7 +769,7 class VoltageWriter(DataWriter): | |||
|
|
771 | 769 | |
|
|
772 | 770 | self.datablock.fill(0) |
|
|
773 | 771 | |
|
|
774 |
self.datablock |
|
|
|
772 | self.__datablockIndex = 0 | |
|
|
775 | 773 | |
|
|
776 | 774 | self.__flagIsNewFile = 0 |
|
|
777 | 775 | |
| @@ -792,7 +790,7 class VoltageWriter(DataWriter): | |||
|
|
792 | 790 | return 1 |
|
|
793 | 791 | |
|
|
794 | 792 | def __hasAllDataInBuffer(self): |
|
|
795 |
if self.datablock |
|
|
|
793 | if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock: | |
|
|
796 | 794 | return 1 |
|
|
797 | 795 | |
|
|
798 | 796 | return 0 |
| @@ -808,12 +806,12 class VoltageWriter(DataWriter): | |||
|
|
808 | 806 | |
|
|
809 | 807 | self.datablock.fill(0) |
|
|
810 | 808 | |
|
|
811 |
self.datablock |
|
|
|
809 | self.__datablockIndex = 0 | |
|
|
812 | 810 | self.__setNextFile() |
|
|
813 | 811 | |
|
|
814 |
self.datablock[self.datablock |
|
|
|
812 | self.datablock[self.__datablockIndex,:,:] = self.m_Voltage.data | |
|
|
815 | 813 | |
|
|
816 |
self.datablock |
|
|
|
814 | self.__datablockIndex += 1 | |
|
|
817 | 815 | |
|
|
818 | 816 | if self.__hasAllDataInBuffer(): |
|
|
819 | 817 | |
General Comments 0
You need to be logged in to leave comments.
Login now