From a0a227f9ae68df6d9d2a1861622b8be2ddca14d9 2018-05-10 20:50:03 From: ebocanegra Date: 2018-05-10 20:50:03 Subject: [PATCH] Final Commit! GG WP, no bugs. --- diff --git a/schainpy/model/io/jroIO_bltr.py b/schainpy/model/io/jroIO_bltr.py index 70ea6b7..bcfe1f0 100644 --- a/schainpy/model/io/jroIO_bltr.py +++ b/schainpy/model/io/jroIO_bltr.py @@ -793,3 +793,11 @@ class BLTRSpectraReader (ProcessingUnit, FileHeaderBLTR, RecordHeaderBLTR, JRODa self.dataOut.ChanDist = self.ChanDist + + + self.BlockCounter+=2 + + else: + self.fileSelector+=1 + self.BlockCounter=0 + print "Next File" \ No newline at end of file diff --git a/schainpy/model/proc/jroproc_parameters.py b/schainpy/model/proc/jroproc_parameters.py index 747f3e2..1a8b01f 100755 --- a/schainpy/model/proc/jroproc_parameters.py +++ b/schainpy/model/proc/jroproc_parameters.py @@ -907,7 +907,7 @@ class FullSpectralAnalysis(Operation): - + '''Nota: Cambiar el signo de numpy.array(velocityX) cuando se intente procesar datos de BLTR''' data_output[0] = numpy.array(velocityX) #self.moving_average(numpy.array(velocityX) , N=1) data_output[1] = numpy.array(velocityY) #self.moving_average(numpy.array(velocityY) , N=1) data_output[2] = velocityV#FirstMoment @@ -916,6 +916,8 @@ class FullSpectralAnalysis(Operation): dataOut.data_output=data_output + print 'velocidad zonal', data_output[0] + return diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index a386061..83d7d4b 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/testProcBLTR.py b/schainpy/scripts/testProcBLTR.py index 0da67aa..71cac74 100644 --- a/schainpy/scripts/testProcBLTR.py +++ b/schainpy/scripts/testProcBLTR.py @@ -23,7 +23,8 @@ controllerObj.setup(id='191', name='test01', description=desc) readUnitConfObj = controllerObj.addReadUnit(datatype='BLTRSpectraReader', #path='/media/erick/6F60F7113095A154/BLTR/', #path='/data/BLTR', - path='/home/erick/Documents/Data/BLTR_Data/fdt/', + path = '/data/BLTR/2018/enero', + #path='/home/erick/Documents/Data/BLTR_Data/fdt/', endDate='2016/11/01', startTime='0:00:00', startDate='2016/11/01', @@ -117,10 +118,10 @@ opObj22.addParameter(name='zmax_ver', value='300', format='float') opObj22.addParameter(name='SNRmin', value='-5', format='int') opObj22.addParameter(name='SNRmax', value='30', format='int') # opObj22.addParameter(name='SNRthresh', value='-3.5', format='float') -opObj22.addParameter(name='xmin', value='0', format='float') -opObj22.addParameter(name='xmax', value='24', format='float') -opObj22.addParameter(name='ymin', value='225', format='float') -#opObj22.addParameter(name='ymax', value='2000', format='float') +opObj22.addParameter(name='xmin', value='4', format='float') +opObj22.addParameter(name='xmax', value='9', format='float') +opObj22.addParameter(name='ymin', value='0', format='float') +opObj22.addParameter(name='ymax', value='4000', format='float') opObj22.addParameter(name='save', value='1', format='int') opObj22.addParameter(name='figpath', value=figpath, format='str')