schain-jc Commit - r31:65ff9cdd8241 · Jicamarca Repository

187

188

self.datablock = None

188

self.datablock = None

189

190

self.datablock~~_id~~ = 9999

190

self.__datablockIndex = 9999

191

192

def __rdSystemHeader(self,fp=None):

192

def __rdSystemHeader(self,fp=None):

193

if fp == None:

193

if fp == None:

354

355

Variables afectadas:

355

Variables afectadas:

356

357

self.datablock~~_id~~

357

self.__datablockIndex

358

359

self.datablock

359

self.datablock

360

376

377

data = junk['real'] + junk['imag']*1j

377

data = junk['real'] + junk['imag']*1j

378

379

self.datablock~~_id~~ = 0

379

self.__datablockIndex = 0

380

381

self.datablock = data

381

self.datablock = data

382

389

self.nReadBlocks += 1

389

self.nReadBlocks += 1

390

391

def __hasNotDataInBuffer(self):

391

def __hasNotDataInBuffer(self):

392

if self.datablock~~_id~~ >= self.m_ProcessingHeader.profilesPerBlock:

392

if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:

393

return 1

393

return 1

394

395

return 0

395

return 0

533

534

self.startYear = startDateTime.timetuple().tm_year

534

self.startYear = startDateTime.timetuple().tm_year

535

self.endYear = endDateTime.timetuple().tm_year

535

self.endYear = endDateTime.timetuple().tm_year

536

537

self.startDoy = startDateTime.timetuple().tm_yday

536

self.startDoy = startDateTime.timetuple().tm_yday

538

self.endDoy = endDateTime.timetuple().tm_yday

537

self.endDoy = endDateTime.timetuple().tm_yday

539

538

582

581

583

Variables afectadas:

582

Variables afectadas:

584

self.m_Voltage

583

self.m_Voltage

585

self.datablock~~_id~~

584

self.__datablockIndex

586

self.idProfile

585

self.idProfile

587

586

588

Excepciones:

587

Excepciones:

608

607

609

#data es un numpy array de 3 dmensiones (perfiles, alturas y canales)

608

#data es un numpy array de 3 dmensiones (perfiles, alturas y canales)

610

609

611

time = self.m_BasicHeader.utc + self.datablock~~_id~~*self.__ippSeconds

610

time = self.m_BasicHeader.utc + self.__datablockIndex*self.__ippSeconds

612

self.m_Voltage.m_BasicHeader.utc = time

611

self.m_Voltage.m_BasicHeader.utc = time

613

self.m_Voltage.data = self.datablock[self.datablock_id,:,:]

614

self.m_Voltage.flagNoData = False

612

self.m_Voltage.flagNoData = False

615

self.m_Voltage.flagResetProcessing = self.flagResetProcessing

613

self.m_Voltage.flagResetProcessing = self.flagResetProcessing

616

614

615

self.m_Voltage.data = self.datablock[self.__datablockIndex,:,:]

617

self.m_Voltage.idProfile = self.idProfile

616

self.m_Voltage.idProfile = self.idProfile

618

617

619

618

620

self.datablock~~_id~~ += 1

619

self.__datablockIndex += 1

621

self.idProfile += 1

620

self.idProfile += 1

622

621

623

#call setData - to Data Object

622

#call setData - to Data Object

648

647

649

self.datablock = None

648

self.datablock = None

650

649

651

self.datablock~~_id~~ = 0

650

self.__datablockIndex = 0

652

651

653

self.__dataType = None

652

self.__dataType = None

654

653

673

self.m_ProcessingHeader = ProcessingHeader()

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

def __writeBasicHeader(self, fp=None):

682

def __writeBasicHeader(self, fp=None):

677

if fp == None:

683

if fp == None:

678

fp = self.__fp

684

fp = self.__fp

697

703

698

self.m_ProcessingHeader.write(fp)

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

def __setNextFile(self):

706

def __setNextFile(self):

709

707

710

setFile = self.__setFile

708

setFile = self.__setFile

771

769

772

self.datablock.fill(0)

770

self.datablock.fill(0)

773

771

774

self.datablock~~_id~~ = 0

772

self.__datablockIndex = 0

775

773

776

self.__flagIsNewFile = 0

774

self.__flagIsNewFile = 0

777

775

792

return 1

790

return 1

793

791

794

def __hasAllDataInBuffer(self):

792

def __hasAllDataInBuffer(self):

795

if self.datablock~~_id~~ >= self.m_ProcessingHeader.profilesPerBlock:

793

if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:

796

return 1

794

return 1

797

795

798

return 0

796

return 0

808

806

809

self.datablock.fill(0)

807

self.datablock.fill(0)

810

808

811

self.datablock~~_id~~ = 0

809

self.__datablockIndex = 0

812

self.__setNextFile()

810

self.__setNextFile()

813

811

814

self.datablock[self.datablock~~_id~~,:,:] = self.m_Voltage.data

812

self.datablock[self.__datablockIndex,:,:] = self.m_Voltage.data

815

813

816

self.datablock~~_id~~ += 1

814

self.__datablockIndex += 1

817

815

818

if self.__hasAllDataInBuffer():

816

if self.__hasAllDataInBuffer():

819

817

	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

                     self.datablock = None
-                    self.datablock_id = 9999
+                    self.__datablockIndex = 9999
                 def __rdSystemHeader(self,fp=None):
                     if fp == None:
                     Variables afectadas:
-                        self.datablock_id
+                        self.__datablockIndex
                         self.datablock
                     data = junk['real'] + junk['imag']*1j
-                    self.datablock_id = 0
+                    self.__datablockIndex = 0
                     self.datablock = data
                     self.nReadBlocks += 1
                 def __hasNotDataInBuffer(self):
-                    if self.datablock_id >= self.m_ProcessingHeader.profilesPerBlock:
+                    if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:
                         return 1
                     return 0
                     self.startYear = startDateTime.timetuple().tm_year
                     self.endYear = endDateTime.timetuple().tm_year
                     self.startDoy = startDateTime.timetuple().tm_yday
                     self.endDoy = endDateTime.timetuple().tm_yday
                     Variables afectadas:
                         self.m_Voltage
-                        self.datablock_id
+                        self.__datablockIndex
                         self.idProfile
                     Excepciones:
                     #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
-                    time = self.m_BasicHeader.utc + self.datablock_id*self.__ippSeconds
+                    time = self.m_BasicHeader.utc + self.__datablockIndex*self.__ippSeconds
                     self.m_Voltage.m_BasicHeader.utc = time
-                    self.m_Voltage.data = self.datablock[self.datablock_id,:,:]
                     self.m_Voltage.flagNoData = False
                     self.m_Voltage.flagResetProcessing = self.flagResetProcessing
+                    self.m_Voltage.data = self.datablock[self.__datablockIndex,:,:]
                     self.m_Voltage.idProfile = self.idProfile
-                    self.datablock_id += 1
+                    self.__datablockIndex += 1
                     self.idProfile += 1
                     #call setData - to Data Object
                     self.datablock = None
-                    self.datablock_id = 0
+                    self.__datablockIndex = 0
                     self.__dataType = None
                     self.m_ProcessingHeader = ProcessingHeader()
+                def __writeFirstHeader(self):
+                    self.__writeBasicHeader()
+                    self.__wrSystemHeader()
+                    self.__wrRadarControllerHeader()
+                    self.__wrProcessingHeader()
+                    self.__dataType = self.m_Voltage.dataType
                 def __writeBasicHeader(self, fp=None):
                     if fp == None:
                         fp = self.__fp
                     self.m_ProcessingHeader.write(fp)
-                def __writeFirstHeader(self):
-                    self.__writeBasicHeader()
-                    self.__wrSystemHeader()
-                    self.__wrRadarControllerHeader()
-                    self.__wrProcessingHeader()
-                    self.__dataType = self.m_Voltage.dataType
                 def __setNextFile(self):
                     setFile = self.__setFile
                     self.datablock.fill(0)
-                    self.datablock_id = 0
+                    self.__datablockIndex = 0
                     self.__flagIsNewFile = 0
                     return 1
                 def __hasAllDataInBuffer(self):
-                    if self.datablock_id >= self.m_ProcessingHeader.profilesPerBlock:
+                    if self.__datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:
                         return 1
                     return 0
                         self.datablock.fill(0)
-                        self.datablock_id = 0
+                        self.__datablockIndex = 0
                         self.__setNextFile()
-                    self.datablock[self.datablock_id,:,:] = self.m_Voltage.data
+                    self.datablock[self.__datablockIndex,:,:] = self.m_Voltage.data
-                    self.datablock_id += 1
+                    self.__datablockIndex += 1
                     if self.__hasAllDataInBuffer():