diff --git a/schainpy/model/io/jroIO_kamisr.py b/schainpy/model/io/jroIO_kamisr.py index b26ca86..5bde934 100644 --- a/schainpy/model/io/jroIO_kamisr.py +++ b/schainpy/model/io/jroIO_kamisr.py @@ -132,13 +132,14 @@ class AMISRReader(ProcessingUnit): def readAMISRHeader(self,fp): - if self.isConfig : - newShape = fp.get('Raw11/Data/Samples/Data').shape - if self.dataShape != newShape: - print("\nERROR, NEW FILE IS A DIFFERENT EXPERIMENT \n") + if self.isConfig and (not self.flagNoMoreFiles): + newShape = fp.get('Raw11/Data/Samples/Data').shape[1:] + if self.dataShape != newShape and newShape != None: + print("\nNEW FILE HAS A DIFFERENT SHAPE") + print(self.dataShape,newShape,"\n") return 0 else: - self.dataShape = fp.get('Raw11/Data/Samples/Data').shape + self.dataShape = fp.get('Raw11/Data/Samples/Data').shape[1:] header = 'Raw11/Data/RadacHeader' diff --git a/schainpy/scripts/amisr_eej_proc_offline_v3.py b/schainpy/scripts/amisr_eej_proc_offline_v3.py index 10a359c..fdf8828 100644 --- a/schainpy/scripts/amisr_eej_proc_offline_v3.py +++ b/schainpy/scripts/amisr_eej_proc_offline_v3.py @@ -15,24 +15,25 @@ def main(): desc = "AMISR EEJ Experiment" filename = "amisr_reader.xml" xmin = '07' - xmax = '18' #-> el plot genera +1 en la hora, es decir aparece 18 como máximo + xmax = '18' + xrange = int(xmax)-int(xmin) ymin = '0' ymax = '300' dbmin = '45' #'60'#'55' #'40' #noise esf eej dbmax = '65' #'70' #'55' - showSPC = '1' #view plot Spectra - showRTI = '1' #view plot RTI - showNOISE = '1' #view plot NOISE + showSPC = '0' #view plot Spectra + showRTI = '0' #view plot RTI + showNOISE = '0' #view plot NOISE localtime='1' #para ajustar el horario en las gráficas '0' para dejar en utc code = '1,-1,-1,-1,1,1,1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,1' nCode = '1' nBaud = '28' nosamp = '1' # oversample for EEJ today = time.strftime("%Y/%m/%d") - #startDate=today - #endDate=today - startDate='2021/07/11' - endDate='2021/07/11' + startDate=today + endDate=today + #startDate='2021/07/11' + #endDate='2021/07/11' #inPath= '/home/soporte/dataAMISR_test/' inPath= '/home/soporte/dataAMISR/' inPath= '/media/soporte/UARS_4T_D02/AMISR_DATA/2021/' @@ -63,8 +64,8 @@ def main(): path=inPath, startDate=startDate,#startDate, #'2014/10/07', endDate=endDate, #endDate '2014/10/07', - startTime='17:55:30',#'07:00:00', - endTime='19:00:00',#'15:00:00', + startTime='07:00:00',#'07:00:00', + endTime='18:00:00',#'15:00:00', walk=1, code = code, nCode = nCode, @@ -143,10 +144,10 @@ def main(): opObj14.addParameter(name='wintitle', value='title0', format='str') opObj14.addParameter(name='showprofile', value='0', format='int') opObj14.addParameter(name='tmin', value=xmin, format='int') - opObj14.addParameter(name='tmax', value=xmax, format='int') + opObj14.addParameter(name='xrange', value=xrange, format='int') opObj14.addParameter(name='ymin', value=dbmin, format='int') opObj14.addParameter(name='ymax', value=dbmax, format='int') - opObj14.addParameter(name='save', value=outPath, format='str') + opObj14.addParameter(name='save', value=outPath+'/plots', format='str') opObj14.addParameter(name='localtime', value=localtime,format='int') opObj14.addParameter(name='show', value = showNOISE, format='int') @@ -156,7 +157,7 @@ def main(): opObj15.addParameter(name='localtime', value=localtime,format='int') opObj15.addParameter(name='wintitle', value='RTI', format='str') opObj15.addParameter(name='tmin', value=xmin, format='int') - opObj15.addParameter(name='tmax', value=xmax, format='int') #max value =23 + opObj15.addParameter(name='xrange', value=xrange, format='int') opObj15.addParameter(name='ymin', value=ymin, format='int') opObj15.addParameter(name='zmin', value=dbmin, format='int') opObj15.addParameter(name='zmax', value=dbmax, format='int') @@ -169,19 +170,19 @@ def main(): ##....................................................................................... ##....................................................................................... - - procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj1.getId()) - opObj16 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') + # + # procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj1.getId()) + # opObj16 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') #Using HDFWriter:::: #....................................................................................... #....................................................................................... - opObj17 = procUnitConfObj2.addOperation(name='HDFWriter', optype='external') - opObj17.addParameter(name='path', value=outPath) - opObj17.addParameter(name='blocksPerFile', value='10', format='int') - opObj17.addParameter(name='metadataList',value='type,inputUnit,heightList',format='list') - opObj17.addParameter(name='dataList',value='moments,data_SNR,utctime',format='list') + # opObj17 = procUnitConfObj2.addOperation(name='HDFWriter', optype='external') + # opObj17.addParameter(name='path', value=outPath) + # opObj17.addParameter(name='blocksPerFile', value='10', format='int') + # opObj17.addParameter(name='metadataList',value='type,inputUnit,heightList',format='list') + # opObj17.addParameter(name='dataList',value='moments,data_SNR,utctime',format='list') diff --git a/schainpy/scripts/amisr_eej_proc_online_v3.py b/schainpy/scripts/amisr_eej_proc_online_v3.py index 064011b..f31e64b 100644 --- a/schainpy/scripts/amisr_eej_proc_online_v3.py +++ b/schainpy/scripts/amisr_eej_proc_online_v3.py @@ -15,15 +15,15 @@ def main(): desc = "AMISR EEJ Experiment" filename = "amisr_reader.xml" xmin = '07' - xmax = '18' #-> el plot genera +1 en la hora, es decir aparece 18 como máximo - ymin = '0' - ymax = '300' + xmax = '18' # + xrange = int(xmax)-int(xmin) + dbmin = '45' #'60'#'55' #'40' #noise esf eej dbmax = '65' #'70' #'55' showSPC = '1' #view plot Spectra showRTI = '1' #view plot RTI showNOISE = '1' #view plot NOISE - localtime='0' #para ajustar el horario en las gráficas '0' para dejar en utc + localtime='1' #para ajustar el horario en las gráficas '0' para dejar en utc code = '1,-1,-1,-1,1,1,1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,1' nCode = '1' nBaud = '28' @@ -62,20 +62,20 @@ def main(): startDate=startDate, endDate=endDate, startTime='07:01:30',#'07:00:00', - endTime='18:55:00',#'15:00:00', + endTime='17:55:00',#'15:00:00', walk=0, code = code, nCode = nCode, nBaud = nBaud, - timezone='ut', + timezone='lt', online=1) #AMISR Processing Unit ##....................................................................................... ##....................................................................................... procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', inputId=readUnitConfObj.getId()) - opObj10 = procUnitConfObj0.addOperation(name='setRadarFrequency') - opObj10.addParameter(name='frequency', value='445e6', format='float') + opObj10 = procUnitConfObj0.addOperation(name='setAttribute') + opObj10.addParameter(name='frequency', value='445.0e6') opObj01 = procUnitConfObj0.addOperation(name='Decoder', optype='other') @@ -85,8 +85,6 @@ def main(): opObj01.addParameter(name='osamp', value=nosamp, format='int') - # opObj02 = procUnitConfObj0.addOperation(name='CohInt', optype='other') - # opObj02.addParameter(name='n', value='5', format='int') @@ -100,14 +98,9 @@ def main(): opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') opObj11.addParameter(name='n', value='150', format='int') #300 normal value - # ## Remove DC signal - # opObj11 = procUnitConfObj1.addOperation(name='removeDC') ##....................................................................................... ##....................................................................................... - opObj13 = procUnitConfObj1.addOperation(name='getNoise' , optype ='self') - opObj13.addParameter(name='minHei', value='100', format='float') - opObj13.addParameter(name='maxHei', value='280', format='float') # opObj12 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='external') @@ -124,38 +117,25 @@ def main(): opObj12.addParameter(name='show', value = showSPC, format='int') - - - - - ##Generate *.pdata from AMISR data - ##....................................................................................... - ##....................................................................................... - # opObj13 = procUnitConfObj1.addOperation(name='SpectraWriter', optype='external') - # opObj13.addParameter(name='path', value=outPath) - # opObj13.addParameter(name='blocksPerFile', value='10', format='int') - - - # opObj14 = procUnitConfObj1.addOperation(name='NoisePlot', optype='external') - # opObj14.addParameter(name='id', value='3', format='int') - # opObj14.addParameter(name='wintitle', value='title0', format='str') - # opObj14.addParameter(name='showprofile', value='0', format='int') - # opObj14.addParameter(name='xmin', value=xmin, format='int') - # opObj14.addParameter(name='xmax', value=xmax, format='int') - # opObj14.addParameter(name='ymin', value=dbmin, format='int') - # opObj14.addParameter(name='ymax', value=dbmax, format='int') - # opObj14.addParameter(name='save', value=outPath+'/plots', format='str') - # opObj14.addParameter(name='localtime', value=localtime,format='int') - # opObj14.addParameter(name='show', value = showNOISE, format='int') + opObj14 = procUnitConfObj1.addOperation(name='NoisePlot', optype='external') + opObj14.addParameter(name='id', value='3', format='int') + opObj14.addParameter(name='wintitle', value='title0', format='str') + opObj14.addParameter(name='showprofile', value='0', format='int') + opObj14.addParameter(name='tmin', value=xmin, format='int') + opObj14.addParameter(name='xrange', value=xrange, format='int') + opObj14.addParameter(name='ymin', value=dbmin, format='int') + opObj14.addParameter(name='ymax', value=dbmax, format='int') + opObj14.addParameter(name='save', value=outPath+'/plots', format='str') + opObj14.addParameter(name='localtime', value=localtime,format='int') + opObj14.addParameter(name='show', value = showNOISE, format='int') opObj15 = procUnitConfObj1.addOperation(name='RTIPlot', optype='external') opObj15.addParameter(name='id', value='2', format='int') opObj15.addParameter(name='localtime', value=localtime,format='int') opObj15.addParameter(name='wintitle', value='RTI', format='str') - opObj15.addParameter(name='xmin', value=xmin, format='int') - opObj15.addParameter(name='xmax', value=xmax, format='int') #max value =23 - opObj15.addParameter(name='ymin', value=ymin, format='int') + opObj15.addParameter(name='tmin', value=xmin, format='int') + opObj15.addParameter(name='xrange', value=xrange, format='int') opObj15.addParameter(name='zmin', value=dbmin, format='int') opObj15.addParameter(name='zmax', value=dbmax, format='int') opObj15.addParameter(name='showprofile', value='1', format='int') @@ -168,30 +148,9 @@ def main(): ##....................................................................................... ##....................................................................................... # - # procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj1.getId()) - # opObj16 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') - # - # - # #Using ParamWriter:::: - # ##....................................................................................... - # ##....................................................................................... - # opObj17 = procUnitConfObj2.addOperation(name='ParamWriter', optype='external') - # opObj17.addParameter(name='path', value=outPath) - # opObj17.addParameter(name='blocksPerFile', value='10', format='int') - # opObj17.addParameter(name='metadataList',value='type,inputUnit,heightList',format='list') - # opObj17.addParameter(name='dataList',value='moments,data_SNR,utctime',format='list') - # opObj17.addParameter(name='mode',value='1',format='int') #'0' channels, '1' parameters, '3' table (for meteors) - # ##opObj17.addParameter(name='setType', value ='anything', format='str') - # - - ##....................................................................................... - ##....................................................................................... - #print("Escribiendo el archivo XML",controllerObj.writeXml(path +'/'+filename)) controllerObj.start() - #print("Leyendo el archivo XML",controllerObj.readXml(path +'/'+filename)) - ##....................................................................................... ##....................................................................................... diff --git a/schainpy/scripts/amisr_esf_proc_offline_v3.py b/schainpy/scripts/amisr_esf_proc_offline_v3.py index a34f32a..e60b070 100644 --- a/schainpy/scripts/amisr_esf_proc_offline_v3.py +++ b/schainpy/scripts/amisr_esf_proc_offline_v3.py @@ -23,24 +23,25 @@ def main(): #path = os.path.join(os.environ['HOME'],'amisr') inPath = '/mnt/data_amisr' inPath= '/home/soporte/dataAMISR/' - #path= '/home/soporte/dataAMISR_test/' + inPath= '/media/soporte/DATA/dataAMISR/' + outPath = '/home/soporte/Data/ESF' remotefolder = "/home/wmaster/graficos" - xmin = '19' - xmax = '07' - xrange = (int(xmax)+24)-int(xmin) + xmin = '18' + xmax = '31' + xrange = int(xmax)-int(xmin) dbmin = '60' #'60'#'55' #'40' #noise esf eej dbmax = '75' #'70' #'55' - showSPC = '0' #view plot Spectra + showSPC = '1' #view plot Spectra showRTI = '0' #view plot RTI - showNOISE = '0' #view plot NOISE + showNOISE = '1' #view plot NOISE # # code = '1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,1,1,1,-1,-1,-1' # # code = '1,1,0,1,1,0,1,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,1,1,1,0,0,0' code = '1,-1,-1,-1,1,1,1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,1' nCode = '1' nBaud = '28' nosamp = '2' # oversample - localtime='0' #para ajustar el horario en las gráficas '0' para dejar en utc + localtime='1' #para ajustar el horario en las gráficas '0' para dejar en utc str0 = datetime.date.today() str1 = str0 + datetime.timedelta(days=1) @@ -52,6 +53,8 @@ def main(): startDate=yesterday endDate=today + startDate='2019/12/17' + endDate='2019/12/18' ##....................................................................................... ##....................................................................................... l = startDate.split('/') #adding day of the year to outPath @@ -67,21 +70,21 @@ def main(): ##....................................................................................... controllerObj = Project() - controllerObj.setup(id = '191', name='esf_proc', description=desc) + controllerObj.setup(id = '20', name='esf_proc', description=desc) ##....................................................................................... ##....................................................................................... readUnitConfObj = controllerObj.addReadUnit(datatype='AMISRReader', path=inPath, - startDate='2019/12/17',#startDate,#'2016/07/12', - endDate='2019/12/18',#endDate,#'2016/07/13', - startTime='19:01:30',#'07:00:00', + startDate=startDate,#startDate,#'2016/07/12', + endDate=endDate,#endDate,#'2016/07/13', + startTime='23:40:30',#'07:00:00', endTime='07:00:00',#'15:00:00', walk=0, code = code, nCode = nCode, nBaud = nBaud, - timezone='ut', + timezone='lt', online=0) #AMISR Processing Unit @@ -90,10 +93,10 @@ def main(): #Voltage Processing Unit procUnitConfObjBeam0 = controllerObj.addProcUnit(datatype='VoltageProc', inputId=readUnitConfObj.getId()) - opObj10 = procUnitConfObjBeam0.addOperation(name='setRadarFrequency') - #opObj10.addParameter(name='frequency', value='445e6', format='int') #changed on Dec 3, 15:40h - + opObj10 = procUnitConfObjBeam0.addOperation(name='setAttribute') + opObj10.addParameter(name='frequency', value='445.09e6') + ''' #Noise--> no code opObj11 = procUnitConfObjBeam0.addOperation(name='Decoder', optype='other') @@ -118,15 +121,15 @@ def main(): procUnitConfObjSpectraBeam0 = controllerObj.addProcUnit(datatype='SpectraProc', inputId=procUnitConfObjBeam0.getId()) procUnitConfObjSpectraBeam0.addParameter(name='nFFTPoints', value=16, format='int') # - # opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='IncohInt', optype='other') - # opObj11.addParameter(name='n', value='60', format='int') - # opObj11.addParameter(name='timeInterval', value='30', format='int') + opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='IncohInt', optype='other') + opObj11.addParameter(name='n', value='260', format='int') + #opObj11.addParameter(name='timeInterval', value='30', format='int') # # # # # #RemoveDc - # #opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='removeDC') + #opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='removeDC') # - # ##Noise Estimation + # ##Noise Estimation #so reconoce nueva version # opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='getNoise', optype='self') # opObj11.addParameter(name='minHei', value='100', format='int') # opObj11.addParameter(name='maxHei', value='280', format='int') @@ -145,7 +148,6 @@ def main(): opObj11.addParameter(name='id', value='1', format='int') opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') opObj11.addParameter(name='showprofile', value='1', format='int') - #opObj11.addParameter(name='zmin', value='38', format='int') opObj11.addParameter(name='zmin', value=dbmin, format='int') opObj11.addParameter(name='zmax', value=dbmax, format='int') opObj11.addParameter(name='save', value=outPath+'/plots', format='str') @@ -164,7 +166,7 @@ def main(): opObj11.addParameter(name='id', value='2', format='int') opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') opObj11.addParameter(name='showprofile', value='0', format='int') - opObj11.addParameter(name='xmin', value=xmin, format='int') + opObj11.addParameter(name='tmin', value=xmin, format='int') opObj11.addParameter(name='xrange', value=xrange, format='int') opObj11.addParameter(name='zmin', value=dbmin, format='int') opObj11.addParameter(name='zmax', value=dbmax, format='int') @@ -186,8 +188,8 @@ def main(): opObj11.addParameter(name='id', value='3', format='int') opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') opObj11.addParameter(name='showprofile', value='0', format='int') - opObj11.addParameter(name='xmin', value=xmin, format='int') - opObj11.addParameter(name='xrange', value=xrange,format='int') + opObj11.addParameter(name='tmin', value=xmin, format='int') + opObj11.addParameter(name='xrange', value=xrange, format='int') #opObj11.addParameter(name='ymin', value=dbmin, format='int') #opObj11.addParameter(name='ymax', value=dbmax, format='int') opObj11.addParameter(name='save', value=outPath+'/plots', format='str') @@ -198,11 +200,11 @@ def main(): opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='SpectraWriter', optype='external') opObj11.addParameter(name='path', value=outPath) opObj11.addParameter(name='blocksPerFile', value='10', format='int') - + ''' ##....................................................................................... ##....................................................................................... - #generate moments + # #generate moments # procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObjSpectraBeam0.getId()) # opObj20 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') # @@ -213,15 +215,15 @@ def main(): # opObj12.addParameter(name='dataList',value='moments,data_SNR,utctime',format='list') # opObj12.addParameter(name='mode',value='1',format='int') # - - #---- + # + # ---- # print "Escribiendo el archivo XML" - # controllerObj.writeXml(filename) + # controllerObj.writeXml(outPath+"/"filename) controllerObj.start() # print "Leyendo el archivo XML" - # controllerObj.readXml(filename) + # controllerObj.readXml(outPath+"/"filename) if __name__ == '__main__': import time diff --git a/schainpy/scripts/amisr_esf_proc_online_v3.py b/schainpy/scripts/amisr_esf_proc_online_v3.py index 6bf33fe..df0edf4 100644 --- a/schainpy/scripts/amisr_esf_proc_online_v3.py +++ b/schainpy/scripts/amisr_esf_proc_online_v3.py @@ -26,14 +26,13 @@ def main(): #inPath= '/home/soporte/dataAMISR_test/' outPath = '/home/soporte/Data/ESF' remotefolder = "/home/wmaster/graficos" - xmin = '16' + xmin = '18' xmax = '07' - xrange = (int(xmax)+24)-int(xmin) dbmin = '60' #'60'#'55' #'40' #noise esf eej dbmax = '75' #'70' #'55' showSPC = '1' #view plot Spectra showRTI = '1' #view plot RTI - showNOISE = '0' #view plot NOISE + showNOISE = '1' #view plot NOISE # # code = '1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,1,1,1,-1,-1,-1' # # code = '1,1,0,1,1,0,1,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,1,1,1,0,0,0' code = '1,-1,-1,-1,1,1,1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,1' @@ -67,7 +66,7 @@ def main(): ##....................................................................................... controllerObj = Project() - controllerObj.setup(id = '191', name='esf_proc', description=desc) + controllerObj.setup(id = '21', name='esf_proc', description=desc) ##....................................................................................... ##....................................................................................... @@ -126,16 +125,10 @@ def main(): # # #RemoveDc #opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='removeDC') - ##Noise Estimation - opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='getNoise', optype='self') - opObj11.addParameter(name='minHei', value='100', format='int') - opObj11.addParameter(name='maxHei', value='280', format='int') - #opObj11.addParameter(name='minHei', value='15', format='int') - #opObj11.addParameter(name='maxHei', value='20', format='int') #--- - # opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='selectChannels') - # opObj11.addParameter(name='channelList', value='7,8,9', format='intlist') + opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='selectChannels') + opObj11.addParameter(name='channelList', value='0,2,4,6,8', format='intlist') ##....................................................................................... ##....................................................................................... @@ -145,7 +138,6 @@ def main(): opObj11.addParameter(name='id', value='1', format='int') opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') opObj11.addParameter(name='showprofile', value='1', format='int') - #opObj11.addParameter(name='zmin', value='38', format='int') opObj11.addParameter(name='zmin', value=dbmin, format='int') opObj11.addParameter(name='zmax', value=dbmax, format='int') opObj11.addParameter(name='save', value=outPath+'/plots', format='str') @@ -166,8 +158,8 @@ def main(): opObj11.addParameter(name='id', value='2', format='int') opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') opObj11.addParameter(name='showprofile', value='0', format='int') - opObj11.addParameter(name='xmin', value=xmin, format='int') - opObj11.addParameter(name='xrange', value=xrange,format='int') + opObj11.addParameter(name='tmin', value=xmin, format='int') + opObj11.addParameter(name='tmax', value=xmax,format='int') opObj11.addParameter(name='zmin', value=dbmin, format='int') opObj11.addParameter(name='zmax', value=dbmax, format='int') opObj11.addParameter(name='save', value=outPath+'/plots', format='str') @@ -184,40 +176,18 @@ def main(): # # # # #Noise #title0 = 'RTI AMISR Beam 0' - # opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='NoisePlot', optype='external') - # opObj11.addParameter(name='id', value='3', format='int') - # opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') - # opObj11.addParameter(name='showprofile', value='0', format='int') - # opObj11.addParameter(name='xmin', value=xmin, format='int') - # opObj11.addParameter(name='xmin', value=xmin, format='int') - # opObj11.addParameter(name='xrange', value='16',format='int') - # #opObj11.addParameter(name='ymin', value=dbmin, format='int') - # #opObj11.addParameter(name='ymax', value=dbmax, format='int') - # opObj11.addParameter(name='save', value=outPath+'/plots', format='str') - # opObj11.addParameter(name='show', value = showNOISE, format='int') - # opObj11.addParameter(name='localtime', value=localtime,format='int') - # - # #Generate *.pdata from AMISR data - # opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='SpectraWriter', optype='external') - # opObj11.addParameter(name='path', value=outPath, format='str') - # opObj11.addParameter(name='blocksPerFile', value='10', format='int') - # - # ##....................................................................................... - # ##....................................................................................... - # - # #generate moments - # procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObjSpectraBeam0.getId()) - # opObj20 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') - # - # opObj12 = procUnitConfObj2.addOperation(name='ParamWriter', optype='external') - # opObj12.addParameter(name='path', value=outPath) - # opObj12.addParameter(name='blocksPerFile', value='10', format='int') - # opObj12.addParameter(name='metadataList',value='type,inputUnit,heightList',format='list') - # opObj12.addParameter(name='dataList',value='moments,data_SNR,utctime',format='list') - # opObj12.addParameter(name='mode',value='1',format='int') - # + opObj11 = procUnitConfObjSpectraBeam0.addOperation(name='NoisePlot', optype='external') + opObj11.addParameter(name='id', value='3', format='int') + opObj11.addParameter(name='wintitle', value='ESF AMISR', format='str') + opObj11.addParameter(name='showprofile', value='0', format='int') + opObj11.addParameter(name='tmin', value=xmin, format='int') + opObj11.addParameter(name='tmax', value=xmax, format='int') + ##opObj11.addParameter(name='ymin', value=dbmin, format='int') + ##opObj11.addParameter(name='ymax', value=dbmax, format='int') + opObj11.addParameter(name='save', value=outPath+'/plots', format='str') + opObj11.addParameter(name='show', value = showNOISE, format='int') + opObj11.addParameter(name='localtime', value=localtime,format='int') - #---- # print "Escribiendo el archivo XML" diff --git a/schainpy/scripts/test1.py b/schainpy/scripts/test1.py index 63a3cf5..545c95e 100644 --- a/schainpy/scripts/test1.py +++ b/schainpy/scripts/test1.py @@ -16,7 +16,7 @@ def main(): controllerObj = Project() - controllerObj.setup(id = '10', name='eej_proc', description=desc) + controllerObj.setup(id = '100', name='eej_proc', description=desc) #path = os.path.join(os.environ['HOME'],'amisr') @@ -25,16 +25,16 @@ def main(): # path = '/media/soporte/E9F4-F053/AMISR/Data/ESF' #path = '/mnt/data_amisr' - path = '/home/soporte/Data/EEJ/EEJ2021192' + path = '/home/soporte/Data/EEJ/EEJ2021192/' + path = '/home/soporte/Data/ESF/ESF2019351/' #figpath = os.path.join(os.environ['HOME'],'Pictures/amisr/test/proc/esf') #figpath = '/media/soporte/E9F4-F053/AMISR/Data/JULIA/ESF' figpath = '/home/soporte/Data/OutTest/EEJ' + figpath = '/home/soporte/Data/OutTest/ESF' + xmin = '18' + xmax = '07' #-> el plot genera +1 en la hora, es decir aparece 18 como máximo - xmin = '07' - xmax = '18' #-> el plot genera +1 en la hora, es decir aparece 18 como máximo - ymin = '0' - ymax = '300' dbmin = '45' #'60'#'55' #'40' #noise esf eej dbmax = '65' #'70' #'55' showSPC = '1' #view plot Spectra @@ -62,10 +62,10 @@ def main(): readUnitConfObj = controllerObj.addReadUnit(datatype='Spectra', path=path, - startDate='2021/07/11', - endDate='2021/07/11', - startTime='07:01:30',#'07:00:00', - endTime='18:00:00',#'15:00:00', + startDate='2019/12/17',#'2021/07/11', + endDate='2019/12/18', + startTime='00:01:30',#'07:00:00', + endTime='07:00:00',#'15:00:00', walk=1, timezone='lt', online=0) @@ -94,7 +94,7 @@ def main(): op3 = proc_spectra.addOperation(name='SpectraPlot', optype='external') op3.addParameter(name='id', value='21', format='int') op3.addParameter(name='xaxis', value='velocity') - op3.addParameter(name='ymax', value=ymax, format='int') + #op3.addParameter(name='ymax', value=ymax, format='int') op3.addParameter(name='showprofile', value='1', format='int') op3.addParameter(name='wintitle', value='AMISR Beam 0', format='str') op3.addParameter(name='zmin', value=dbmin, format='int') @@ -115,7 +115,7 @@ def main(): op4.addParameter(name='wintitle', value='RTI', format='str') #op4.addParameter(name='xmin', value=xmin, format='int') op4.addParameter(name='xmax', value=xmax, format='int') #max value =23 - op4.addParameter(name='ymin', value=ymin, format='int') + #op4.addParameter(name='ymin', value=ymin, format='int') #op4.addParameter(name='ymax', value=ymax, format='int') op4.addParameter(name='zmin', value=dbmin, format='int') op4.addParameter(name='zmax', value=dbmax, format='int') diff --git a/schainpy/scripts/test2.py b/schainpy/scripts/test2.py index e52832f..a5afc6b 100644 --- a/schainpy/scripts/test2.py +++ b/schainpy/scripts/test2.py @@ -34,11 +34,12 @@ def main(): #path = '/media/soporte/AMISR_104' #outPath = os.path.join(os.environ['HOME'],'Pictures/amisr/test/proc/esf') #outPath = '/media/soporte/E9F4-F053/AMISR/Data/JULIA/ESF' - outPath = '/home/soporte/Data/ESF' + outPath = '/home/soporte/Data/OutTest/ESF' remotefolder = "/home/wmaster/graficos" + #figpath = '/home/soporte/Data/OutTest/EEJ' - xmin = '17' - xmax = '32' + xmin = '18' + xmax = '07' dbmin = '60' #'60'#'55' #'40' #noise esf eej dbmax = '75' #'70' #'55' show = '1' @@ -50,8 +51,8 @@ def main(): nosamp = '2' # oversample localtime='1' #para ajustar el horario en las gráficas '0' para dejar en utc - startDate='2020/03/05' - endDate='2020/03/06' + startDate='2019/03/17' + endDate='2019/12/18' # str = datetime.date.today() #ONLINE # str1 = str + datetime.timedelta(days=1) @@ -286,8 +287,8 @@ def main(): # print "Escribiendo el archivo XML" - filename="/home/soporte/workspace/schain/schainpy/scripts/joab.xml" - controllerObj.writeXml(filename) + #filename="/home/soporte/workspace/schain/schainpy/scripts/joab.xml" + #controllerObj.writeXml(filename) controllerObj.start() # print "Leyendo el archivo XML"