From 6c2220d5daf4f40a627ada582fa0960650e4f934 2015-03-18 14:23:21
From: Alexander Valdez <alexander.valdez@jro.igp.gob.pe>
Date: 2015-03-18 14:23:21
Subject: [PATCH] Last update

---

diff --git a/schainpy/test/hf_test.py b/schainpy/test/hf_test.py
index 39fcedb..0aff4c7 100644
--- a/schainpy/test/hf_test.py
+++ b/schainpy/test/hf_test.py
@@ -32,7 +32,8 @@ controllerObj.setup(id = '191', name='test01', description=desc)
 #path='/media/APOLLO/HF_rawdata/cspec'
 #path="/media/APOLLO/HF_rawdata/d2015059/sp01_f0" #f0=2.72e6
 #path="/media/APOLLO/HF_rawdata/d2015059/sp01_f1" #f0=3.64e6
-path='/media/APOLLO/HF_rawdata/test'
+#path='/media/APOLLO/HF_rawdata/test'
+path='/media/APOLLO/HF_rawdata/HFT_miercoles/sp01_f0'
 #---------------------------------------------------------#
 
 #---------------------PATH-FIGURE------------------------#
@@ -48,7 +49,7 @@ readUnitConfObj = controllerObj.addReadUnit(datatype='HFReader',
                                             startTime='00:00:00',
                                             endTime='23:59:59',
                                             online=0,
-                                            #set=850,
+                                            #set=1426485881,
                                             delay=10,
                                             walk=1,
                                             timezone=-5*3600)
@@ -78,35 +79,35 @@ procUnitConfObj1.addParameter(name='pairsList', value='(0,1)', format='pairsList
 
 
 opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other')
-opObj11.addParameter(name='n', value='15', format='float')
+opObj11.addParameter(name='n', value='6', format='float')
 
-# opObj11 = procUnitConfObj1.addOperation(name='SpectraWriter', optype='other')
-# opObj11.addParameter(name='path', value='/home/alex/Downloads/pdata_hf')
-# opObj11.addParameter(name='blocksPerFile', value='1', format='int')
-
-  
-# opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
-# opObj11.addParameter(name='id', value='2001', format='int')
-# opObj11.addParameter(name='wintitle', value='HF_Jicamarca_Spc', format='str')
-# #opObj11.addParameter(name='channelList', value='0', format='intlist') 
-# opObj11.addParameter(name='zmin', value='-120', format='float')
-# opObj11.addParameter(name='zmax', value='-70', format='float')
-# opObj11.addParameter(name='save', value='1', format='int')
-# opObj11.addParameter(name='figpath', value=figpath, format='str')
-# # opObj11.addParameter(name='figfile', value=figfile_spectra_name, format='str')
-# # opObj11.addParameter(name='wr_period', value='5', format='int')
-# #opObj11.addParameter(name='ftp_wei', value='0', format='int')
-# #opObj11.addParameter(name='exp_code', value='20', 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='SpectraWriter', optype='other')
+#opObj11.addParameter(name='path', value='/home/alex/Downloads/pdata_hf')
+#opObj11.addParameter(name='blocksPerFile', value='1', format='int')
 # 
+#   
+opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
+opObj11.addParameter(name='id', value='2001', format='int')
+opObj11.addParameter(name='wintitle', value='HF_Jicamarca_Spc', format='str')
+#opObj11.addParameter(name='channelList', value='0', format='intlist') 
+opObj11.addParameter(name='zmin', value='-120', format='float')
+opObj11.addParameter(name='zmax', value='-70', format='float')
+opObj11.addParameter(name='save', value='1', format='int')
+opObj11.addParameter(name='figpath', value=figpath, format='str')
+# opObj11.addParameter(name='figfile', value=figfile_spectra_name, format='str')
+# opObj11.addParameter(name='wr_period', value='5', format='int')
+#opObj11.addParameter(name='ftp_wei', value='0', format='int')
+#opObj11.addParameter(name='exp_code', value='20', format='int')
+#opObj11.addParameter(name='sub_exp_code', value='0', format='int')
+#opObj11.addParameter(name='plot_pos', value='0', format='int')
+ 
 # figfile_power_name="jro_power_image"+freq2+date+ext_img
 # print figfile_power_name
 opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other')
 opObj11.addParameter(name='id', value='3002', format='int')
 opObj11.addParameter(name='wintitle', value='HF_Jicamarca', format='str')
 opObj11.addParameter(name='showprofile', value='0', format='int')
-opObj11.addParameter(name='channelList', value='0', format='intlist') 
+#opObj11.addParameter(name='channelList', value='0', format='intlist') 
 opObj11.addParameter(name='xmin', value='0', format='float')
 opObj11.addParameter(name='xmax', value='24', format='float')
 opObj11.addParameter(name='zmin', value='-110', format='float')
@@ -115,17 +116,17 @@ opObj11.addParameter(name='save', value='1', format='int')
 opObj11.addParameter(name='figpath', value=figpath, format='str')
 #opObj11.addParameter(name='figfile', value=figfile_power_name, format='str')
 #opObj11.addParameter(name='wr_period', value='5', format='int')
-
-
+  
+  
 #opObj11 = procUnitConfObj1.addOperation(name='PowerProfile', optype='other')
 #opObj11.addParameter(name='id', value='2004', format='int')
 #opObj11.addParameter(name='wintitle', value='HF_Jicamarca', format='str')
-##opObj11.addParameter(name='channelList', value='0', format='intlist') 
+#opObj11.addParameter(name='channelList', value='0', format='intlist') 
 #opObj11.addParameter(name='save', value='1', format='bool')
 #opObj11.addParameter(name='figpath', value=figpath, format='str')
-##opObj11.addParameter(name='xmin', value='10', format='int')
-##opObj11.addParameter(name='xmax', value='40', format='int')
-
+#opObj11.addParameter(name='xmin', value='10', format='int')
+#opObj11.addParameter(name='xmax', value='40', format='int')
+  
 # figfile_phase_name="jro_phase_image"+freq1+date+ext_img
 # print figfile_phase_name
 opObj11 = procUnitConfObj1.addOperation(name='CoherenceMap', optype='other')
@@ -137,37 +138,36 @@ opObj11.addParameter(name='xmax', value='24', format='float')
 #opObj11.addParameter(name='channelList', value='0', format='intlist') 
 opObj11.addParameter(name='save', value='1', format='bool')
 opObj11.addParameter(name='figpath', value=figpath, format='str')
-# # opObj11.addParameter(name='figfile', value=figfile_phase_name, format='str')
-# # opObj11.addParameter(name='wr_period', value='5', format='int')
-
-# opObj11 = procUnitConfObj1.addOperation(name='CrossSpectraPlot', optype='other')
-# opObj11.addParameter(name='id', value='6005', format='int')
-# opObj11.addParameter(name='wintitle', value='HF_Jicamarca', format='str')
-# opObj11.addParameter(name='zmin', value='-110', format='float')
-# opObj11.addParameter(name='zmax', value='-50', format='float')
-# #opObj11.addParameter(name='xmin', value='0', format='float')
-# #opObj11.addParameter(name='xmax', value='24', format='float')
-# #opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') 
-# opObj11.addParameter(name='save', value='1', format='bool')
-# opObj11.addParameter(name='figpath', value=figpath, format='str')
-
-
-
-# xmin = 0
-# xmax = 24
-#------------------------------------------------------------------
-# 
+ # opObj11.addParameter(name='figfile', value=figfile_phase_name, format='str')
+ # opObj11.addParameter(name='wr_period', value='5', format='int')
+  
+#opObj11 = procUnitConfObj1.addOperation(name='CrossSpectraPlot', optype='other')
+#opObj11.addParameter(name='id', value='6005', format='int')
+#opObj11.addParameter(name='wintitle', value='HF_Jicamarca', format='str')
+#opObj11.addParameter(name='zmin', value='-110', format='float')
+#opObj11.addParameter(name='zmax', value='-50', format='float')
+#opObj11.addParameter(name='xmin', value='0', format='float')
+#opObj11.addParameter(name='xmax', value='24', format='float')
+#opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') 
+#opObj11.addParameter(name='save', value='1', format='bool')
+#opObj11.addParameter(name='figpath', value=figpath, format='str')
+  
+  
+  
+#xmin = 0
+#xmax = 24
+ 
 procUnitConfObj2 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=procUnitConfObj1.getId())
 opObj20 = procUnitConfObj2.addOperation(name='GetMoments')
- 
-# opObj21 = procUnitConfObj2.addOperation(name='MomentsPlot', optype='other')
-# opObj21.addParameter(name='id', value='3', format='int')
-# opObj21.addParameter(name='wintitle', value='Moments Plot', format='str')
-# opObj21.addParameter(name='save', value='1', format='bool')
-# opObj21.addParameter(name='figpath', value=pathFigure, format='str')
+   
+#opObj21 = procUnitConfObj2.addOperation(name='MomentsPlot', optype='other')
+#opObj21.addParameter(name='id', value='3', format='int')
+#opObj21.addParameter(name='wintitle', value='Moments Plot', format='str')
+#opObj21.addParameter(name='save', value='1', format='bool')
+#opObj21.addParameter(name='figpath', value=pathFigure, format='str')
 #opObj21.addParameter(name='zmin', value='5', format='int')
 #opObj21.addParameter(name='zmax', value='90', format='int')
- 
+   
 opObj21 = procUnitConfObj2.addOperation(name='ParametersPlot', optype='other')
 opObj21.addParameter(name='id', value='1', format='int')
 opObj21.addParameter(name='wintitle', value='Radial Velocity Plot0', format='str')
@@ -181,8 +181,8 @@ opObj21.addParameter(name='SNRthresh', value='0', format='float')
 opObj21.addParameter(name='xmin', value=0, format='float')
 opObj21.addParameter(name='xmax', value=24, format='float')
 #opObj21.addParameter(name='parameterIndex', value=, format='int')
-
-
+  
+  
 opObj21 = procUnitConfObj2.addOperation(name='ParametersPlot', optype='other')
 opObj21.addParameter(name='id', value='2', format='int')
 opObj21.addParameter(name='wintitle', value='Radial Velocity Plot1', format='str')
@@ -195,9 +195,9 @@ opObj21.addParameter(name='SNRmax', value='50', format='int')
 opObj21.addParameter(name='SNRthresh', value='0', format='float')
 opObj21.addParameter(name='xmin', value=0, format='float')
 opObj21.addParameter(name='xmax', value=24, format='float')
-
-
-
+  
+  
+#   
 # opObj23 = procUnitConfObj2.addOperation(name='EWDriftsPlot', optype='other')
 # opObj23.addParameter(name='id', value='4', format='int')
 # opObj23.addParameter(name='wintitle', value='EW Drifts', format='str')
@@ -212,15 +212,15 @@ opObj21.addParameter(name='xmax', value=24, format='float')
 # # opObj23.addParameter(name='SNRthresh', value='-50', format='float')
 # opObj23.addParameter(name='xmin', value=xmin, format='float')
 # opObj23.addParameter(name='xmax', value=xmax, format='float')
-
-
-# opObj11 = procUnitConfObj1.addOperation(name='SendByFTP', optype='other')
-# opObj11.addParameter(name='ext', value='*.jpeg', format='str')
-# opObj11.addParameter(name='localfolder', value='/home/alex/Pictures/ftp', format='str')
-# opObj11.addParameter(name='remotefolder', value='/home/wmaster/web2/data/JRO/HFT/2015/03/11/figures/', format='str')
-# opObj11.addParameter(name='server', value='181.177.232.125', format='str')
-# opObj11.addParameter(name='username', value='wmaster', format='str')
-# opObj11.addParameter(name='password', value='mst2010vhf', format='str')
+  
+  
+#opObj11 = procUnitConfObj1.addOperation(name='SendByFTP', optype='other')
+#opObj11.addParameter(name='ext', value='*.jpeg', format='str')
+#opObj11.addParameter(name='localfolder', value='/home/alex/Pictures/ftp', format='str')
+#opObj11.addParameter(name='remotefolder', value='/home/wmaster/web2/data/JRO/HFT/2015/03/11/figures/', format='str')
+#opObj11.addParameter(name='server', value='181.177.232.125', format='str')
+#opObj11.addParameter(name='username', value='wmaster', format='str')
+#opObj11.addParameter(name='password', value='mst2010vhf', format='str')
 
 
 print "Escribiendo el archivo XML"