diff --git a/schainpy/model/__init__.py b/schainpy/model/__init__.py index 576cc69..a93f393 100644 --- a/schainpy/model/__init__.py +++ b/schainpy/model/__init__.py @@ -2,3 +2,4 @@ from model.data.jrodata import * from model.io.jrodataIO import * from model.proc.jroprocessing import * from model.graphics.jroplot import * +from model.utils.jroutils import * \ No newline at end of file diff --git a/schainpy/model/data/jroheaderIO.py b/schainpy/model/data/jroheaderIO.py index 1fd3984..0c78cb1 100644 --- a/schainpy/model/data/jroheaderIO.py +++ b/schainpy/model/data/jroheaderIO.py @@ -305,7 +305,8 @@ class RadarControllerHeader(Header): self.code[ic,ib] = temp[ib/32]%2 temp[ib/32] = temp[ib/32]/2 self.code = 2.0*self.code - 1.0 - + self.code_size = int(numpy.ceil(self.nBaud/32.))*self.nCode*4 + if self.line5Function == RCfunction.FLIP: self.flip1 = numpy.fromfile(fp,' 0: -# - fp.seek(endFp) + jumpFp = endFp - fp.tell() + if jumpFp > 0: + fp.seek(jumpFp) except Exception, e: print "RadarControllerHeader: " + e diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index efdd9f6..151288b 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -182,29 +182,22 @@ class SpectraPlot(Figure): self.draw() - if save: - + if figfile == None: + str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S") + figfile = self.getFilename(name = str_datetime) + + if figpath != '': self.counter_imagwr += 1 - if (self.counter_imagwr==wr_period): - if figfile == None: - str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S") - figfile = self.getFilename(name = str_datetime) - + if (self.counter_imagwr>=wr_period): + # store png plot to local folder self.saveFigure(figpath, figfile) - - if ftp: - #provisionalmente envia archivos en el formato de la web en tiempo real - name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) - path = '%s%03d' %(self.PREFIX, self.id) - ftp_file = os.path.join(path,'ftp','%s.png'%name) - self.saveFigure(figpath, ftp_file) - ftp_filename = os.path.join(figpath,ftp_file) - self.sendByFTP_Thread(ftp_filename, server, folder, username, password) - self.counter_imagwr = 0 - - + # store png plot to FTP server according to RT-Web format + name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) + ftp_filename = os.path.join(figpath, name) + self.saveFigure(figpath, ftp_filename) self.counter_imagwr = 0 + class CrossSpectraPlot(Figure): isConfig = None @@ -595,55 +588,27 @@ class RTIPlot(Figure): self.draw() -# if lastone: -# if dataOut.blocknow >= dataOut.last_block: -# if figfile == None: -# figfile = self.getFilename(name = self.name) -# self.saveFigure(figpath, figfile) -# -# if (save and not(lastone)): -# -# self.counter_imagwr += 1 -# if (self.counter_imagwr==wr_period): -# if figfile == None: -# figfile = self.getFilename(name = self.name) -# self.saveFigure(figpath, figfile) -# -# if ftp: -# #provisionalmente envia archivos en el formato de la web en tiempo real -# name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) -# path = '%s%03d' %(self.PREFIX, self.id) -# ftp_file = os.path.join(path,'ftp','%s.png'%name) -# self.saveFigure(figpath, ftp_file) -# ftp_filename = os.path.join(figpath,ftp_file) -# self.sendByFTP_Thread(ftp_filename, server, folder, username, password) -# self.counter_imagwr = 0 -# -# self.counter_imagwr = 0 - - #if ((dataOut.utctime-time.timezone) >= self.axesList[0].xmax): - self.saveFigure(figpath, figfile) if x[1] >= self.axesList[0].xmax: - self.saveFigure(figpath, figfile) - self.isConfig = False + self.counter_imagwr = wr_period + self.__isConfig = False + + if figfile == None: + str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S") + figfile = self.getFilename(name = str_datetime) + + if figpath != '': -# if x[1] + (x[1]-x[0]) >= self.axesList[0].xmax: -# -# self.isConfig = False - -# if lastone: -# if figfile == None: -# figfile = self.getFilename(name = self.name) -# self.saveFigure(figpath, figfile) -# -# if ftp: -# #provisionalmente envia archivos en el formato de la web en tiempo real -# name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) -# path = '%s%03d' %(self.PREFIX, self.id) -# ftp_file = os.path.join(path,'ftp','%s.png'%name) -# self.saveFigure(figpath, ftp_file) -# ftp_filename = os.path.join(figpath,ftp_file) -# self.sendByFTP_Thread(ftp_filename, server, folder, username, password) + self.counter_imagwr += 1 + if (self.counter_imagwr>=wr_period): + # store png plot to local folder + self.saveFigure(figpath, figfile) + # store png plot to FTP server according to RT-Web format + name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) + ftp_filename = os.path.join(figpath, name) + self.saveFigure(figpath, ftp_filename) + + self.counter_imagwr = 0 + class CoherenceMap(Figure): isConfig = None @@ -778,12 +743,6 @@ class CoherenceMap(Figure): for i in range(self.nplots): pair = dataOut.pairsList[pairsIndexList[i]] -# coherenceComplex = dataOut.data_cspc[pairsIndexList[i],:,:]/numpy.sqrt(dataOut.data_spc[pair[0],:,:]*dataOut.data_spc[pair[1],:,:]) -# avgcoherenceComplex = numpy.average(coherenceComplex, axis=0) -# coherence = numpy.abs(avgcoherenceComplex) - -## coherence = numpy.abs(coherenceComplex) -## avg = numpy.average(coherence, axis=0) ccf = numpy.average(dataOut.data_cspc[pairsIndexList[i],:,:],axis=0) powa = numpy.average(dataOut.data_spc[pair[0],:,:],axis=0) @@ -814,9 +773,9 @@ class CoherenceMap(Figure): grid='x') counter += 1 -# phase = numpy.arctan(-1*coherenceComplex.imag/coherenceComplex.real)*180/numpy.pi + phase = numpy.arctan2(avgcoherenceComplex.imag, avgcoherenceComplex.real)*180/numpy.pi -# avg = numpy.average(phase, axis=0) + z = phase.reshape((1,-1)) title = "Phase %d%d: %s" %(pair[0], pair[1], thisDatetime.strftime("%d-%b-%Y %H:%M:%S")) @@ -838,32 +797,25 @@ class CoherenceMap(Figure): self.draw() if x[1] >= self.axesList[0].xmax: - self.saveFigure(figpath, figfile) - self.isConfig = False + self.counter_imagwr = wr_period + self.__isConfig = False -# if save: -# -# self.counter_imagwr += 1 -# if (self.counter_imagwr==wr_period): -# if figfile == None: -# figfile = self.getFilename(name = self.name) -# self.saveFigure(figpath, figfile) -# -# if ftp: -# #provisionalmente envia archivos en el formato de la web en tiempo real -# name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) -# path = '%s%03d' %(self.PREFIX, self.id) -# ftp_file = os.path.join(path,'ftp','%s.png'%name) -# self.saveFigure(figpath, ftp_file) -# ftp_filename = os.path.join(figpath,ftp_file) -# self.sendByFTP_Thread(ftp_filename, server, folder, username, password) -# self.counter_imagwr = 0 -# -# self.counter_imagwr = 0 -# -# -# if x[1] + (x[1]-x[0]) >= self.axesList[0].xmax: -# self.isConfig = False + if figfile == None: + str_datetime = thisDatetime.strftime("%Y%m%d_%H%M%S") + figfile = self.getFilename(name = str_datetime) + + if figpath != '': + + self.counter_imagwr += 1 + if (self.counter_imagwr>=wr_period): + # store png plot to local folder + self.saveFigure(figpath, figfile) + # store png plot to FTP server according to RT-Web format + name = self.getNameToFtp(thisDatetime, self.FTP_WEI, self.EXP_CODE, self.SUB_EXP_CODE, self.PLOT_CODE, self.PLOT_POS) + ftp_filename = os.path.join(figpath, name) + self.saveFigure(figpath, ftp_filename) + + self.counter_imagwr = 0 class PowerProfile(Figure): isConfig = None diff --git a/schainpy/model/utils/__init__.py b/schainpy/model/utils/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/schainpy/model/utils/__init__.py diff --git a/schainpy/model/utils/jroutils.py b/schainpy/model/utils/jroutils.py new file mode 100644 index 0000000..842d53a --- /dev/null +++ b/schainpy/model/utils/jroutils.py @@ -0,0 +1 @@ +from jroutils_ftp import * \ No newline at end of file diff --git a/schainpy/model/utils/jroutils_ftp.py b/schainpy/model/utils/jroutils_ftp.py new file mode 100644 index 0000000..dc5fc6d --- /dev/null +++ b/schainpy/model/utils/jroutils_ftp.py @@ -0,0 +1,348 @@ +''' +@author: Daniel Suarez +''' +import os +import glob +import ftplib +from model.proc.jroproc_base import ProcessingUnit, Operation + +class FTP(): + """ + Ftp is a public class used to define custom File Transfer Protocol from "ftplib" python module + + Non-standard Python modules used: None + + Written by "Daniel Suarez":mailto:daniel.suarez@jro.igp.gob.pe Oct. 26, 2010 + """ + + def __init__(self,server = None, username=None, password=None, remotefolder=None): + """ + This method is used to setting parameters for FTP and establishing connection to remote server + + Inputs: + server - remote server IP Address + + username - remote server Username + + password - remote server password + + remotefolder - remote server current working directory + + Return: void + + Affects: + self.status - in Error Case or Connection Failed this parameter is set to 1 else 0 + + self.folderList - sub-folder list of remote folder + + self.fileList - file list of remote folder + + + """ + + if ((server == None) and (username==None) and (password==None) and (remotefolder==None)): + server, username, password, remotefolder = self.parmsByDefault() + + self.server = server + self.username = username + self.password = password + self.remotefolder = remotefolder + self.file = None + self.ftp = None + self.status = 0 + + try: + self.ftp = ftplib.FTP(self.server) + self.ftp.login(self.username,self.password) + self.ftp.cwd(self.remotefolder) +# print 'Connect to FTP Server: Successfully' + + except ftplib.all_errors: + print 'Error FTP Service' + self.status = 1 + return + + + + self.dirList = [] + + try: + self.dirList = self.ftp.nlst() + + except ftplib.error_perm, resp: + if str(resp) == "550 No files found": + print "no files in this directory" + self.status = 1 + return + + except ftplib.all_errors: + print 'Error Displaying Dir-Files' + self.status = 1 + return + + self.fileList = [] + self.folderList = [] + #only for test + for f in self.dirList: + name, ext = os.path.splitext(f) + if ext != '': + self.fileList.append(f) +# print 'filename: %s - size: %d'%(f,self.ftp.size(f)) + + def parmsByDefault(self): + server = 'jro-app.igp.gob.pe' + username = 'wmaster' + password = 'mst2010vhf' + remotefolder = '/home/wmaster/graficos' + + return server, username, password, remotefolder + + + def mkd(self,dirname): + """ + mkd is used to make directory in remote server + + Input: + dirname - directory name + + Return: + 1 in error case else 0 + """ + try: + self.ftp.mkd(dirname) + except: + print 'Error creating remote folder:%s'%dirname + return 1 + + return 0 + + + def delete(self,filename): + """ + delete is used to delete file in current working directory of remote server + + Input: + filename - filename to delete in remote folder + + Return: + 1 in error case else 0 + """ + + try: + self.ftp.delete(filename) + except: + print 'Error deleting remote file:%s'%filename + return 1 + + return 0 + + def download(self,filename,localfolder): + """ + download is used to downloading file from remote folder into local folder + + Inputs: + filename - filename to donwload + + localfolder - directory local to store filename + + Returns: + self.status - 1 in error case else 0 + """ + + self.status = 0 + + + if not(filename in self.fileList): + print 'filename:%s not exists'%filename + self.status = 1 + return self.status + + newfilename = os.path.join(localfolder,filename) + + self.file = open(newfilename, 'wb') + + try: + print 'Download: ' + filename + self.ftp.retrbinary('RETR ' + filename, self.__handleDownload) + print 'Download Complete' + except ftplib.all_errors: + print 'Error Downloading ' + filename + self.status = 1 + return self.status + + self.file.close() + + return self.status + + + def __handleDownload(self,block): + """ + __handleDownload is used to handle writing file + """ + self.file.write(block) + + + def upload(self,filename,remotefolder=None): + """ + upload is used to uploading local file to remote directory + + Inputs: + filename - full path name of local file to store in remote directory + + remotefolder - remote directory + + Returns: + self.status - 1 in error case else 0 + """ + + if remotefolder == None: + remotefolder = self.remotefolder + + self.status = 0 + + try: + self.ftp.cwd(remotefolder) + + self.file = open(filename, 'rb') + + (head, tail) = os.path.split(filename) + + command = "STOR " + tail + + print 'Uploading: ' + tail + self.ftp.storbinary(command, self.file) + print 'Upload Completed' + + except ftplib.all_errors: + print 'Error Uploading ' + tail + self.status = 1 + return self.status + + self.file.close() + + #back to initial directory in __init__() + self.ftp.cwd(self.remotefolder) + + return self.status + + + def dir(self,remotefolder): + """ + dir is used to change working directory of remote server and get folder and file list + + Input: + remotefolder - current working directory + + Affects: + self.fileList - file list of working directory + + Return: + infoList - list with filenames and size of file in bytes + + self.folderList - folder list + """ + + self.remotefolder = remotefolder + print 'Change to ' + self.remotefolder + try: + self.ftp.cwd(remotefolder) + except ftplib.all_errors: + print 'Error Change to ' + self.remotefolder + infoList = None + self.folderList = None + return infoList,self.folderList + + self.dirList = [] + + try: + self.dirList = self.ftp.nlst() + + except ftplib.error_perm, resp: + if str(resp) == "550 No files found": + print "no files in this directory" + infoList = None + self.folderList = None + return infoList,self.folderList + except ftplib.all_errors: + print 'Error Displaying Dir-Files' + infoList = None + self.folderList = None + return infoList,self.folderList + + infoList = [] + self.fileList = [] + self.folderList = [] + for f in self.dirList: + name,ext = os.path.splitext(f) + if ext != '': + self.fileList.append(f) + value = (f,self.ftp.size(f)) + infoList.append(value) + + if ext == '': + self.folderList.append(f) + + return infoList,self.folderList + + + def close(self): + """ + close is used to close and end FTP connection + + Inputs: None + + Return: void + + """ + self.ftp.close() + +class SendByFTP(Operation): + def __init__(self): + self.status = 1 + + def error_print(self, ValueError): + print ValueError, 'Error FTP' + print "don't worry the program is running..." + + def connect(self, server, username, password, remotefolder): + if not(self.status): + return + try: + self.ftpObj = FTP(server, username, password, remotefolder) + except: + self.error_print(ValueError) + self.status = 0 + + def put(self): + if not(self.status): + return + + try: + for filename in self.filenameList: + self.ftpObj.upload(filename) + except: + self.error_print(ValueError) + self.status = 0 + + def close(self): + if not(self.status): + return + + self.ftpObj.close() + + def filterByExt(self, ext, localfolder): + fnameList = glob.glob1(localfolder,ext) + self.filenameList = [os.path.join(localfolder,x) for x in fnameList] + + if len(self.filenameList) == 0: + self.status = 0 + + def run(self, dataOut, ext, localfolder, remotefolder, server, username, password): + + self.filterByExt(ext, localfolder) + + self.connect(server, username, password, remotefolder) + + self.put() + + self.close() diff --git a/schainpy/test/EWDriftsApp.py b/schainpy/test/EWDriftsApp.py index 01764c3..8a520d3 100644 --- a/schainpy/test/EWDriftsApp.py +++ b/schainpy/test/EWDriftsApp.py @@ -14,46 +14,42 @@ controllerObj.setup(id = '191', name='test01', description=desc) path='/remote/ewdrifts/RAW_EXP/EW_DRIFT_FARADAY/EW_Drift' -path = '/Users/dsuarez/Documents/Radar/drifts' -path = '/Users/dsuarez/Documents/EW_DRIFT_WITH_TR' -path = '/home/administrator/Radar/drifts/2014' -readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', + +path = '/home/signalchain/Puma/2014_07/EW_Drift' + +readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', path=path, - startDate='2014/01/11', - endDate='2014/12/12', + startDate='2014/07/01', + endDate='2014/07/30', startTime='00:00:00', endTime='23:59:59', online=0, delay=5, walk=0) -procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage', inputId=readUnitConfObj.getId()) +opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') -opObj11 = procUnitConfObj0.addOperation(name='Scope', optype='other') -opObj11.addParameter(name='id', value='101', format='int') -opObj11.addParameter(name='wintitle', value='AMISR', format='str') +procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', inputId=readUnitConfObj.getId()) -# -# opObj11 = procUnitConfObj0.addOperation(name='ProfileSelector', optype='other') -# opObj11.addParameter(name='profileRangeList', value='0,127', format='intlist') -# -# opObj11 = procUnitConfObj0.addOperation(name='filterByHeights') -# opObj11.addParameter(name='window', value='3', format='int') -# -# opObj11 = procUnitConfObj0.addOperation(name='Decoder', optype='other') -# -# -# procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj0.getId()) -# procUnitConfObj1.addParameter(name='nFFTPoints', value='128', format='int') -# procUnitConfObj1.addParameter(name='nProfiles', value='128', format='int') -# -# -# opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') -# opObj11.addParameter(name='timeInterval', value='60', format='float') -# -# opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') -# opObj11.addParameter(name='id', value='100', format='int') -# opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str') +opObj11 = procUnitConfObj0.addOperation(name='ProfileSelector', optype='other') +opObj11.addParameter(name='profileRangeList', value='0,127', format='intlist') + +opObj11 = procUnitConfObj0.addOperation(name='filterByHeights') +opObj11.addParameter(name='window', value='3', format='int') + +opObj11 = procUnitConfObj0.addOperation(name='Decoder', optype='other') + +procUnitConfObj1 = controllerObj.addProcUnit(datatype='SpectraProc', inputId=procUnitConfObj0.getId()) +procUnitConfObj1.addParameter(name='nFFTPoints', value='128', format='int') +procUnitConfObj1.addParameter(name='nProfiles', value='128', format='int') + + +opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') +opObj11.addParameter(name='timeInterval', value='60', format='float') + +opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') +opObj11.addParameter(name='id', value='100', format='int') +opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str') # #opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') # # opObj11.addParameter(name='zmin', value='0', format='int') # # opObj11.addParameter(name='zmax', value='100', format='int') @@ -74,7 +70,7 @@ opObj11.addParameter(name='wintitle', value='AMISR', format='str') # #opObj11 = procUnitConfObj1.addOperation(name='PowerProfilePlot', optype='other') -#opObj11.addParameter(name='idfigure', value='2', format='int') +#opObj11.addParameter(name='id', value='2', format='int') #opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') #opObj11.addParameter(name='save', value='1', format='bool') #opObj11.addParameter(name='figpath', value='/home/dsuarez/Pictures/EW_DRIFTS_2012_DEC', format='str') @@ -82,7 +78,7 @@ opObj11.addParameter(name='wintitle', value='AMISR', format='str') ##opObj11.addParameter(name='xmax', value='40', format='int') # # opObj11 = procUnitConfObj1.addOperation(name='CrossSpectraPlot', optype='other') -# opObj11.addParameter(name='idfigure', value='3', format='int') +# opObj11.addParameter(name='id', value='3', format='int') # opObj11.addParameter(name='wintitle', value='CrossSpectraPlot', format='str') # #opObj11.addParameter(name='save', value='1', format='bool') # #opObj11.addParameter(name='figpath', value='/home/dsuarez/Pictures/EW_DRIFTS_2012_DEC', format='str') diff --git a/schainpy/test/Imaging_Plots.py b/schainpy/test/Imaging_Plots.py index 53c9270..979155b 100644 --- a/schainpy/test/Imaging_Plots.py +++ b/schainpy/test/Imaging_Plots.py @@ -12,78 +12,60 @@ controllerObj = Project() controllerObj.setup(id = '191', name='test01', description=desc) -path = '/home/dsuarez/EW_Faraday_imaging' -path = '/media/datos/IMAGING/IMAGING/abril2014' +path = '/media/signalchain/datos/IMAGING/IMAGING/setiembre2014' -readUnitConfObj = controllerObj.addReadUnit(datatype='Spectra', +readUnitConfObj = controllerObj.addReadUnit(datatype='SpectraReader', path=path, - startDate='2013/09/27', - endDate='2013/09/27', - startTime='19:00:00', + startDate='2014/09/22', + endDate='2014/09/22', + startTime='00:30:00', endTime='23:59:59', - delay=2, - online=1, + delay=5, + online=0, walk=1) opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') ######################## IMAGING ############################################# -procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) - - -# opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') -# opObj11.addParameter(name='n', value='2', format='float') +procUnitConfObj1 = controllerObj.addProcUnit(datatype='SpectraProc', inputId=readUnitConfObj.getId()) opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') opObj11.addParameter(name='id', value='2000', format='int') opObj11.addParameter(name='wintitle', value='Imaging', format='str') -# opObj11.addParameter(name='zmin', value='35', format='int') -# opObj11.addParameter(name='zmax', value='45', format='int') -# opObj11.addParameter(name='ymin', value='0', format='int') -# opObj11.addParameter(name='ymax', value='300', format='int') -opObj11.addParameter(name='save', value='1', format='int') -opObj11.addParameter(name='figpath', value='/home/dsuarez/Pictures/imaging_abril2014', format='str') -opObj11.addParameter(name='wr_period', value='5', format='int') -opObj11.addParameter(name='ftp', value='1', format='int') -opObj11.addParameter(name='server', value='jro-app.igp.gob.pe', format='str') -opObj11.addParameter(name='folder', value='/home/wmaster/graficos', format='str') -opObj11.addParameter(name='username', value='wmaster', format='str') -opObj11.addParameter(name='password', value='mst2010vhf', format='str') -opObj11.addParameter(name='ftp_wei', value='0', format='int') +opObj11.addParameter(name='zmin', value='15', format='int') +opObj11.addParameter(name='zmax', value='45', format='int') +opObj11.addParameter(name='figpath', value='/home/signalchain/Pictures/imaging', format='str') opObj11.addParameter(name='exp_code', value='13', format='int') -opObj11.addParameter(name='sub_exp_code', value='0', format='int') -opObj11.addParameter(name='plot_pos', value='0', format='int') - -# opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') -# opObj11.addParameter(name='id', value='101', format='int') -# opObj11.addParameter(name='wintitle', value='Imaging', format='str') -# opObj11.addParameter(name='xmin', value='19', format='float') -# opObj11.addParameter(name='xmax', value='24', format='float') -# opObj11.addParameter(name='save', value='1', format='int') -# # opObj11.addParameter(name='figfile', value='rti-imaging.png', format='str') -# opObj11.addParameter(name='figpath', value='/home/dsuarez/Pictures/imaging_last_night', format='str') -# opObj11.addParameter(name='ftp', value='1', format='int') -# opObj11.addParameter(name='ftpratio', value='3', format='int') - - + +opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') +opObj11.addParameter(name='id', value='3001', format='int') +opObj11.addParameter(name='wintitle', value='Imaging', format='str') +opObj11.addParameter(name='xmin', value='20.5', format='float') +opObj11.addParameter(name='xmax', value='24', format='float') +opObj11.addParameter(name='zmin', value='15', format='int') +opObj11.addParameter(name='zmax', value='45', format='int') +opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') +opObj11.addParameter(name='showprofile', value='0', format='int') +opObj11.addParameter(name='figpath', value='/home/signalchain/Pictures/imaging', format='str') +opObj11.addParameter(name='exp_code', value='13', format='int') + opObj11 = procUnitConfObj1.addOperation(name='CoherenceMap', optype='other') opObj11.addParameter(name='id', value='2001', format='int') opObj11.addParameter(name='wintitle', value='Imaging', format='str') -opObj11.addParameter(name='xmin', value='17', format='float') +opObj11.addParameter(name='xmin', value='20.5', format='float') opObj11.addParameter(name='xmax', value='24', format='float') -opObj11.addParameter(name='save', value='1', format='int') -opObj11.addParameter(name='figpath', value='/home/dsuarez/Pictures/imaging_abril2014', format='str') -opObj11.addParameter(name='wr_period', value='5', format='int') -opObj11.addParameter(name='ftp', value='1', format='int') +opObj11.addParameter(name='figpath', value='/home/signalchain/Pictures/imaging', format='str') +opObj11.addParameter(name='exp_code', value='13', format='int') + +opObj11 = procUnitConfObj1.addOperation(name='SendByFTP', optype='other') +opObj11.addParameter(name='ext', value='*.png', format='str') +opObj11.addParameter(name='localfolder', value='/home/signalchain/Pictures/imaging', format='str') +opObj11.addParameter(name='remotefolder', value='/home/wmaster/graficos', format='str') opObj11.addParameter(name='server', value='jro-app.igp.gob.pe', format='str') -opObj11.addParameter(name='folder', value='/home/wmaster/graficos', format='str') opObj11.addParameter(name='username', value='wmaster', format='str') opObj11.addParameter(name='password', value='mst2010vhf', format='str') -opObj11.addParameter(name='ftp_wei', value='0', format='int') -opObj11.addParameter(name='exp_code', value='13', format='int') -opObj11.addParameter(name='sub_exp_code', value='0', format='int') -opObj11.addParameter(name='plot_pos', value='0', format='int') + print "Escribiendo el archivo XML" controllerObj.writeXml(filename) diff --git a/schainpy/test/Imaging_Proc.py b/schainpy/test/Imaging_Proc.py index 97b99d4..9e3f4a7 100644 --- a/schainpy/test/Imaging_Proc.py +++ b/schainpy/test/Imaging_Proc.py @@ -12,14 +12,12 @@ controllerObj = Project() controllerObj.setup(id = '191', name='test01', description=desc) -path = '/remote' -path = '/home/dsuarez/.gvfs/data on 10.10.20.13/EW_Faraday_imaging/d2013270' -path = '/home/dsuarez/.gvfs/data on 10.10.20.13/EW_Faraday_imaging' +path = '/home/signalchain/Documents/remote_data/EW_Faraday_imaging' -readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', +readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', path=path, - startDate='2014/04/21', - endDate='2014/04/30', + startDate='2014/09/21', + endDate='2014/09/30', startTime='16:00:00', endTime='23:59:59', delay=5, @@ -29,28 +27,19 @@ readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') ######################## IMAGING ############################################# -procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage', inputId=readUnitConfObj.getId()) +procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', inputId=readUnitConfObj.getId()) # opObj11 = procUnitConfObj0.addOperation(name='ProfileSelector', optype='other') opObj11.addParameter(name='profileRangeList', value='0,39', format='intlist') # opObj11.addParameter(name='profileRangeList', value='40,167', format='intlist') -# opObj11 = procUnitConfObj0.addOperation(name='filterByHeights') -# opObj11.addParameter(name='window', value='4', format='int') opObj11 = procUnitConfObj0.addOperation(name='Decoder', optype='other') # opObj11.addParameter(name='code', value='1,0,0,1,0,0,-1,0,0,-1,0,0,-1,0,0,1,0,0', format='floatlist') # opObj11.addParameter(name='nCode', value='2', format='int') # opObj11.addParameter(name='nBaud', value='9', format='int') -#opObj11 = procUnitConfObj0.addOperation(name='selectHeights') -#opObj11.addParameter(name='maxHei', value='300', format='float') - -#opObj11 = procUnitConfObj0.addOperation(name='selectHeights') -#opObj11.addParameter(name='minHei', value='300', format='float') -#opObj11.addParameter(name='maxHei', value='600', format='float') - -procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj0.getId()) +procUnitConfObj1 = controllerObj.addProcUnit(datatype='SpectraProc', inputId=procUnitConfObj0.getId()) procUnitConfObj1.addParameter(name='nProfiles', value='40', format='int') procUnitConfObj1.addParameter(name='nFFTPoints', value='40', format='int') @@ -68,7 +57,7 @@ opObj11.addParameter(name='timeInterval', value='5', format='float') opObj11 = procUnitConfObj1.addOperation(name='SpectraWriter', optype='other') -opObj11.addParameter(name='path', value='/media/datos/IMAGING/IMAGING/abril2014') +opObj11.addParameter(name='path', value='/media/signalchain/datos/IMAGING/IMAGING/setiembre2014') opObj11.addParameter(name='blocksPerFile', value='10', format='int')