schain Commit - r1589:0234d27936fd · Jicamarca Repository

Add angles to Block360 fix plotting codes

Juan C. Espinoza -

r1589:0234d27936fd

parent child

Context file:

r1589:0234d27936fd

Collapse all files

schainpy/model/graphics/jroplot_base.py +2 0

                                     ax.plt, ax=ax, fraction=0.05, pad=0.06, aspect=10)
                                 if self.colormap=='sophy_r':
                                     ax.cbar.set_ticks([0.2, 0.73, 0.83, 0.93, 0.96, 0.99, 1.02, 1.05])
+                                elif self.colormap=='sophy_d':
+                                    ax.cbar.set_ticks([-9, -6, -3, 0, 3, 6, 9, 12])
                                 ax.cbar.ax.tick_params(labelsize=8)
                                 ax.cbar.ax.press = None
                                 if self.cb_label:

schainpy/model/graphics/plotting_codes.py +3 -3

                 "#bf0000", "#7f0000", "#fe00fe", "#8e59ff", "#f0f0f0",
                 ]
-            refl_bounds = [-20, -15, -10, -5, 0, 5, 10 ,15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80]
+            #refl_bounds = [-25, -20, -15, -10, -5, 0, 5, 10 ,15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80]
             doppler = [
                 "#003300", "#005500", "#007700", "#009900", "#00bb00", "#24ce24", "#6cd26c", "#b4d6b4",
             zdr = [
                 "#7333cc", "#7e3cd5", "#8945de", "#944ee7", "#9f57f0", "#aa5ff8",
-                "#82345c", "#984272", "#ae4f88", "#c55c9f", "#db6ab5", "#db6ab5",
+                "#82345c", "#984272", "#ae4f88", "#c55c9f", "#db6ab5", "#f177cb",
                 "#b5842d", "#c29a4c", "#d0b16b", "#ddc78a", "#ebddaa", "#f8f4c9",
                 "#f0f5ff", "#c4d8ff", "#97bbff", "#6a9eff", "#3e81ff", "#1164ff",
                 "#17f576", "#13df60", "#0ec949", "#0ab233", "#059c1d", "#018606",
                 'sophy_z': {'colors': refl, 'norm': None },
                 'sophy_v': {'colors': doppler, 'norm': None },
                 'sophy_w': {'colors': width, 'norm': None },
-                'sophy_d': {'colors': zdr, 'norm': None },
+                'sophy_d': {'colors': zdr, 'norm': None},
                 'sophy_p': {'colors': phi, 'norm': None },
                 'sophy_r': {'colors': rho, 'norm': matplotlib.colors.BoundaryNorm(rho_bounds, 37), 'extremes': ['#15191d', '#333899']},
             }

schainpy/model/proc/jroproc_parameters.py +18 -12

                 def __init__(self,**kwargs):
                     Operation.__init__(self,**kwargs)
-                def setup(self, dataOut, attr):
+                def setup(self, dataOut, attr, angles):
                     '''
                     n= Numero de PRF's de entrada
                     '''
                     self.__buffer  = []
                     self.azi = []
                     self.ele = []
+                    self.angles = angles
                 def putData(self, data, attr):
                     '''
                         elif (middle>start and end<middle):
                             return -1
-                def run(self, dataOut, attr_data='dataPP_POWER', runNextOp = False,**kwargs):
+                def run(self, dataOut, attr_data='dataPP_POWER', runNextOp = False, angles=[], **kwargs):
                     dataOut.attr_data = attr_data
                     dataOut.runNextOp = runNextOp
                     if not self.isConfig:
-                        self.setup(dataOut = dataOut, attr = attr_data ,**kwargs)
+                        self.setup(dataOut=dataOut, attr=attr_data, angles=angles, **kwargs)
                         self.isConfig   = True
                     data_360, avgdatatime, data_p, data_e = self.blockOp(dataOut, dataOut.utctime)
                     dataOut.flagNoData = True
                     if self.__dataReady:
-                        setattr(dataOut, attr_data, data_360 )
+                        mean_az = numpy.mean(data_p[25:-25])
-                        dataOut.data_azi  = data_p
+                        mean_el = numpy.mean(data_e[25:-25])
-                        dataOut.data_ele  = data_e
+                        if round(mean_az,1) in angles or round(mean_el,1) in angles:
-                        dataOut.utctime  = avgdatatime
+                            setattr(dataOut, attr_data, data_360 )
-                        dataOut.flagNoData  = False
+                            dataOut.data_azi  = data_p
-                        dataOut.flagMode = self.flagMode
+                            dataOut.data_ele  = data_e
-                        dataOut.mode_op = self.mode_op
+                            dataOut.utctime  = avgdatatime
+                            dataOut.flagNoData  = False
+                            dataOut.flagMode = self.flagMode
+                            dataOut.mode_op = self.mode_op
+                        else:
+                            log.warning('Skipping angle {} / {}'.format(round(mean_az,1), round(mean_el,1)))
                     return dataOut
                         g = [getattr(data, attr_data) for data in data_inputs][1]
                         data = numpy.concatenate((f,g),axis=3)
                         setattr(self.dataOut, attr_data, data)
                         # snr
                         # self.dataOut.data_snr = numpy.concatenate((data_inputs[0].data_snr, data_inputs[1].data_snr), axis=2)

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