diff --git a/.netrc b/.netrc deleted file mode 100644 index 4b398ac..0000000 --- a/.netrc +++ /dev/null @@ -1,3 +0,0 @@ -machine http://jro-dev.igp.gob.pe/rhodecode -login jchavez -password *0f096f4f53b65ba50f811a558e2f3e5a1e4b8d0c* diff --git a/schainpy/ROADMAP.md b/schainpy/ROADMAP.md index a808c50..80b3de6 100644 --- a/schainpy/ROADMAP.md +++ b/schainpy/ROADMAP.md @@ -1,8 +1,7 @@ -## ROADMAP -## SCHAIN BRANCHES - +ROADMAP FOR SCHAIN BRANCHES +=============================== + ### BRANCH - SCHAIN_MP - * Revisar si funciona con varios publishers. * Revisar xRange y reinicialización de gráfico. * Grabar cada spectra independientemente. diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py index f3f1793..97983d9 100644 --- a/schainpy/model/utils/jroutils_publish.py +++ b/schainpy/model/utils/jroutils_publish.py @@ -145,6 +145,7 @@ class PublishData(Operation): time.sleep(1) + def publish_data(self): self.dataOut.finished = False if self.mqtt is 1: @@ -306,6 +307,7 @@ class ReceiverData(ProcessingUnit, Process): if evt['event'] == zmq.EVENT_MONITOR_STOPPED: break monitor.close() + print("event monitor thread done!") def initThrottle(self, throttle_value): @@ -324,7 +326,6 @@ class ReceiverData(ProcessingUnit, Process): t = self.dataOut.ltctime self.data['times'].append(t) self.data['dataOut'] = self.dataOut - for plottype in self.plottypes: if plottype == 'spc': diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py index c11f32d..76cde49 100644 --- a/schainpy/scripts/PPD.py +++ b/schainpy/scripts/PPD.py @@ -31,9 +31,8 @@ def fiber(cursor, skip, q, dt): procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) # opObj11 = procUnitConfObj2.addParameter(name='pairsList', value='(0,1)', format='pairslist') # - procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId()) - - opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other') + # procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId()) + # opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other') # # opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') @@ -62,9 +61,9 @@ def fiber(cursor, skip, q, dt): opObj12 = procUnitConfObj2.addOperation(name='PublishData', optype='other') opObj12.addParameter(name='zeromq', value=1, format='int') - opObj13 = procUnitConfObj3.addOperation(name='PublishData', optype='other') - opObj13.addParameter(name='zeromq', value=1, format='int') - opObj13.addParameter(name='server', value="juanca", format='str') + # opObj13 = procUnitConfObj3.addOperation(name='PublishData', optype='other') + # opObj13.addParameter(name='zeromq', value=1, format='int') + # opObj13.addParameter(name='server', value="juanca", format='str') # opObj12.addParameter(name='delay', value=1, format='int') @@ -82,6 +81,6 @@ def fiber(cursor, skip, q, dt): if __name__ == '__main__': parser = argparse.ArgumentParser(description='Set number of parallel processes') - parser.add_argument('--nProcess', default=16, type=int) + parser.add_argument('--nProcess', default=2, type=int) args = parser.parse_args() multiSchain(fiber, nProcess=args.nProcess, startDate='2015/09/26', endDate='2015/09/26') diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py index fb8ec06..54d3409 100644 --- a/schainpy/scripts/receiver.py +++ b/schainpy/scripts/receiver.py @@ -22,27 +22,26 @@ if __name__ == '__main__': 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='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') - + # 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') - - proc2 = controllerObj.addProcUnit(name='ReceiverData') - proc2.addParameter(name='server', value='juanca', format='str') - proc2.addParameter(name='plottypes', value='snr,dop', format='str') - - op3 = proc2.addOperation(name='PlotSNRData', optype='other') - op3.addParameter(name='wintitle', value='Julia 150Km', format='str') - op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str') - - op4 = proc2.addOperation(name='PlotDOPData', optype='other') - op4.addParameter(name='wintitle', value='Julia 150Km', format='str') - op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # + # proc2 = controllerObj.addProcUnit(name='ReceiverData') + # proc2.addParameter(name='server', value='juanca', format='str') + # proc2.addParameter(name='plottypes', value='snr,dop', format='str') + # + # op3 = proc2.addOperation(name='PlotSNRData', optype='other') + # op3.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # + # op4 = proc2.addOperation(name='PlotDOPData', optype='other') + # op4.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 8172c2b..a3a9eea 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