From ad02a447a4cb3b9c5be7f256d661016428321e92 2017-05-03 17:29:24
From: jespinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2017-05-03 17:29:24
Subject: [PATCH] Merge branch 'schain_mp' of http://jro-dev.igp.gob.pe/rhodecode/schain into schain_mp

---

diff --git a/schainpy/model/utils/jroutils_publish.py b/schainpy/model/utils/jroutils_publish.py
index 292a2f7..bd95d0d 100644
--- a/schainpy/model/utils/jroutils_publish.py
+++ b/schainpy/model/utils/jroutils_publish.py
@@ -335,7 +335,6 @@ class ReceiverData(ProcessingUnit, Process):
         self.sender.send_pyobj(data)
 
     def update(self):
-
         t = self.dataOut.ltctime
         self.data['times'].append(t)
         self.data['dataOut'] = self.dataOut
@@ -355,11 +354,16 @@ class ReceiverData(ProcessingUnit, Process):
             if plottype == 'phase':
                 self.data[plottype][t] = self.dataOut.getCoherence(phase=True)
             if self.realtime:
+<<<<<<< HEAD
+                self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist())
+                self.data_web['timestamp'] = t
+=======
                 if plottype == 'spc':
                     self.data_web[plottype] = roundFloats(decimate(self.data[plottype]).tolist())
                 else:
                     self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist())
                 self.data_web['time'] = t
+>>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812
                 self.data_web['interval'] = self.dataOut.getTimeInterval()
                 self.data_web['type'] = plottype
 
@@ -417,7 +421,11 @@ class ReceiverData(ProcessingUnit, Process):
             else:
                 conf_address = self.plot_address + '.config'
             sender_web_config.bind(conf_address)
+<<<<<<< HEAD
+
+=======
             time.sleep(1)
+>>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812
             for kwargs in self.operationKwargs.values():
                 if 'plot' in kwargs:
                     print '[Sending] Config data to web for {}'.format(kwargs['code'].upper())
diff --git a/schainpy/scripts/0, b/schainpy/scripts/0,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/0,
diff --git a/schainpy/scripts/PPD.py b/schainpy/scripts/PPD.py
index c4c00a7..94a21db 100644
--- a/schainpy/scripts/PPD.py
+++ b/schainpy/scripts/PPD.py
@@ -61,6 +61,7 @@ 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')
diff --git a/schainpy/scripts/[], b/schainpy/scripts/[],
new file mode 100644
index 0000000..8b2b5f2
--- /dev/null
+++ b/schainpy/scripts/[],
@@ -0,0 +1 @@
+=: ERROR: cannot open `=' (No such file or directory)
diff --git a/schainpy/scripts/host, b/schainpy/scripts/host,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/host,
diff --git a/schainpy/scripts/password, b/schainpy/scripts/password,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/password,
diff --git a/schainpy/scripts/path, b/schainpy/scripts/path,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/path,
diff --git a/schainpy/scripts/protocol, b/schainpy/scripts/protocol,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/protocol,
diff --git a/schainpy/scripts/username, b/schainpy/scripts/username,
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/username,
diff --git a/schainpy/scripts/{ b/schainpy/scripts/{
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/{
diff --git a/schainpy/scripts/{-s} b/schainpy/scripts/{-s}
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/{-s}
diff --git a/schainpy/scripts/{}}}, b/schainpy/scripts/{}}},
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/schainpy/scripts/{}}},