From 0ed26d7e340202b827a72b3541292ab98a7c716a 2016-03-07 17:32:18 From: Miguel Valdez Date: 2016-03-07 17:32:18 Subject: [PATCH] Bug fixed in zerorpc test module --- diff --git a/schainpy/model/io/jroIO_usrp.py b/schainpy/model/io/jroIO_usrp.py index e9f10f5..f754fc7 100644 --- a/schainpy/model/io/jroIO_usrp.py +++ b/schainpy/model/io/jroIO_usrp.py @@ -291,7 +291,7 @@ class USRPReader(ProcessingUnit): if not ippKm: raise ValueError, "[Reading] nSamples or ippKm should be defined" - nSamples = ippKm / (1e6*0.15/self.__sample_rate) + nSamples = int(ippKm / (1e6*0.15/self.__sample_rate)) channelBoundList = [] channelNameListFiltered = [] @@ -317,7 +317,7 @@ class USRPReader(ProcessingUnit): self.__channelNameList = channelNameListFiltered self.__channelBoundList = channelBoundList self.__nSamples = nSamples - self.__samples_to_read = buffer_size*nSamples + self.__samples_to_read = int(buffer_size*nSamples) self.__nChannels = len(self.__channelList) self.__startUTCSecond = startUTCSecond @@ -389,7 +389,7 @@ class USRPReader(ProcessingUnit): self.__thisUnixSample += self.__samples_to_read if self.__thisUnixSample + 2*self.__samples_to_read > self.__endUTCSecond*self.__sample_rate: - print "[Reading] There are no more data into selected timerange" + print "[Reading] There are no more data into selected time-range" self.__reload() diff --git a/schainpy/model/io/jroIO_usrp_api.py b/schainpy/model/io/jroIO_usrp_api.py index 45732b4..62c4321 100644 --- a/schainpy/model/io/jroIO_usrp_api.py +++ b/schainpy/model/io/jroIO_usrp_api.py @@ -110,7 +110,9 @@ class USRPReaderAPI(USRPReader, threading.Thread): if not self.isConfig: raise RuntimeError, 'setup() method has to be called before start()' - + + print "Running ..." + while True: if not self.__isBufferEmpty: @@ -131,5 +133,7 @@ class USRPReaderAPI(USRPReader, threading.Thread): # print 'wait 1 second' # sleep(0.1) - + + print "Closing thread" + return \ No newline at end of file diff --git a/schainpy/model/serializer/serializer.py b/schainpy/model/serializer/serializer.py index 338daf4..82e5f46 100644 --- a/schainpy/model/serializer/serializer.py +++ b/schainpy/model/serializer/serializer.py @@ -88,19 +88,19 @@ class DynamicSerializer(Serializer): if not DEFAULT_SERIALIZER: raise ImportError, "Install a python serializer like cPickle or msgpack" - if not mode: - mode == DEFAULT_SERIALIZER + if not module: + module == DEFAULT_SERIALIZER - if mode == 'cPickle': + if module == 'cPickle': self.serializer = cPickleSerializer() # -# if mode == 'jsonpickle': +# if module == 'jsonpickle': # self.serializer = jsonpickleSerializer() # -# if mode == 'yaml': +# if module == 'yaml': # self.serializer = yamlSerializer() - if mode == 'msgpack': + if module == 'msgpack': self.serializer = msgpackSerializer()