diff --git a/.gitignore b/.gitignore index d63b165..622afa0 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,5 @@ ENV/ .vscode -schainpy/scripts/ \ No newline at end of file +schainpy/scripts/ +schaingui/node_modules/ \ No newline at end of file diff --git a/schainpy/scripts/JASMET30_MetDet.py b/schainpy/scripts/JASMET30_MetDet.py index 870f1f0..e5e56ac 100644 --- a/schainpy/scripts/JASMET30_MetDet.py +++ b/schainpy/scripts/JASMET30_MetDet.py @@ -1,11 +1,6 @@ import os, sys -path = os.path.split(os.getcwd())[0] -path = os.path.split(path)[0] - -sys.path.insert(0, path) - from schainpy.controller import Project controllerObj = Project() @@ -18,7 +13,7 @@ controllerObj.setup(id = '002', name='script02', description="JASMET Meteor Dete # 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') @@ -84,14 +79,7 @@ opObj12.addParameter(name='blocksPerFile', value='1000', format='int') opObj12.addParameter(name='metadataList',value='type,heightList,paramInterval,timeZone',format='list') opObj12.addParameter(name='dataList',value='data_param,utctime',format='list') opObj12.addParameter(name='mode',value='2',format='int') - -#-------------------------------------------------------------------------------------------------- -print "Escribiendo el archivo XML" -controllerObj.writeXml("JASMET02.xml") -print "Leyendo el archivo XML" -controllerObj.readXml("JASMET02.xml") +#-------------------------------------------------------------------------------------------------- -controllerObj.createObjects() -controllerObj.connectObjects() -controllerObj.run() \ No newline at end of file +controllerObj.start() diff --git a/schainpy/scripts/JASMET30_PhaseCal.py b/schainpy/scripts/JASMET30_PhaseCal.py index 25b4d61..1b0da1f 100644 --- a/schainpy/scripts/JASMET30_PhaseCal.py +++ b/schainpy/scripts/JASMET30_PhaseCal.py @@ -14,17 +14,17 @@ controllerObj.setup(id = '004', name='script04', description="JASMET Phase Calib #Verificar estas variables #Path donde estan los archivos HDF5 de meteoros -path = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/meteor') +path = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/meteor') #Path para los graficos -pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/graphics') +pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/graphics') #Path donde se almacenaran las fases calculadas -pathfile = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/phase') +pathfile = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/phase') #Fechas para busqueda de archivos -startDate = '2016/08/20' -endDate = '2016/08/30' +startDate = '2016/08/29' +endDate = '2016/09/11' #Horas para busqueda de archivos startTime = '00:00:00' endTime = '23:59:59' @@ -32,8 +32,8 @@ endTime = '23:59:59' #------------------------------------------------------------------------------------------------ readUnitConfObj = controllerObj.addReadUnit(datatype='ParamReader', path=path, - startDate='2016/06/02', - endDate='2017/06/03', + startDate=startDate, + endDate=endDate, startTime=startTime, endTime=endTime, walk=1) @@ -65,13 +65,4 @@ opObj33.addParameter(name='metadataList',value='type,outputInterval,timeZone',fo opObj33.addParameter(name='dataList',value='data_output,utctime',format='list') # # opObj25.addParameter(name='mode',value='1,0,0',format='intlist') -#-------------------------------------------------------------------------------------------------- - -print "Escribiendo el archivo XML" -controllerObj.writeXml("JASMET04.xml") -print "Leyendo el archivo XML" -controllerObj.readXml("JASMET04.xml") - -controllerObj.createObjects() -controllerObj.connectObjects() -controllerObj.run() \ No newline at end of file +controllerObj.start() \ No newline at end of file diff --git a/schainpy/scripts/JASMET30_Winds.py b/schainpy/scripts/JASMET30_Winds.py index a58ae11..f489be5 100644 --- a/schainpy/scripts/JASMET30_Winds.py +++ b/schainpy/scripts/JASMET30_Winds.py @@ -14,23 +14,24 @@ controllerObj.setup(id = '005', name='script05', description="JASMET Wind Estima #Verificar estas variables #Path donde estan los archivos HDF5 de meteoros -path = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/meteor') +path = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/meteor') #Path para los graficos -pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/graphics') +pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/graphics') #Path donde se almacenaran las estimaciones de vientos -pathfile = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/phase') +pathfile = os.path.join(os.environ['HOME'],'Pictures/JASMET30_mp/201608/phase') #Fechas para busqueda de archivos -startDate = '2016/08/20' -endDate = '2016/08/30' +startDate = '2016/08/29' +endDate = '2016/09/11' #Horas para busqueda de archivos startTime = '00:00:00' endTime = '23:59:59' #Offsets optimos obtenidos con OptimumOffset.py -phaseOffsets = '-2.84, -1.77, 11.94, 9.71' +phaseOffsets = '-2.84, -1.77, 11.94, 9.71' +phaseOffsets = '-5.86, -0.93, -7.29, 23.35' #------------------------------------------------------------------------------------------------ readUnitConfObj = controllerObj.addReadUnit(datatype='ParamReader', path=path, @@ -81,11 +82,4 @@ opObj33.addParameter(name='metadataList',value='type,outputInterval,timeZone',fo opObj33.addParameter(name='dataList',value='data_output,utctime',format='list') #-------------------------------------------------------------------------------------------------- -print "Escribiendo el archivo XML" -controllerObj.writeXml("JASMET05.xml") -print "Leyendo el archivo XML" -controllerObj.readXml("JASMET05.xml") - -controllerObj.createObjects() -controllerObj.connectObjects() -controllerObj.run() \ No newline at end of file +controllerObj.start() \ No newline at end of file diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py index 0ab780a..0c66244 100644 --- a/schainpy/scripts/PPD.py +++ b/schainpy/scripts/PPD.py @@ -11,20 +11,20 @@ def fiber(cursor, skip, q, dt): controllerObj.setup(id='191', name='test01', description=desc) readUnitConfObj = controllerObj.addReadUnit(datatype='SpectraReader', - path='/home/nanosat/data/sp1_f0', - startDate=dt, - endDate=dt, - startTime="00:00:00", - endTime="23:59:59", - online=0, - #set=1426485881, - walk=1, - queue=q, - cursor=cursor, - skip=skip, - verbose=1 - #timezone=-5*3600 - ) + path='/home/nanosat/data/sp1_f0', + startDate=dt, + endDate=dt, + startTime="00:00:00", + endTime="23:59:59", + online=0, + #set=1426485881, + walk=1, + queue=q, + cursor=cursor, + skip=skip, + verbose=1 + #timezone=-5*3600 + ) # #opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') # diff --git a/schainpy/scripts/optimun_offset.py b/schainpy/scripts/optimun_offset.py index 8ebcba0..4ce8f4c 100644 --- a/schainpy/scripts/optimun_offset.py +++ b/schainpy/scripts/optimun_offset.py @@ -93,7 +93,7 @@ def filterOffsets(offsets0, stdvLimit): #---------------------- Setup --------------------------- -path = '/home/jespinoza/Pictures/JASMET30/201608/phase' +path = '/home/nanosat/Pictures/JASMET30_mp/201608/phase' stdvLimit = 0.5 #---------------------- Script --------------------------- diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index f486119..71d75c7 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