From ab07acd60caa369a7365adb29799cd7323aa9f94 Mon Sep 17 00:00:00 2001
From: "J.A. de Jong - Redu-Sone B.V., ASCEE V.O.F" <j.a.dejong@ascee.nl>
Date: Mon, 14 Nov 2022 11:11:03 +0100
Subject: [PATCH] Some bugfixes

---
 src/lasp/lasp_common.py       | 2 +-
 src/lasp/lasp_measurement.py  | 2 +-
 src/lasp/lasp_octavefilter.py | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lasp/lasp_common.py b/src/lasp/lasp_common.py
index 8c25a02..5f975c2 100644
--- a/src/lasp/lasp_common.py
+++ b/src/lasp/lasp_common.py
@@ -73,12 +73,12 @@ class Qty:
         return f'{self.name} [{self.unit_symb}]'
 
     def __eq__(self, other):
-        # logging.debug('eq()')
         """
         Comparison breaks for the other objects, level unit, level ref name,
         etc as these are tuples / a single string.
 
         """
+        # logging.debug(f'eq() {self.name} {other.name}')
         return (self.name == other.name and
                 self.unit_name == other.unit_name)
 
diff --git a/src/lasp/lasp_measurement.py b/src/lasp/lasp_measurement.py
index fc5364c..d3b5a0f 100644
--- a/src/lasp/lasp_measurement.py
+++ b/src/lasp/lasp_measurement.py
@@ -493,7 +493,7 @@ class Measurement:
         for data in self.iterData(channels, **kwargs):
             CS = aps.compute(data)
 
-        return freq, CS
+        return freq, aps.get_est()
 
     def periodicAverage(self, N, channels=None, noiseCorrection=True, **kwargs):
         """
diff --git a/src/lasp/lasp_octavefilter.py b/src/lasp/lasp_octavefilter.py
index 632cd78..2a183ac 100644
--- a/src/lasp/lasp_octavefilter.py
+++ b/src/lasp/lasp_octavefilter.py
@@ -266,6 +266,8 @@ class SosFilterBank:
             return {}
 
         filtered_data = self._fb.filter(data)
+        if filtered_data.ndim == 1:
+            filtered_data = filtered_data[:, None]
 
         # Output given as a dictionary with nom_txt as the key
         output = {}