diff --git a/schainpy/controller.py b/schainpy/controller.py
index 51b03e9..3c2f309 100644
--- a/schainpy/controller.py
+++ b/schainpy/controller.py
@@ -66,7 +66,7 @@ def multiSchain(child, nProcess=cpu_count(), startDate=None, endDate=None, by_da
for process in processes:
process.join()
process.terminate()
- sys.exit()
+ #sys.exit()
class ParameterConf():
diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py
index 145da49..e7c1b5d 100644
--- a/schainpy/scripts/PPD.py
+++ b/schainpy/scripts/PPD.py
@@ -3,7 +3,7 @@ import argparse
from schainpy.controller import Project, multiSchain
desc = "HF_EXAMPLE"
-
+path='/home/ci-81/Documents/DATA/HFADATA/hfdata_2017/pdata/sp1_f0'
def fiber(cursor, skip, q, dt):
controllerObj = Project()
@@ -11,7 +11,7 @@ def fiber(cursor, skip, q, dt):
controllerObj.setup(id='191', name='test01', description=desc)
readUnitConfObj = controllerObj.addReadUnit(datatype='SpectraReader',
- path='/home/nanosat/data/julia',
+ path=path,
startDate=dt,
endDate=dt,
startTime="00:00:00",
@@ -29,6 +29,8 @@ def fiber(cursor, skip, q, dt):
# #opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock')
#
procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId())
+ opObj10 = procUnitConfObj2.addOperation(name='removeInterference')
+
# procUnitConfObj2.addParameter(name='nipp', value='5', format='int')
procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId())
@@ -44,13 +46,13 @@ def fiber(cursor, skip, q, dt):
# opObj11.addParameter(name='save', value='1', format='int')
# opObj11.addParameter(name='figpath', value=figpath, format='str')
- opObj11 = procUnitConfObj3.addOperation(name='Parameters1Plot', optype='other')
- opObj11.addParameter(name='channelList', value='0', format='intList')
+ # opObj11 = procUnitConfObj3.addOperation(name='Parameters1Plot', optype='other')
+ # opObj11.addParameter(name='channelList', value='0', format='intList')
- opObj11.addParameter(name='id', value='2000', format='int')
+ # opObj11.addParameter(name='id', value='2000', format='int')
# opObj11.addParameter(name='colormap', value='0', format='bool')
- opObj11.addParameter(name='onlySNR', value='1', format='bool')
- opObj11.addParameter(name='DOP', value='0', format='bool')
+ # opObj11.addParameter(name='onlySNR', value='1', format='bool')
+ # opObj11.addParameter(name='DOP', value='0', format='bool')
# opObj11.addParameter(name='showSNR', value='1', format='bool')
# opObj11.addParameter(name='SNRthresh', value='0', format='int')
# opObj11.addParameter(name='SNRmin', value='-10', format='int')
@@ -68,6 +70,7 @@ def fiber(cursor, skip, q, dt):
# # opObj11.addParameter(name='figpath', value='/tmp/', format='str')
#
opObj12 = procUnitConfObj3.addOperation(name='PublishData', optype='other')
+ #opObj12.addParameter(name='server', value='tcp://10.10.10.82:3001', format='int')
opObj12.addParameter(name='zeromq', value=1, format='int')
@@ -75,7 +78,7 @@ def fiber(cursor, skip, q, dt):
# opObj13.addParameter(name='zeromq', value=1, format='int')
# opObj13.addParameter(name='server', value="juanca", format='str')
- opObj12.addParameter(name='delay', value=1, format='int')
+ # opObj12.addParameter(name='delay', value=1, format='int')
# print "Escribiendo el archivo XML"
@@ -93,4 +96,4 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Set number of parallel processes')
parser.add_argument('--nProcess', default=1, type=int)
args = parser.parse_args()
- multiSchain(fiber, nProcess=args.nProcess, startDate='2015/09/26', endDate='2015/09/26')
+ multiSchain(fiber, nProcess=8, startDate='2017/02/10', endDate='2017/02/12')
diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py
index ba5dcf5..9d1c3c1 100644
--- a/schainpy/scripts/receiver.py
+++ b/schainpy/scripts/receiver.py
@@ -15,43 +15,63 @@ if __name__ == '__main__':
controllerObj.setup(id='191', name='test01', description=desc)
proc1 = controllerObj.addProcUnit(name='ReceiverData')
- proc1.addParameter(name='realtime', value='0', format='bool')
- proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str')
+ # proc1.addParameter(name='realtime', value='0', format='bool')
+ #proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str')
+ proc1.addParameter(name='plottypes', value='rti,coh,phase,snr', format='str')
proc1.addParameter(name='throttle', value='10', format='int')
- proc1.addParameter(name='plot_server', value='tcp://10.10.10.82:7000', format='str')
+ #proc1.addParameter(name='server', value='tcp://10.10.10.82:7000', format='str')
## TODO Agregar direccion de server de publicacion a graficos como variable
op1 = proc1.addOperation(name='PlotRTIData', optype='other')
- op1.addParameter(name='wintitle', value='Julia 150Km', format='str')
- op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
+ op1.addParameter(name='wintitle', value='HF System', format='str')
+ op1.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
op1.addParameter(name='show', value='0', format='bool')
+ op1.addParameter(name='zmin', value='-110', format='float')
+ op1.addParameter(name='zmax', value='-50', format='float')
op1.addParameter(name='colormap', value='jet', format='str')
#
op2 = proc1.addOperation(name='PlotCOHData', optype='other')
- op2.addParameter(name='wintitle', value='Julia 150Km', format='str')
- op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
+ op2.addParameter(name='wintitle', value='HF System', format='str')
+ op2.addParameter(name='zmin', value='0.001', format='float')
+ op2.addParameter(name='zmax', value='1', format='float')
+ op2.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
op2.addParameter(name='colormap', value='jet', format='str')
op2.addParameter(name='show', value='0', format='bool')
# #
+
op6 = proc1.addOperation(name='PlotPHASEData', optype='other')
- op6.addParameter(name='wintitle', value='Julia 150Km', format='str')
- op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
+ op6.addParameter(name='wintitle', value='HF System', format='str')
+ op6.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
op6.addParameter(name='show', value='1', format='bool')
#
+
# proc2 = controllerObj.addProcUnit(name='ReceiverData')
# proc2.addParameter(name='server', value='juanca', format='str')
# proc2.addParameter(name='plottypes', value='snr,dop', format='str')
#
op3 = proc1.addOperation(name='PlotSNRData', optype='other')
- op3.addParameter(name='wintitle', value='Julia 150Km', format='str')
- op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
+ op3.addParameter(name='wintitle', value='HF System SNR0', format='str')
+ op3.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
op3.addParameter(name='show', value='0', format='bool')
+ op3.addParameter(name='zmin', value='-10', format='int')
+ op3.addParameter(name='zmax', value='30', format='int')
+ op3.addParameter(name='SNRthresh', value='0', format='float')
#
- op4 = proc1.addOperation(name='PlotDOPData', optype='other')
- op4.addParameter(name='wintitle', value='Julia 150Km', format='str')
- op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
+ """
+ op4 = proc1.addOperation(name='PlotSNRData1', optype='other')
+ op4.addParameter(name='wintitle', value='HF System SNR1', format='str')
+ op4.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
op4.addParameter(name='show', value='0', format='bool')
- op4.addParameter(name='colormap', value='jet', format='str')
+
+
+ op5 = proc1.addOperation(name='PlotDOPData', optype='other')
+ op5.addParameter(name='wintitle', value='HF System DOP', format='str')
+ op5.addParameter(name='save', value='/home/ci-81/Pictures', format='str')
+ op5.addParameter(name='show', value='0', format='bool')
+ op5.addParameter(name='colormap', value='jet', format='str')
+ """
+
+
diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml
index 20bb796..6fd2140 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