|
|
1 | NO CONTENT: new file 100644 |
| @@ -0,0 +1,1 | |||
|
|
1 | =: ERROR: cannot open `=' (No such file or directory) | |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
|
|
1 | NO CONTENT: new file 100644 |
| @@ -335,7 +335,6 class ReceiverData(ProcessingUnit, Process): | |||
|
|
335 | 335 | self.sender.send_pyobj(data) |
|
|
336 | 336 | |
|
|
337 | 337 | def update(self): |
|
|
338 | ||
|
|
339 | 338 | t = self.dataOut.ltctime |
|
|
340 | 339 | self.data['times'].append(t) |
|
|
341 | 340 | self.data['dataOut'] = self.dataOut |
| @@ -355,11 +354,16 class ReceiverData(ProcessingUnit, Process): | |||
|
|
355 | 354 | if plottype == 'phase': |
|
|
356 | 355 | self.data[plottype][t] = self.dataOut.getCoherence(phase=True) |
|
|
357 | 356 | if self.realtime: |
|
|
357 | <<<<<<< HEAD | |
|
|
358 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist()) | |
|
|
359 | self.data_web['timestamp'] = t | |
|
|
360 | ======= | |
|
|
358 | 361 | if plottype == 'spc': |
|
|
359 | 362 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype]).tolist()) |
|
|
360 | 363 | else: |
|
|
361 | 364 | self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist()) |
|
|
362 | 365 | self.data_web['time'] = t |
|
|
366 | >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812 | |
|
|
363 | 367 | self.data_web['interval'] = self.dataOut.getTimeInterval() |
|
|
364 | 368 | self.data_web['type'] = plottype |
|
|
365 | 369 | |
| @@ -417,7 +421,11 class ReceiverData(ProcessingUnit, Process): | |||
|
|
417 | 421 | else: |
|
|
418 | 422 | conf_address = self.plot_address + '.config' |
|
|
419 | 423 | sender_web_config.bind(conf_address) |
|
|
424 | <<<<<<< HEAD | |
|
|
425 | ||
|
|
426 | ======= | |
|
|
420 | 427 | time.sleep(1) |
|
|
428 | >>>>>>> f65929d2cf32d4dddb2d5fa2a72f3970d4d51812 | |
|
|
421 | 429 | for kwargs in self.operationKwargs.values(): |
|
|
422 | 430 | if 'plot' in kwargs: |
|
|
423 | 431 | print '[Sending] Config data to web for {}'.format(kwargs['code'].upper()) |
| @@ -61,6 +61,7 def fiber(cursor, skip, q, dt): | |||
|
|
61 | 61 | opObj12 = procUnitConfObj2.addOperation(name='PublishData', optype='other') |
|
|
62 | 62 | opObj12.addParameter(name='zeromq', value=1, format='int') |
|
|
63 | 63 | |
|
|
64 | ||
|
|
64 | 65 | # opObj13 = procUnitConfObj3.addOperation(name='PublishData', optype='other') |
|
|
65 | 66 | # opObj13.addParameter(name='zeromq', value=1, format='int') |
|
|
66 | 67 | # opObj13.addParameter(name='server', value="juanca", format='str') |
General Comments 0
You need to be logged in to leave comments.
Login now