Mercurial > public > atmospheric_lidar / file comparison
comparison: licel.py
licel.py
- changeset 28
- 73337ce10473
- parent 27
- 74f7617f5356
- parent 26
- 84f7d763deeb
- child 31
- b243f896e5f4
equal
deleted
inserted
replaced
| 27:74f7617f5356 | 28:73337ce10473 |
|---|---|
| 210 raise ValueError('Channel info are different. Data can not be combined.') | 210 raise ValueError('Channel info are different. Data can not be combined.') |
| 211 | 211 |
| 212 self.data = np.vstack([self.data, other.data]) | 212 self.data = np.vstack([self.data, other.data]) |
| 213 | 213 |
| 214 def __unicode__(self): | 214 def __unicode__(self): |
| 215 return "<Licel channel: %s>" % self.info['Wavelength'] | 215 return "<Licel channel: %s>" % self.name |
| 216 | 216 |
| 217 def __str__(self): | 217 def __str__(self): |
| 218 return unicode(self).encode('utf-8') | 218 return unicode(self).encode('utf-8') |
| 219 | 219 |
| 220 | 220 |
