schain Commit - r984:84eae4cc1a10 · Jicamarca Repository

subchannels instead of channels writer

Jose Chavez -

r984:84eae4cc1a10

parent child

Context file:

r984:84eae4cc1a10

Collapse all files

schainpy/model/io/jroIO_digitalRF.py +5 -4

                     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, 1), dtype=[('r', self.__dtype), ('i', self.__dtype)])
+                    self.arr_data = arr_data = numpy.ones((self.__nSamples, 2), 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
                     compression_level = 1
                     checksum = False
                     is_complex = True
-                    num_subchannels = 1
+                    num_subchannels = 2
                     is_continuous = True
                     marching_periods = False
                 def writeData(self):
                     for i in range(self.dataOut.systemHeaderObj.nSamples):
-                        self.arr_data[i]['r'] = self.dataOut.data[0][i].real
+                        for channel in self.dataOut.channelList:
-                        self.arr_data[i]['i'] = self.dataOut.data[0][i].imag
+                            self.arr_data[i][channel]['r'] = self.dataOut.data[channel][i].real
+                            self.arr_data[i][channel]['i'] = self.dataOut.data[channel][i].imag
                     self.digitalWriteObj.rf_write(self.arr_data)
                     return

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="/home/jchavez/jicamarca/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="Segundo Test" id="191" name="test01"><ReadUnit datatype="VoltageReader" id="1911" inputId="0" name="VoltageReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="VoltageReader" /><Parameter format="str" id="191112" name="path" value="/home/jchavez/jicamarca/jro_data/rawdata" /><Parameter format="date" id="191113" name="startDate" value="2010/10/28" /><Parameter format="date" id="191114" name="endDate" value="2017/10/28" /><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" /><Parameter format="int" id="191119" name="walk" value="0" /></Operation><Operation id="19112" name="printNumberOfBlock" priority="2" type="self" /></ReadUnit><ProcUnit datatype="VoltageProc" id="1912" inputId="1911" name="VoltageProc"><Operation id="19121" name="run" priority="1" type="self" /><Operation id="19122" name="DigitalRFWriter" priority="2" type="other"><Parameter format="str" id="191221" name="path" value="/media/jchavez/DATA/mocked_data/voltage" /></Operation></ProcUnit></Project> No newline at end of file

schainpy/scripts/testDigitalRF.py +3 -3

                 # opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external')
                 # opObj10.addParameter(name='n', value='1', format='float')
-                # opObj11 = procUnitConfObj0.addOperation(name='Scope', optype='external')
+                opObj11 = procUnitConfObj0.addOperation(name='Scope', optype='external')
-                # opObj11.addParameter(name='id', value='121', format='int')
+                opObj11.addParameter(name='id', value='121', format='int')
-                # opObj11.addParameter(name='wintitle', value='Scope', format='str')
+                opObj11.addParameter(name='wintitle', value='Scope', format='str')
                 # procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra',
                 #                                              inputId=procUnitConfObj0.getId())

schainpy/scripts/testDigitalRFWriter.py +1 -1

                 # opObj11.addParameter(name='wintitle', value='Scope', format='str')
                 opObj10 = procUnitConfObj0.addOperation(name='DigitalRFWriter', optype='other')
-                opObj10.addParameter(name='path', value='/home/jchavez/jicamarca/mocked_data/voltage', format='str')
+                opObj10.addParameter(name='path', value='/media/jchavez/DATA/mocked_data/voltage', 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