Mercurial > public > atmospheric_lidar / file comparison
comparison: atmospheric_lidar/licelv2.py
atmospheric_lidar/licelv2.py
- changeset 202
- 79a75340ae30
- parent 192
- a73d587fd84c
equal
deleted
inserted
replaced
| 201:49f1419b74fc | 202:79a75340ae30 |
|---|---|
| 94 if self.is_analog: | 94 if self.is_analog: |
| 95 # If the channel is in analog mode | 95 # If the channel is in analog mode |
| 96 ADCrange = self.discriminator # Discriminator value already in mV | 96 ADCrange = self.discriminator # Discriminator value already in mV |
| 97 | 97 |
| 98 if self.is_photodiode and (self.adcbits == 0): | 98 if self.is_photodiode and (self.adcbits == 0): |
| 99 logger.info("Assuming adcbits equal 1. This is a bug in current licel format when storing photodiode data.") | 99 logger.debug("Assuming adcbits equal 1. This is a bug in current licel format when storing photodiode data.") |
| 100 channel_data = norm * ADCrange / (2 ** self.adcbits) | 100 channel_data = norm * ADCrange / (2 ** self.adcbits) |
| 101 else: | 101 else: |
| 102 channel_data = norm * ADCrange / ((2 ** self.adcbits) - 1) # Licel LabView code has a bug (does not account -1). | 102 channel_data = norm * ADCrange / ((2 ** self.adcbits) - 1) # Licel LabView code has a bug (does not account -1). |
| 103 | 103 |
| 104 else: | 104 else: |
| 160 self.altitude = float(self.raw_info['altitude']) | 160 self.altitude = float(self.raw_info['altitude']) |
| 161 self.longitude = float(self.raw_info['longitude']) | 161 self.longitude = float(self.raw_info['longitude']) |
| 162 self.latitude = float(self.raw_info['latitude']) | 162 self.latitude = float(self.raw_info['latitude']) |
| 163 | 163 |
| 164 self.zenith_angle_raw = float(self.raw_info['zenith_angle']) | 164 self.zenith_angle_raw = float(self.raw_info['zenith_angle']) |
| 165 logger.debug('Fix zenith angle? %s' % self.fix_zenith_angle) | |
| 166 | 165 |
| 167 if self.fix_zenith_angle: | 166 if self.fix_zenith_angle: |
| 168 logger.debug('Fixing zenith angle.') | 167 logger.debug('Fixing zenith angle.') |
| 169 self.zenith_angle = self._correct_zenith_angle(self.zenith_angle_raw) | 168 self.zenith_angle = self._correct_zenith_angle(self.zenith_angle_raw) |
| 170 else: | 169 else: |
