schain Commit - r1575:934a33e70856 · Jicamarca Repository

Add process by profiles when receiving with ZMQ

Juan C. Espinoza -

r1575:934a33e70856

parent child

Context file:

r1575:934a33e70856

Collapse all files

schainpy/controller.py +4 0

                     for key in keys:
                         conf = self.configurations[key]
                         conf.createObjects()
+                        if 'Reader' in str(conf):
+                            reader = conf.object
+                        else:
+                            conf.object.reader = reader
                         if conf.inputId is not None:
                             conf.object.setInput(self.configurations[conf.inputId].object)

schainpy/model/data/jrodata.py +6 -1

             class GenericData(object):
                 flagNoData = True
+                blockReader = False
                 def copy(self, inputObj=None):
                 def __str__(self):
-                    return '{} - {}'.format(self.type, self.datatime)
+                    try:
+                        dt = self.datatime
+                    except:
+                        dt = 'None'
+                    return '{} - {}'.format(self.type, dt)
                 def getNoise(self):

schainpy/model/proc/jroproc_base.py +8 -2

                 '''
                 proc_type = 'processing'
+                bypass = False
                 def __init__(self):
                     try:
                         if self.dataIn is not None and self.dataIn.flagNoData and not self.dataIn.error:
                             return self.dataIn.isReady()
                         elif self.dataIn is None or not self.dataIn.error:
+                            if 'Reader' in self.name and self.bypass:
+                                print('Skipping...reader')
+                                return self.dataOut.isReady()
                             self.run(**kwargs)
                         elif self.dataIn.error:
                             self.dataOut.error = self.dataIn.error
                             self.dataOut.flagNoData = True
                             self.dataOut = op.run(self.dataOut, **opkwargs)
                         elif optype == 'external' and not self.dataOut.flagNoData:
                             op.queue.put(aux)
                         elif optype == 'external' and self.dataOut.error:
                             op.queue.put(aux)
                     return 'Error' if self.dataOut.error else self.dataOut.isReady()

schainpy/model/proc/jroproc_spectra.py +17 -3

                     elif self.dataIn.type == "Voltage":
                         self.dataOut.flagNoData = True
+                        self.reader.bypass = True
                         if nFFTPoints == None:
                             raise ValueError("This SpectraProc.run() need nFFTPoints input variable")
                         if self.dataIn.flagDataAsBlock:
                             nVoltProfiles = self.dataIn.data.shape[1]
                             if nVoltProfiles == nProfiles:
                                 self.buffer = self.dataIn.data.copy()
                                 self.profIndex = nVoltProfiles
                                 self.profIndex += nVoltProfiles
                                 self.id_min += nVoltProfiles
                                 self.id_max += nVoltProfiles
+                            elif nVoltProfiles > nProfiles:
+                                print('Por perfiles...', self.profIndex)
+                                if self.profIndex == 0:
+                                    self.id_min = 0
+                                    self.id_max = nProfiles
+                                self.buffer = self.dataIn.data[:, self.id_min:self.id_max,:]
+                                self.profIndex += nProfiles
+                                self.id_min += nProfiles
+                                self.id_max += nProfiles
+                                if self.id_max == nVoltProfiles:
+                                    self.reader.bypass = False
                             else:
                                 raise ValueError("The type object %s has %d profiles, it should just has %d profiles" % (
                                     self.dataIn.type, self.dataIn.data.shape[1], nProfiles))
                         if self.firstdatatime == None:
                             self.firstdatatime = self.dataIn.utctime
-                        if self.profIndex == nProfiles:
+                        if self.profIndex % nProfiles == 0:
                             self.__updateSpecFromVoltage()
                             if pairsList == None:
                                 self.dataOut.pairsList = [pair for pair in itertools.combinations(self.dataOut.channelList, 2)]
                             self.__getFft()
                             self.dataOut.flagNoData = False
                             self.firstdatatime = None
-                            self.profIndex = 0
+                            if not self.reader.bypass:
+                                self.profIndex = 0
                     else:
                         raise ValueError("The type of input object '%s' is not valid".format(
                             self.dataIn.type))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages