From 72237600e7698e3d08b297f47dbc6d663165b01f 2020-02-25 21:44:06
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2020-02-25 21:44:06
Subject: [PATCH] Minor bugs

---

diff --git a/schainpy/model/graphics/jroplot_base.py b/schainpy/model/graphics/jroplot_base.py
index af4fc36..9643407 100644
--- a/schainpy/model/graphics/jroplot_base.py
+++ b/schainpy/model/graphics/jroplot_base.py
@@ -219,10 +219,10 @@ class Plot(Operation):
         self.type = kwargs.get('type', 'iq')
         self.grid = kwargs.get('grid', False)
         self.pause = kwargs.get('pause', False)
-        self.save_labels = kwargs.get('save_labels', None)
+        self.save_code = kwargs.get('save_code', None)
         self.realtime = kwargs.get('realtime', True)
         self.buffering = kwargs.get('buffering', True)
-        self.throttle = kwargs.get('throttle', 2)
+        self.throttle = kwargs.get('throttle', 0)
         self.exp_code = kwargs.get('exp_code', None)
         self.plot_server = kwargs.get('plot_server', False)
         self.sender_period = kwargs.get('sender_period', 1)
@@ -625,21 +625,19 @@ class Plot(Operation):
 
         fig = self.figures[n]
 
-        if self.save_labels:
-            labels = self.save_labels
+        if self.save_code:
+            if isinstance(self.save_code, str):
+                labels = [self.save_code for x in self.figures]
+            else:
+                labels = self.save_code
         else:
-            labels = list(range(self.nrows))
+            labels = [self.CODE for x in self.figures]
 
-        if self.oneFigure:
-            label = ''
-        else:
-            label = '-{}'.format(labels[n])
         figname = os.path.join(
             self.save,
-            self.CODE,
-            '{}{}_{}.png'.format(
-                self.CODE,
-                label,
+            labels[n],
+            '{}_{}.png'.format(                
+                labels[n],
                 self.getDateTime(self.data.max_time).strftime(
                     '%Y%m%d_%H%M%S'
                     ),
@@ -650,12 +648,11 @@ class Plot(Operation):
             os.makedirs(os.path.dirname(figname))
         fig.savefig(figname)
 
-        if self.realtime:
+        if self.throttle == 0:
             figname = os.path.join(
                 self.save,
-                '{}{}_{}.png'.format(
-                    self.CODE,
-                    label,
+                '{}_{}.png'.format(
+                    labels[n],
                     self.getDateTime(self.data.min_time).strftime(
                         '%Y%m%d'
                         ),
@@ -788,7 +785,7 @@ class Plot(Operation):
             self.__setup_plot()
             self.isPlotConfig = True
 
-        if self.realtime:
+        if self.throttle == 0:
             self.__plot()
         else:
             self.__throttle_plot(self.__plot)#, coerce=coerce)
diff --git a/schainpy/model/io/jroIO_base.py b/schainpy/model/io/jroIO_base.py
index a79d776..6a7d23a 100644
--- a/schainpy/model/io/jroIO_base.py
+++ b/schainpy/model/io/jroIO_base.py
@@ -644,7 +644,7 @@ class Reader(object):
                 nextFile = False
                 continue                
             
-            if fullfilename:
+            if fullfilename is not None:
                 break
             
             self.nTries = 1
@@ -652,7 +652,8 @@ class Reader(object):
 
             if nFiles == (self.nFiles - 1):
                 log.log('Trying with next day...', self.name)
-                nextDay = True              
+                nextDay = True
+                self.nTries = 3          
 
         if fullfilename:
             self.fileSize = os.path.getsize(fullfilename)
diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py
index 05f6d46..75e7ffe 100644
--- a/schainpy/model/proc/jroproc_base.py
+++ b/schainpy/model/proc/jroproc_base.py
@@ -211,11 +211,11 @@ class InputQueue(Thread):
 
     def get(self):
 
-        if not self.islocked and self.size/1000000 > 1024:
+        if not self.islocked and self.size/1000000 > 512:
             self.lock.n.value += 1            
             self.islocked = True
             self.lock.clear()
-        elif self.islocked and self.size/1000000 <= 1024:
+        elif self.islocked and self.size/1000000 <= 512:
             self.islocked = False
             self.lock.n.value -= 1
             if self.lock.n.value == 0: