| @@ -4,4 +4,4 Created on Feb 7, 2012 | |||||
| 4 | @author $Author$ |
|
4 | @author $Author$ | |
| 5 | @version $Id$ |
|
5 | @version $Id$ | |
| 6 | ''' |
|
6 | ''' | |
| 7 | __version__ = "2.2.4" No newline at end of file |
|
7 | __version__ = "2.2.4.1" No newline at end of file | |
| @@ -227,12 +227,20 class USRPReader(ProcessingUnit): | |||||
| 227 | metadata_dict = self.digitalReadObj.get_rf_file_metadata(channelNameList[channelList[0]]) |
|
227 | metadata_dict = self.digitalReadObj.get_rf_file_metadata(channelNameList[channelList[0]]) | |
| 228 |
|
228 | |||
| 229 | self.__sample_rate = metadata_dict['sample_rate'][0] |
|
229 | self.__sample_rate = metadata_dict['sample_rate'][0] | |
| 230 | self.__samples_per_file = metadata_dict['samples_per_file'][0] |
|
230 | # self.__samples_per_file = metadata_dict['samples_per_file'][0] | |
| 231 | self.__deltaHeigth = 1e6*0.15/self.__sample_rate |
|
231 | self.__deltaHeigth = 1e6*0.15/self.__sample_rate | |
| 232 |
|
232 | |||
| 233 | this_metadata_file = self.digitalReadObj.get_metadata(channelNameList[channelList[0]]) |
|
233 | this_metadata_file = self.digitalReadObj.get_metadata(channelNameList[channelList[0]]) | |
| 234 |
|
234 | |||
| 235 | self.__frequency = this_metadata_file['center_frequencies'].value |
|
235 | self.__frequency = None | |
|
|
236 | try: | |||
|
|
237 | self.__frequency = this_metadata_file['center_frequencies'].value | |||
|
|
238 | except: | |||
|
|
239 | self.__frequency = this_metadata_file['fc'].value | |||
|
|
240 | ||||
|
|
241 | if not self.__frequency: | |||
|
|
242 | raise ValueError, "Center Frequency is not defined in metadata file" | |||
|
|
243 | ||||
| 236 | try: |
|
244 | try: | |
| 237 | self.__timezone = this_metadata_file['timezone'].value |
|
245 | self.__timezone = this_metadata_file['timezone'].value | |
| 238 | except: |
|
246 | except: | |
General Comments 0
You need to be logged in to leave comments.
Login now