diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py index 99567b3..5bca03e 100644 --- a/schainpy/model/io/jroIO_digitalRF.py +++ b/schainpy/model/io/jroIO_digitalRF.py @@ -584,7 +584,7 @@ class DigitalRFWriter(Operation): 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 @@ -601,7 +601,7 @@ class DigitalRFWriter(Operation): compression_level = 1 checksum = False is_complex = True - num_subchannels = 1 + num_subchannels = 2 is_continuous = True marching_periods = False @@ -635,8 +635,9 @@ class DigitalRFWriter(Operation): def writeData(self): for i in range(self.dataOut.systemHeaderObj.nSamples): - self.arr_data[i]['r'] = self.dataOut.data[0][i].real - self.arr_data[i]['i'] = self.dataOut.data[0][i].imag + for channel in self.dataOut.channelList: + 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 diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 0332c1c..5c1e9a9 100644 --- a/schainpy/scripts/schain.xml +++ b/schainpy/scripts/schain.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/schainpy/scripts/testDigitalRF.py b/schainpy/scripts/testDigitalRF.py index 791931b..e63bd64 100644 --- a/schainpy/scripts/testDigitalRF.py +++ b/schainpy/scripts/testDigitalRF.py @@ -49,9 +49,9 @@ def main(): # opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external') # opObj10.addParameter(name='n', value='1', format='float') - # opObj11 = procUnitConfObj0.addOperation(name='Scope', optype='external') - # opObj11.addParameter(name='id', value='121', format='int') - # opObj11.addParameter(name='wintitle', value='Scope', format='str') + opObj11 = procUnitConfObj0.addOperation(name='Scope', optype='external') + opObj11.addParameter(name='id', value='121', format='int') + opObj11.addParameter(name='wintitle', value='Scope', format='str') # procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', # inputId=procUnitConfObj0.getId()) diff --git a/schainpy/scripts/testDigitalRFWriter.py b/schainpy/scripts/testDigitalRFWriter.py index a75c7de..5e235a7 100644 --- a/schainpy/scripts/testDigitalRFWriter.py +++ b/schainpy/scripts/testDigitalRFWriter.py @@ -30,7 +30,7 @@ if __name__ == '__main__': # 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')