From 73923d8d784bbd29ac8ad11b5b91df67323c2838 2022-05-02 14:48:36
From: Roberto Flores <rflores@igp.gob.pe>
Date: 2022-05-02 14:48:36
Subject: [PATCH] Block360_vRF4 and Weather_vRF_Plot Fixed and Tested

---

diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py
index ffbc837..07caa70 100644
--- a/schainpy/model/graphics/jroplot_parameters.py
+++ b/schainpy/model/graphics/jroplot_parameters.py
@@ -1176,8 +1176,8 @@ class Weather_vRF_Plot(Plot):
         self.y       = 2*r
         res          = 1
 
-        var_ang      =ang_max -  ang_min
-        step         = (int(var_ang)/(res*data['data'].shape[0]))
+        #var_ang      = ang_max - ang_min
+        #step         = (int(var_ang)/(res*data['data'].shape[0]))
 
         z = data['data'][self.channels[0]][:,r_mask]
 
@@ -1188,7 +1188,7 @@ class Weather_vRF_Plot(Plot):
         self.zmax = self.zmax if self.zmax else numpy.nanmax(z)
         self.zmin = self.zmin if self.zmin else numpy.nanmin(z)
         self.ang_min = self.ang_min if self.ang_min else 0
-        self.ang_max = self.ang_max if self.ang_max else 2*numpy.pi
+        self.ang_max = self.ang_max if self.ang_max else 360
 
         subplots = [121, 122]
 
@@ -2499,6 +2499,7 @@ class WeatherRHI_vRF4_Plot(Plot):
         self.ylabel= 'Range [Km]'
         self.titles= ['RHI']
         self.polar = True
+        self.grid = True
         if self.channels is not None:
             self.nplots = len(self.channels)
             self.nrows = len(self.channels)
@@ -2552,10 +2553,10 @@ class WeatherRHI_vRF4_Plot(Plot):
         r            = numpy.arange(len(r_mask))*delta_height
         self.y       = 2*r
         res          = 1
-        ang_max = self.ang_max
-        ang_min = self.ang_min
-        var_ang      =ang_max -  ang_min
-        step         = (int(var_ang)/(res*data['data'].shape[0]))
+        #ang_max = self.ang_max
+        #ang_min = self.ang_min
+        #var_ang      =ang_max -  ang_min
+        #step         = (int(var_ang)/(res*data['data'].shape[0]))
 
         z = data['data'][self.channels[0]][:,r_mask]
 
@@ -2566,7 +2567,7 @@ class WeatherRHI_vRF4_Plot(Plot):
         self.zmax = self.zmax if self.zmax else numpy.nanmax(z)
         self.zmin = self.zmin if self.zmin else numpy.nanmin(z)
         self.ang_min = self.ang_min if self.ang_min else 0
-        self.ang_max = self.ang_max if self.ang_max else 2*numpy.pi
+        self.ang_max = self.ang_max if self.ang_max else 90
 
         subplots = [121, 122]
 
diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py
index 4360b36..985324b 100644
--- a/schainpy/model/io/jroIO_digitalRF.py
+++ b/schainpy/model/io/jroIO_digitalRF.py
@@ -358,12 +358,11 @@ class DigitalRFReader(ProcessingUnit):
                                                             1, 1)).total_seconds() + self.__timezone
 
 
-        print(startUTCSecond,endUTCSecond)
+        #print(startUTCSecond,endUTCSecond)
         start_index, end_index = self.digitalReadObj.get_bounds(
             channelNameList[channelList[0]])
 
-        print("*****",start_index,end_index)
-        print(metadata_bounds)
+        #print("*****",start_index,end_index)
         if not startUTCSecond:
             startUTCSecond = start_index / self.__sample_rate
 
@@ -372,11 +371,8 @@ class DigitalRFReader(ProcessingUnit):
 
         if not endUTCSecond:
             endUTCSecond   = end_index / self.__sample_rate
-        print("1",endUTCSecond)
-        print(self.__sample_rate)
         if end_index       < endUTCSecond * self.__sample_rate:
             endUTCSecond   = end_index / self.__sample_rate #Check UTC and LT time
-            print("2",endUTCSecond)
         if not nSamples:
             if not ippKm:
                 raise ValueError("[Reading] nSamples or ippKm should be defined")
diff --git a/schainpy/model/proc/jroproc_parameters.py b/schainpy/model/proc/jroproc_parameters.py
index 79cefdb..a219a7a 100755
--- a/schainpy/model/proc/jroproc_parameters.py
+++ b/schainpy/model/proc/jroproc_parameters.py
@@ -4865,7 +4865,7 @@ class Block360_vRF4(Operation):
         elif flagMode == 0: #'ELE'
             return numpy.array(self.__buffer3)
 
-    def pushData(self, data,flagMode):
+    def pushData(self, data,flagMode,case_flag):
         '''
         Return the PULSEPAIR and the profiles used in the operation
         Affected :  self.__profileIndex
@@ -4882,7 +4882,7 @@ class Block360_vRF4(Operation):
         self.__profIndex = 0
 
         if flagMode == 1 and case_flag == 0: #'AZI' y ha girado
-            self.putData(data=dataOut, attr = self.attr, flagMode=flagMode)
+            self.putData(data=data, attr = self.attr, flagMode=flagMode)
 
         return data_360, n, data_p, data_e
 
@@ -4904,7 +4904,7 @@ class Block360_vRF4(Operation):
                     self.__buffer.pop() #Erase last data
                     self.__buffer2.pop()
                     self.__buffer3.pop()
-                    data_360,n,data_p,data_e  = self.pushData(data=dataOut,flagMode=flagMode)
+                    data_360,n,data_p,data_e  = self.pushData(data=dataOut,flagMode=flagMode,case_flag=case_flag)
 
                     self.__dataReady = True
 
@@ -4923,7 +4923,7 @@ class Block360_vRF4(Operation):
                         self.__buffer.pop() #Erase last data
                         self.__buffer2.pop()
                         self.__buffer3.pop()
-                        data_360, n, data_p, data_e  = self.pushData(data=dataOut,flagMode=flagMode)
+                        data_360, n, data_p, data_e  = self.pushData(data=dataOut,flagMode=flagMode,case_flag=case_flag)
 
                         self.__dataReady = True