schain-jc Commit - r998:3cfafdf000de

algo

José Chávez -

r998:3cfafdf000de

parent child

Context file:

r998:3cfafdf000de

Collapse all files

schainpy/model/io/jroIO_digitalRF.py +11 -12

                         online
                         delay
                     '''
+                    self.i = 0
                     if not os.path.isdir(path):
                         raise ValueError, "[Reading] Directory %s does not exist" %path
                     self.__deltaHeigth = 1e6*0.15/self.__sample_rate ## why 0.15?
                     this_metadata_file = self.digitalReadObj.get_digital_metadata(channelNameList[channelList[0]])
-                    print this_metadata_file
                     metadata_bounds = this_metadata_file.get_bounds()
                     self.fixed_metadata_dict = this_metadata_file.read(metadata_bounds[0])[metadata_bounds[0]] ## GET FIRST HEADER
                     self.__processingHeader = self.fixed_metadata_dict['processingHeader']
                     if end_index < endUTCSecond*self.__sample_rate:
                         endUTCSecond = end_index/self.__sample_rate
-                    print ippKm
                     if not nSamples:
                         if not ippKm:
                             raise ValueError, "[Reading] nSamples or ippKm should be defined"
                         nSamples = int(ippKm / (1e6*0.15/self.__sample_rate))
-                    print nSamples
                     channelBoundList = []
                     channelNameListFiltered = []
                     return
                     # print self.profileIndex
-                ##@profile
                 def run(self, **kwargs):
                     '''
                     This method will be called many times so here you should put all your code
                     if not self.isConfig:
                         self.setup(**kwargs)
-                    self.i = self.i+1
+                    #self.i = self.i+1
                     self.getData(seconds=self.__delay)
                     return
                     self.__nSamples = dataOut.systemHeaderObj.nSamples
                     self.__nProfiles = dataOut.nProfiles
                     self.__blocks_per_file = dataOut.processingHeaderObj.dataBlocksPerFile
-                    self.arr_data = arr_data = numpy.ones((self.__nSamples, 2), dtype=[('r', self.__dtype), ('i', self.__dtype)])
+                    self.arr_data = arr_data = numpy.ones((self.__nSamples, len(self.dataOut.channelList)), dtype=[('r', self.__dtype), ('i', self.__dtype)])
                     file_cadence_millisecs = long(1.0 * self.__blocks_per_file * self.__nProfiles * self.__nSamples / self.__sample_rate) * 1000
                     sub_cadence_secs = file_cadence_millisecs / 500
                     return
-                def run(self, dataOut, frequency=49.92e6, path=None, fileCadence=1000, dirCadence=100, metadataCadence=1, **kwargs):
+                def run(self, dataOut, frequency=49.92e6, path=None, fileCadence=100, dirCadence=25, metadataCadence=1, **kwargs):
                     '''
                     This method will be called many times so here you should put all your code
                     Inputs:
                     self.dataOut = dataOut
                     if not self.isConfig:
                         self.setup(dataOut, path, frequency, fileCadence, dirCadence, metadataCadence, **kwargs)
+                        self.writeMetadata()
                     self.writeData()
-                    self.currentSample += 1
+                    ## self.currentSample += 1
-                    if self.dataOut.flagDataAsBlock or self.currentSample == 1:
+                    ## if self.dataOut.flagDataAsBlock or self.currentSample == 1:
-                        self.writeMetadata()
+                        ## self.writeMetadata()
-                    if self.currentSample == self.__nProfiles: self.currentSample = 0
+                    ## if self.currentSample == self.__nProfiles: self.currentSample = 0
                 def close(self):
                     print '[Writing] - Closing files '

schainpy/model/io/jroIO_voltage.py +2 -2

                     Return:
                         None
                     """
                     ProcessingUnit.__init__(self, **kwargs)
+                    self.i = 0
                     self.isConfig = False
                     self.datablock = None

schainpy/scripts/JASMET30_MetDet.py +1 -1

             # path = '/mnt/jars/2016_08/NOCHE'
             # path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/DIA'
             # path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/NOCHE'
-            path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/DIA'
+            path = '/media/nanosat/NewVolumen/JASMET/2016_08/DIA'
             #Path para los graficos
             pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/graphics')

schainpy/scripts/schain.xml +1 -1

	@@ -1,1 +1,1
	1	<Project description="Testing USRP data reader" id="191" name="test01"><ReadUnit datatype="DigitalRF" id="1911" inputId="0" name="DigitalRFReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="DigitalRF" /><Parameter format="str" id="191112" name="path" value="/media/jchavez/DATA/mocked_data" /><Parameter format="date" id="191113" name="startDate" value="2000/07/03" /><Parameter format="date" id="191114" name="endDate" value="2017/07/03" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="Voltage" id="1912" inputId="1911" name="VoltageProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project> No newline at end of file		1	<Project description="Testing USRP data reader" id="191" name="test01"><ReadUnit datatype="Voltage" id="1911" inputId="0" name="VoltageReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="Voltage" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/data/John" /><Parameter format="date" id="191113" name="startDate" value="2000/07/03" /><Parameter format="date" id="191114" name="endDate" value="2017/07/03" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="blockTime" value="100" /><Parameter format="int" id="191119" name="walk" value="0" /><Parameter format="int" id="191120" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="VoltageProc" id="1912" inputId="1911" name="VoltageProc"><Operation id="19121" name="run" priority="1" type="self" /><Operation id="19122" name="Decoder" priority="2" type="external"><Parameter format="intlist" id="191221" name="code" value="1,-1,-1,1,-1" /><Parameter format="int" id="191222" name="nCode" value="5" /><Parameter format="int" id="191223" name="nBaud" value="1" /></Operation></ProcUnit></Project> No newline at end of file

schainpy/scripts/testDigitalRF.py +3 -3

                 #Creating a reader object with its parameters
                 #schainpy.model.io.jroIO_usrp.USRPReader.setup()
                 readUnitConfObj = controllerObj.addReadUnit(datatype='DigitalRF',
-                                                            path='/media/jchavez/DATA/mocked_data',
+                                                            path='/home/nanosat/data/',
                                                             startDate='2000/07/03',
                                                             endDate='2017/07/03',
                                                             startTime='00:00:00',
                                                             endTime='23:59:59',
                                                             online=0)
-                procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage',
+                # procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage',
-                                                             inputId=readUnitConfObj.getId())
+                #                                              inputId=readUnitConfObj.getId())
             #     opObj10 = procUnitConfObj0.addOperation(name='selectHeights')
             #     opObj10.addParameter(name='minHei', value='0', format='float')

schainpy/scripts/testDigitalRFWriter.py +2 -2

                 controllerObj.setup(id = '191', name='test01', description=desc)
                 readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader',
-                                                            path='/home/jchavez/jicamarca/jro_data/rawdata/',
+                                                            path='/home/nanosat/data/John',
                                                             startDate='2010/10/28',
                                                             endDate='2017/10/28',
                                                             startTime='00:00:00',
                 # opObj11.addParameter(name='wintitle', value='Scope', format='str')
                 opObj10 = procUnitConfObj0.addOperation(name='DigitalRFWriter', optype='other')
-                opObj10.addParameter(name='path', value='/media/jchavez/DATA/mocked_data/voltage', format='str')
+                opObj10.addParameter(name='path', value='/home/nanosat/data/digitalrf', format='str')
                 # opObj10.addParameter(name='minHei', value='0', format='float')
                 # opObj10.addParameter(name='maxHei', value='8', format='float')

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