| @@ -1176,8 +1176,8 class Weather_vRF_Plot(Plot): | |||
|
|
1176 | 1176 | self.y = 2*r |
|
|
1177 | 1177 | res = 1 |
|
|
1178 | 1178 | |
|
|
1179 |
var_ang =ang_max - |
|
|
|
1180 | step = (int(var_ang)/(res*data['data'].shape[0])) | |
|
|
1179 | #var_ang = ang_max - ang_min | |
|
|
1180 | #step = (int(var_ang)/(res*data['data'].shape[0])) | |
|
|
1181 | 1181 | |
|
|
1182 | 1182 | z = data['data'][self.channels[0]][:,r_mask] |
|
|
1183 | 1183 | |
| @@ -1188,7 +1188,7 class Weather_vRF_Plot(Plot): | |||
|
|
1188 | 1188 | self.zmax = self.zmax if self.zmax else numpy.nanmax(z) |
|
|
1189 | 1189 | self.zmin = self.zmin if self.zmin else numpy.nanmin(z) |
|
|
1190 | 1190 | self.ang_min = self.ang_min if self.ang_min else 0 |
|
|
1191 |
self.ang_max = self.ang_max if self.ang_max else |
|
|
|
1191 | self.ang_max = self.ang_max if self.ang_max else 360 | |
|
|
1192 | 1192 | |
|
|
1193 | 1193 | subplots = [121, 122] |
|
|
1194 | 1194 | |
| @@ -2499,6 +2499,7 class WeatherRHI_vRF4_Plot(Plot): | |||
|
|
2499 | 2499 | self.ylabel= 'Range [Km]' |
|
|
2500 | 2500 | self.titles= ['RHI'] |
|
|
2501 | 2501 | self.polar = True |
|
|
2502 | self.grid = True | |
|
|
2502 | 2503 | if self.channels is not None: |
|
|
2503 | 2504 | self.nplots = len(self.channels) |
|
|
2504 | 2505 | self.nrows = len(self.channels) |
| @@ -2552,10 +2553,10 class WeatherRHI_vRF4_Plot(Plot): | |||
|
|
2552 | 2553 | r = numpy.arange(len(r_mask))*delta_height |
|
|
2553 | 2554 | self.y = 2*r |
|
|
2554 | 2555 | res = 1 |
|
|
2555 | ang_max = self.ang_max | |
|
|
2556 | ang_min = self.ang_min | |
|
|
2557 | var_ang =ang_max - ang_min | |
|
|
2558 | step = (int(var_ang)/(res*data['data'].shape[0])) | |
|
|
2556 | #ang_max = self.ang_max | |
|
|
2557 | #ang_min = self.ang_min | |
|
|
2558 | #var_ang =ang_max - ang_min | |
|
|
2559 | #step = (int(var_ang)/(res*data['data'].shape[0])) | |
|
|
2559 | 2560 | |
|
|
2560 | 2561 | z = data['data'][self.channels[0]][:,r_mask] |
|
|
2561 | 2562 | |
| @@ -2566,7 +2567,7 class WeatherRHI_vRF4_Plot(Plot): | |||
|
|
2566 | 2567 | self.zmax = self.zmax if self.zmax else numpy.nanmax(z) |
|
|
2567 | 2568 | self.zmin = self.zmin if self.zmin else numpy.nanmin(z) |
|
|
2568 | 2569 | self.ang_min = self.ang_min if self.ang_min else 0 |
|
|
2569 |
self.ang_max = self.ang_max if self.ang_max else |
|
|
|
2570 | self.ang_max = self.ang_max if self.ang_max else 90 | |
|
|
2570 | 2571 | |
|
|
2571 | 2572 | subplots = [121, 122] |
|
|
2572 | 2573 | |
| @@ -358,12 +358,11 class DigitalRFReader(ProcessingUnit): | |||
|
|
358 | 358 | 1, 1)).total_seconds() + self.__timezone |
|
|
359 | 359 | |
|
|
360 | 360 | |
|
|
361 | print(startUTCSecond,endUTCSecond) | |
|
|
361 | #print(startUTCSecond,endUTCSecond) | |
|
|
362 | 362 | start_index, end_index = self.digitalReadObj.get_bounds( |
|
|
363 | 363 | channelNameList[channelList[0]]) |
|
|
364 | 364 | |
|
|
365 | print("*****",start_index,end_index) | |
|
|
366 | print(metadata_bounds) | |
|
|
365 | #print("*****",start_index,end_index) | |
|
|
367 | 366 | if not startUTCSecond: |
|
|
368 | 367 | startUTCSecond = start_index / self.__sample_rate |
|
|
369 | 368 | |
| @@ -372,11 +371,8 class DigitalRFReader(ProcessingUnit): | |||
|
|
372 | 371 | |
|
|
373 | 372 | if not endUTCSecond: |
|
|
374 | 373 | endUTCSecond = end_index / self.__sample_rate |
|
|
375 | print("1",endUTCSecond) | |
|
|
376 | print(self.__sample_rate) | |
|
|
377 | 374 | if end_index < endUTCSecond * self.__sample_rate: |
|
|
378 | 375 | endUTCSecond = end_index / self.__sample_rate #Check UTC and LT time |
|
|
379 | print("2",endUTCSecond) | |
|
|
380 | 376 | if not nSamples: |
|
|
381 | 377 | if not ippKm: |
|
|
382 | 378 | raise ValueError("[Reading] nSamples or ippKm should be defined") |
| @@ -4865,7 +4865,7 class Block360_vRF4(Operation): | |||
|
|
4865 | 4865 | elif flagMode == 0: #'ELE' |
|
|
4866 | 4866 | return numpy.array(self.__buffer3) |
|
|
4867 | 4867 | |
|
|
4868 | def pushData(self, data,flagMode): | |
|
|
4868 | def pushData(self, data,flagMode,case_flag): | |
|
|
4869 | 4869 | ''' |
|
|
4870 | 4870 | Return the PULSEPAIR and the profiles used in the operation |
|
|
4871 | 4871 | Affected : self.__profileIndex |
| @@ -4882,7 +4882,7 class Block360_vRF4(Operation): | |||
|
|
4882 | 4882 | self.__profIndex = 0 |
|
|
4883 | 4883 | |
|
|
4884 | 4884 | if flagMode == 1 and case_flag == 0: #'AZI' y ha girado |
|
|
4885 |
self.putData(data=data |
|
|
|
4885 | self.putData(data=data, attr = self.attr, flagMode=flagMode) | |
|
|
4886 | 4886 | |
|
|
4887 | 4887 | return data_360, n, data_p, data_e |
|
|
4888 | 4888 | |
| @@ -4904,7 +4904,7 class Block360_vRF4(Operation): | |||
|
|
4904 | 4904 | self.__buffer.pop() #Erase last data |
|
|
4905 | 4905 | self.__buffer2.pop() |
|
|
4906 | 4906 | self.__buffer3.pop() |
|
|
4907 | data_360,n,data_p,data_e = self.pushData(data=dataOut,flagMode=flagMode) | |
|
|
4907 | data_360,n,data_p,data_e = self.pushData(data=dataOut,flagMode=flagMode,case_flag=case_flag) | |
|
|
4908 | 4908 | |
|
|
4909 | 4909 | self.__dataReady = True |
|
|
4910 | 4910 | |
| @@ -4923,7 +4923,7 class Block360_vRF4(Operation): | |||
|
|
4923 | 4923 | self.__buffer.pop() #Erase last data |
|
|
4924 | 4924 | self.__buffer2.pop() |
|
|
4925 | 4925 | self.__buffer3.pop() |
|
|
4926 | data_360, n, data_p, data_e = self.pushData(data=dataOut,flagMode=flagMode) | |
|
|
4926 | data_360, n, data_p, data_e = self.pushData(data=dataOut,flagMode=flagMode,case_flag=case_flag) | |
|
|
4927 | 4927 | |
|
|
4928 | 4928 | self.__dataReady = True |
|
|
4929 | 4929 | |
General Comments 0
You need to be logged in to leave comments.
Login now