acoular 24.10__py3-none-any.whl → 25.3__py3-none-any.whl

acoular/fbeamform.py

@@ -67,12 +67,12 @@ from numpy import (
     pi,
     real,
     reshape,
-    round,
+    round,  # noqa: A004
     searchsorted,
     sign,
     size,
     sqrt,
-    sum,
+    sum,  # noqa: A004
     tile,
     trace,
     tril,
@@ -92,13 +92,12 @@ from traits.api import (
     Dict,
     Enum,
     Float,
-    HasPrivateTraits,
+    HasStrictTraits,
     Instance,
     Int,
     List,
     Property,
     Range,
-    Trait,
     Tuple,
     cached_property,
     on_trait_change,
@@ -106,7 +105,9 @@ from traits.api import (
 )
 from traits.trait_errors import TraitError
 
+# acoular imports
 from .configuration import config
+from .deprecation import deprecated_alias
 from .environments import Environment
 from .fastFuncs import beamformerFreq, calcPointSpreadFunction, calcTransfer, damasSolverGaussSeidel
 from .grids import Grid, Sector
@@ -119,25 +120,25 @@ from .tfastfuncs import _steer_I, _steer_II, _steer_III, _steer_IV
 
 sklearn_ndict = {}
 if parse(sklearn.__version__) < parse('1.4'):
-    sklearn_ndict['normalize'] = False
+    sklearn_ndict['normalize'] = False  # pragma: no cover
 
-BEAMFORMER_BASE_DIGEST_DEPENDENCIES = ['freq_data.digest', 'r_diag', 'r_diag_norm', 'precision', '_steer_obj.digest']
+BEAMFORMER_BASE_DIGEST_DEPENDENCIES = ['freq_data.digest', 'r_diag', 'r_diag_norm', 'precision', 'steer.digest']
 
 
-class SteeringVector(HasPrivateTraits):
+class SteeringVector(HasStrictTraits):
     """Basic class for implementing steering vectors with monopole source transfer models.
 
     Handles four different steering vector formulations. See :cite:`Sarradj2012` for details.
     """
 
     #: :class:`~acoular.grids.Grid`-derived object that provides the grid locations.
-    grid = Trait(Grid, desc='beamforming grid')
+    grid = Instance(Grid, desc='beamforming grid')
 
     #: :class:`~acoular.microphones.MicGeom` object that provides the microphone locations.
-    mics = Trait(MicGeom, desc='microphone geometry')
+    mics = Instance(MicGeom, desc='microphone geometry')
 
     #: Type of steering vectors, see also :cite:`Sarradj2012`. Defaults to 'true level'.
-    steer_type = Trait('true level', 'true location', 'classic', 'inverse', desc='type of steering vectors used')
+    steer_type = Enum('true level', 'true location', 'classic', 'inverse', desc='type of steering vectors used')
 
     #: :class:`~acoular.environments.Environment` or derived object,
     #: which provides information about the sound propagation in the medium.
@@ -202,17 +203,17 @@ class SteeringVector(HasPrivateTraits):
     # internal identifier, use for inverse methods, excluding steering vector type
     inv_digest = Property(depends_on=['env.digest', 'grid.digest', 'mics.digest', '_ref'])
 
-    @property_depends_on('grid.digest, env.digest, _ref')
+    @property_depends_on(['grid.digest', 'env.digest', '_ref'])
     def _get_r0(self):
         if isscalar(self.ref):
             if self.ref > 0:
                 return full((self.grid.size,), self.ref)
             return self.env._r(self.grid.pos())
-        return self.env._r(self.grid.gpos, self.ref[:, newaxis])
+        return self.env._r(self.grid.pos, self.ref[:, newaxis])
 
-    @property_depends_on('grid.digest, mics.digest, env.digest')
+    @property_depends_on(['grid.digest', 'mics.digest', 'env.digest'])
     def _get_rm(self):
-        return atleast_2d(self.env._r(self.grid.gpos, self.mics.mpos))
+        return atleast_2d(self.env._r(self.grid.pos, self.mics.pos))
 
     @cached_property
     def _get_digest(self):
@@ -304,136 +305,17 @@ class LazyBfResult:
         return self.bf._ac.__getitem__(key)
 
 
-class BeamformerBase(HasPrivateTraits):
+class BeamformerBase(HasStrictTraits):
     """Beamforming using the basic delay-and-sum algorithm in the frequency domain."""
 
     # Instance of :class:`~acoular.fbeamform.SteeringVector` or its derived classes
     # that contains information about the steering vector. This is a private trait.
     # Do not set this directly, use `steer` trait instead.
-    _steer_obj = Instance(SteeringVector(), SteeringVector)
-
-    #: :class:`~acoular.fbeamform.SteeringVector` or derived object.
-    #: Defaults to :class:`~acoular.fbeamform.SteeringVector` object.
-    steer = Property(desc='steering vector object')
-
-    def _get_steer(self):
-        return self._steer_obj
-
-    def _set_steer(self, steer):
-        if isinstance(steer, SteeringVector):
-            self._steer_obj = steer
-        elif steer in ('true level', 'true location', 'classic', 'inverse'):
-            # Type of steering vectors, see also :cite:`Sarradj2012`.
-            msg = (
-                "Deprecated use of 'steer' trait. Please use the 'steer' with an object of class "
-                "'SteeringVector'. Using a string to specify the steer type will be removed in "
-                'version 25.01.'
-            )
-            warn(
-                msg,
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            self._steer_obj.steer_type = steer
-        else:
-            raise (TraitError(args=self, name='steer', info='SteeringVector', value=steer))
-
-    # --- List of backwards compatibility traits and their setters/getters -----------
-
-    # :class:`~acoular.environments.Environment` or derived object.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    env = Property()
-
-    def _get_env(self):
-        return self._steer_obj.env
-
-    def _set_env(self, env):
-        msg = (
-            "Deprecated use of 'env' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'env' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.env = env
-
-    # The speed of sound.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    c = Property()
-
-    def _get_c(self):
-        return self._steer_obj.env.c
-
-    def _set_c(self, c):
-        msg = (
-            "Deprecated use of 'c' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector' that holds an 'Environment' instance."
-            "The 'c' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.env.c = c
-
-    # :class:`~acoular.grids.Grid`-derived object that provides the grid locations.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    grid = Property()
-
-    def _get_grid(self):
-        return self._steer_obj.grid
-
-    def _set_grid(self, grid):
-        msg = (
-            "Deprecated use of 'grid' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'grid' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.grid = grid
-
-    # :class:`~acoular.microphones.MicGeom` object that provides the microphone locations.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait
-    mpos = Property()
-
-    def _get_mpos(self):
-        return self._steer_obj.mics
-
-    def _set_mpos(self, mpos):
-        msg = (
-            "Deprecated use of 'mpos' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'mpos' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.mics = mpos
-
-    # Sound travel distances from microphone array center to grid points (r0)
-    # and all array mics to grid points (rm). Readonly.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait
-    r0 = Property()
-
-    def _get_r0(self):
-        msg = (
-            "Deprecated use of 'r0' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'r0' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        return self._steer_obj.r0
-
-    rm = Property()
-
-    def _get_rm(self):
-        msg = (
-            "Deprecated use of 'rm' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'rm' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        return self._steer_obj.rm
-
-    # --- End of backwards compatibility traits --------------------------------------
+    steer = Instance(SteeringVector, args=())
 
     #: :class:`~acoular.spectra.PowerSpectra` object that provides the
     #: cross spectral matrix and eigenvalues
-    freq_data = Trait(PowerSpectra, desc='freq data object')
+    freq_data = Instance(PowerSpectra, desc='freq data object')
 
     #: Boolean flag, if 'True' (default), the main diagonal is removed before beamforming.
     r_diag = Bool(True, desc='removal of diagonal')
@@ -450,7 +332,7 @@ class BeamformerBase(HasPrivateTraits):
     )
 
     #: Floating point precision of property result. Corresponding to numpy dtypes. Default = 64 Bit.
-    precision = Trait('float64', 'float32', desc='precision (32/64 Bit) of result, corresponding to numpy dtypes')
+    precision = Enum('float64', 'float32', desc='precision (32/64 Bit) of result, corresponding to numpy dtypes')
 
     #: Boolean flag, if 'True' (default), the result is cached in h5 files.
     cached = Bool(True, desc='cached flag')
@@ -467,6 +349,12 @@ class BeamformerBase(HasPrivateTraits):
     # internal identifier
     digest = Property(depends_on=BEAMFORMER_BASE_DIGEST_DEPENDENCIES)
 
+    # private traits
+    _ac = Any(desc='beamforming result')
+    _fr = Any(desc='flag for beamforming result at frequency index')
+    _f = CArray(dtype='float64', desc='frequencies')
+    _numfreq = Int(desc='number of frequencies')
+
     @cached_property
     def _get_digest(self):
         return digest(self)
@@ -492,7 +380,7 @@ class BeamformerBase(HasPrivateTraits):
             #            print("no data existent for nodename:", nodename)
             if config.global_caching == 'readonly':
                 return (None, None, None)
-            numfreq = self.freq_data.fftfreq().shape[0]  # block_size/2 + 1steer_obj
+            numfreq = self.freq_data.fftfreq().shape[0]
             group = self.h5f.create_new_group(nodename)
             self.h5f.create_compressible_array(
                 'freqs',
@@ -522,11 +410,12 @@ class BeamformerBase(HasPrivateTraits):
         return (ac, fr, gpos)
 
     def _assert_equal_channels(self):
-        numchannels = self.freq_data.numchannels
-        if numchannels != self.steer.mics.num_mics or numchannels == 0:
-            raise ValueError('%i channels do not fit %i mics' % (numchannels, self.steer.mics.num_mics))
+        num_channels = self.freq_data.num_channels
+        if num_channels != self.steer.mics.num_mics or num_channels == 0:
+            msg = f'{num_channels:d} channels do not fit {self.steer.mics.num_mics:d} mics'
+            raise ValueError(msg)
 
-    @property_depends_on('digest')
+    @property_depends_on(['digest'])
     def _get_result(self):
         """Implements the :attr:`result` getter routine.
         The beamforming result is either loaded or calculated.
@@ -566,7 +455,7 @@ class BeamformerBase(HasPrivateTraits):
         if not self.r_diag:  # Full CSM --> no normalization needed
             normfactor = 1.0
         elif self.r_diag_norm == 0.0:  # Removed diag: standard normalization factor
-            nMics = float(self.freq_data.numchannels)
+            nMics = float(self.freq_data.num_channels)
             normfactor = nMics / (nMics - 1)
         elif self.r_diag_norm != 0.0:  # Removed diag: user defined normalization factor
             normfactor = self.r_diag_norm
@@ -583,7 +472,7 @@ class BeamformerBase(HasPrivateTraits):
             - Function for frequency-dependent steering vector calculation
 
         """
-        if type(self.steer) == SteeringVector:  # for simple steering vector, use faster method
+        if type(self.steer) is SteeringVector:  # for simple steering vector, use faster method
             param_type = self.steer.steer_type
 
             def param_steer_func(f):
@@ -671,7 +560,7 @@ class BeamformerBase(HasPrivateTraits):
             ind = searchsorted(freq, f)
             if ind >= len(freq):
                 warn(
-                    'Queried frequency (%g Hz) not in resolved frequency range. Returning zeros.' % f,
+                    f'Queried frequency ({f:g} Hz) not in resolved frequency range. Returning zeros.',
                     Warning,
                     stacklevel=2,
                 )
@@ -820,7 +709,8 @@ class BeamformerFunctional(BeamformerBase):
     #: Functional Beamforming is only well defined for full CSM
     r_diag = Enum(False, desc='False, as Functional Beamformer is only well defined for the full CSM')
 
-    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since Functional Beamforming is only well defined for full CSM.
+    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since Functional
+    #: Beamforming is only well defined for full CSM.
     r_diag_norm = Enum(
         1.0,
         desc='No normalization needed. Functional Beamforming is only well defined for full CSM.',
@@ -855,14 +745,15 @@ class BeamformerFunctional(BeamformerBase):
         normfactor = self.sig_loss_norm()
         param_steer_type, steer_vector = self._beamformer_params()
         for i in ind:
-            if self.r_diag:
+            if self.r_diag:  # pragma: no cover
                 # This case is not used at the moment (see Trait r_diag)
                 # It would need some testing as structural changes were not tested...
                 # ==============================================================================
-                #                     One cannot use spectral decomposition when diagonal of csm is removed,
-                #                     as the resulting modified eigenvectors are not orthogonal to each other anymore.
-                #                     Therefor potentiating cannot be applied only to the eigenvalues.
-                #                     --> To avoid this the root of the csm (removed diag) is calculated directly.
+                #                     One cannot use spectral decomposition when diagonal of csm is
+                #                     removed, as the resulting modified eigenvectors are not
+                #                     orthogonal to each other anymore. Therefore potentiating
+                #                     cannot be applied only to the eigenvalues. --> To avoid this
+                #                     the root of the csm (removed diag) is calculated directly.
                 #                     WATCH OUT: This doesn't really produce good results.
                 # ==============================================================================
                 csm = self.freq_data.csm[i]
@@ -907,7 +798,8 @@ class BeamformerCapon(BeamformerBase):
     # for Capon beamforming r_diag is set to 'False'.
     r_diag = Enum(False, desc='removal of diagonal')
 
-    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since Beamformer Capon is only well defined for full CSM.
+    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since Beamformer Capon
+    #: is only well defined for full CSM.
     r_diag_norm = Enum(
         1.0,
         desc='No normalization. BeamformerCapon is only well defined for full CSM.',
@@ -932,7 +824,7 @@ class BeamformerCapon(BeamformerBase):
 
         """
         f = self._f
-        nMics = self.freq_data.numchannels
+        nMics = self.freq_data.num_channels
         normfactor = self.sig_loss_norm() * nMics**2
         param_steer_type, steer_vector = self._beamformer_params()
         for i in ind:
@@ -949,8 +841,8 @@ class BeamformerEig(BeamformerBase):
     """
 
     #: Number of component to calculate:
-    #: 0 (smallest) ... :attr:`~acoular.base.SamplesGenerator.numchannels`-1;
-    #: defaults to -1, i.e. numchannels-1
+    #: 0 (smallest) ... :attr:`~acoular.base.SamplesGenerator.num_channels`-1;
+    #: defaults to -1, i.e. num_channels-1
     n = Int(-1, desc='No. of eigenvalue')
 
     # Actual component to calculate, internal, readonly.
@@ -963,7 +855,7 @@ class BeamformerEig(BeamformerBase):
     def _get_digest(self):
         return digest(self)
 
-    @property_depends_on('steer.mics, n')
+    @property_depends_on(['steer.mics', 'n'])
     def _get_na(self):
         na = self.n
         nm = self.steer.mics.num_mics
@@ -1020,7 +912,8 @@ class BeamformerMusic(BeamformerEig):
     # for MUSIC beamforming r_diag is set to 'False'.
     r_diag = Enum(False, desc='removal of diagonal')
 
-    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since BeamformerMusic is only well defined for full CSM.
+    #: Normalization factor in case of CSM diagonal removal. Defaults to 1.0 since BeamformerMusic
+    #: is only well defined for full CSM.
     r_diag_norm = Enum(
         1.0,
         desc='No normalization. BeamformerMusic is only well defined for full CSM.',
@@ -1049,7 +942,7 @@ class BeamformerMusic(BeamformerEig):
 
         """
         f = self._f
-        nMics = self.freq_data.numchannels
+        nMics = self.freq_data.num_channels
         n = int(self.steer.mics.num_mics - self.na)
         normfactor = self.sig_loss_norm() * nMics**2
         param_steer_type, steer_vector = self._beamformer_params()
@@ -1067,7 +960,7 @@ class BeamformerMusic(BeamformerEig):
             self._fr[i] = 1
 
 
-class PointSpreadFunction(HasPrivateTraits):
+class PointSpreadFunction(HasStrictTraits):
     """The point spread function.
 
     This class provides tools to calculate the PSF depending on the used
@@ -1079,143 +972,30 @@ class PointSpreadFunction(HasPrivateTraits):
     # Instance of :class:`~acoular.fbeamform.SteeringVector` or its derived classes
     # that contains information about the steering vector. This is a private trait.
     # Do not set this directly, use `steer` trait instead.
-    _steer_obj = Instance(SteeringVector(), SteeringVector)
-
-    #: :class:`~acoular.fbeamform.SteeringVector` or derived object.
-    #: Defaults to :class:`~acoular.fbeamform.SteeringVector` object.
-    steer = Property(desc='steering vector object')
-
-    def _get_steer(self):
-        return self._steer_obj
-
-    def _set_steer(self, steer):
-        if isinstance(steer, SteeringVector):
-            self._steer_obj = steer
-        elif steer in ('true level', 'true location', 'classic', 'inverse'):
-            msg = (
-                "Deprecated use of 'steer' trait. Please use object of class 'SteeringVector'."
-                "The functionality of using string values for 'steer' will be removed in version 25.01."
-            )
-            # Type of steering vectors, see also :cite:`Sarradj2012`.
-            warn(
-                msg,
-                Warning,
-                stacklevel=2,
-            )
-            self._steer_obj = SteeringVector(steer_type=steer)
-        else:
-            raise (TraitError(args=self, name='steer', info='SteeringVector', value=steer))
-
-    # --- List of backwards compatibility traits and their setters/getters -----------
-
-    # :class:`~acoular.environments.Environment` or derived object.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    env = Property()
-
-    def _get_env(self):
-        return self._steer_obj.env
-
-    def _set_env(self, env):
-        msg = (
-            "Deprecated use of 'env' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'env' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.env = env
-
-    # The speed of sound.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    c = Property()
-
-    def _get_c(self):
-        return self._steer_obj.env.c
-
-    def _set_c(self, c):
-        msg = (
-            "Deprecated use of 'c' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'c' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.env.c = c
-
-    # :class:`~acoular.grids.Grid`-derived object that provides the grid locations.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait.
-    grid = Property()
-
-    def _get_grid(self):
-        return self._steer_obj.grid
-
-    def _set_grid(self, grid):
-        msg = (
-            "Deprecated use of 'grid' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'grid' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.grid = grid
-
-    # :class:`~acoular.microphones.MicGeom` object that provides the microphone locations.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait
-    mpos = Property()
-
-    def _get_mpos(self):
-        return self._steer_obj.mics
-
-    def _set_mpos(self, mpos):
-        msg = (
-            "Deprecated use of 'mpos' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'mpos' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        self._steer_obj.mics = mpos
-
-    # Sound travel distances from microphone array center to grid points (r0)
-    # and all array mics to grid points (rm). Readonly.
-    # Deprecated! Only kept for backwards compatibility.
-    # Now governed by :attr:`steer` trait
-    r0 = Property()
-
-    def _get_r0(self):
-        msg = (
-            "Deprecated use of 'r0' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'r0' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        return self._steer_obj.r0
-
-    rm = Property()
-
-    def _get_rm(self):
-        msg = (
-            "Deprecated use of 'rm' trait. Please use the 'steer' trait with an object of class"
-            "'SteeringVector'. The 'rm' trait will be removed in version 25.01."
-        )
-        warn(msg, DeprecationWarning, stacklevel=2)
-        return self._steer_obj.rm
-
-    # --- End of backwards compatibility traits --------------------------------------
+    steer = Instance(SteeringVector, args=())
 
     #: Indices of grid points to calculate the PSF for.
     grid_indices = CArray(
         dtype=int,
         value=array([]),
         desc='indices of grid points for psf',
-    )  # value=array([]), value=self.grid.pos(),
+    )  # value=array([]), value=self.steer.grid.pos(),
 
     #: Flag that defines how to calculate and store the point spread function
     #: defaults to 'single'.
     #:
-    #: * 'full': Calculate the full PSF (for all grid points) in one go (should be used if the PSF at all grid points is needed, as with :class:`DAMAS<BeamformerDamas>`)
-    #: * 'single': Calculate the PSF for the grid points defined by :attr:`grid_indices`, one by one (useful if not all PSFs are needed, as with :class:`CLEAN<BeamformerClean>`)
-    #: * 'block': Calculate the PSF for the grid points defined by :attr:`grid_indices`, in one go (useful if not all PSFs are needed, as with :class:`CLEAN<BeamformerClean>`)
-    #: * 'readonly': Do not attempt to calculate the PSF since it should already be cached (useful if multiple processes have to access the cache file)
-    calcmode = Trait('single', 'block', 'full', 'readonly', desc='mode of calculation / storage')
+    #: * 'full': Calculate the full PSF (for all grid points) in one go (should be used if the PSF
+    #:           at all grid points is needed, as with :class:`DAMAS<BeamformerDamas>`)
+    #: * 'single': Calculate the PSF for the grid points defined by :attr:`grid_indices`, one by one
+    #:             (useful if not all PSFs are needed, as with :class:`CLEAN<BeamformerClean>`)
+    #: * 'block': Calculate the PSF for the grid points defined by :attr:`grid_indices`, in one go
+    #:            (useful if not all PSFs are needed, as with :class:`CLEAN<BeamformerClean>`)
+    #: * 'readonly': Do not attempt to calculate the PSF since it should already be cached (useful
+    #:               if multiple processes have to access the cache file)
+    calcmode = Enum('single', 'block', 'full', 'readonly', desc='mode of calculation / storage')
 
     #: Floating point precision of property psf. Corresponding to numpy dtypes. Default = 64 Bit.
-    precision = Trait('float64', 'float32', desc='precision (32/64 Bit) of result, corresponding to numpy dtypes')
+    precision = Enum('float64', 'float32', desc='precision (32/64 Bit) of result, corresponding to numpy dtypes')
 
     #: The actual point spread function.
     psf = Property(desc='point spread function')
@@ -1227,7 +1007,7 @@ class PointSpreadFunction(HasPrivateTraits):
     h5f = Instance(H5CacheFileBase, transient=True)
 
     # internal identifier
-    digest = Property(depends_on=['_steer_obj.digest', 'precision'], cached=True)
+    digest = Property(depends_on=['steer.digest', 'precision'], cached=True)
 
     @cached_property
     def _get_digest(self):
@@ -1239,7 +1019,7 @@ class PointSpreadFunction(HasPrivateTraits):
         exist and global caching mode is 'readonly'.
         """
         filename = 'psf' + self.digest
-        nodename = ('Hz_%.2f' % self.freq).replace('.', '_')
+        nodename = (f'Hz_{self.freq:.2f}').replace('.', '_')
         #        print("get cachefile:", filename)
         H5cache.get_cache_file(self, filename)
         if not self.h5f:  # only happens in case of global caching readonly
@@ -1336,25 +1116,25 @@ class PointSpreadFunction(HasPrivateTraits):
         Parameters
         ----------
         ind : list of int
-            Indices of gridpoints which are assumed to be sources.
-            Normalization factor for the beamforming result (e.g. removal of diag is compensated with this.)
+            Indices of gridpoints which are assumed to be sources. Normalization factor for the
+            beamforming result (e.g. removal of diag is compensated with this.)
 
         Returns
         -------
         The psf [1, nGridPoints, len(ind)]
-
         """
-        if type(self.steer) == SteeringVector:  # for simple steering vector, use faster method
+        if type(self.steer) is SteeringVector:  # for simple steering vector, use faster method
             result = calcPointSpreadFunction(
                 self.steer.steer_type,
                 self.steer.r0,
                 self.steer.rm,
-                2 * pi * self.freq / self.env.c,
+                2 * pi * self.freq / self.steer.env.c,
                 ind,
                 self.precision,
             )
-        else:  # for arbitrary steering sectors, use general calculation
-            # there is a version of this in fastFuncs, may be used later after runtime testing and debugging
+        else:
+            # for arbitrary steering sectors, use general calculation. there is a version of this in
+            # fastFuncs, may be used later after runtime testing and debugging
             product = dot(self.steer.steer_vector(self.freq).conj(), self.steer.transfer(self.freq, ind).T)
             result = (product * product.conj()).real
         return result
@@ -1372,10 +1152,10 @@ class BeamformerDamas(BeamformerBase):
     beamformer = Property()
 
     # private storage of beamformer instance
-    _beamformer = Trait(BeamformerBase)
+    _beamformer = Instance(BeamformerBase)
 
     #: The floating-number-precision of the PSFs. Default is 64 bit.
-    psf_precision = Trait('float64', 'float32', desc='precision of PSF')
+    psf_precision = Enum('float64', 'float32', desc='precision of PSF')
 
     #: Number of iterations, defaults to 100.
     n_iter = Int(100, desc='number of iterations')
@@ -1385,7 +1165,7 @@ class BeamformerDamas(BeamformerBase):
 
     #: Flag that defines how to calculate and store the point spread function,
     #: defaults to 'full'. See :attr:`PointSpreadFunction.calcmode` for details.
-    calcmode = Trait('full', 'single', 'block', 'readonly', desc='mode of psf calculation / storage')
+    calcmode = Enum('full', 'single', 'block', 'readonly', desc='mode of psf calculation / storage')
 
     # internal identifier
     digest = Property(
@@ -1460,11 +1240,12 @@ class BeamformerDamas(BeamformerBase):
             self._fr[i] = 1
 
 
+@deprecated_alias({'max_iter': 'n_iter'})
 class BeamformerDamasPlus(BeamformerDamas):
-    """DAMAS deconvolution :cite:`Brooks2006` for solving the system of equations, instead of the original Gauss-Seidel
-    iterations, this class employs the NNLS or linear programming solvers from
-    scipy.optimize or one  of several optimization algorithms from the scikit-learn module.
-    Needs a-priori delay-and-sum beamforming (:class:`BeamformerBase`).
+    """DAMAS deconvolution :cite:`Brooks2006` for solving the system of equations, instead of the
+    original Gauss-Seidel iterations, this class employs the NNLS or linear programming solvers from
+    scipy.optimize or one of several optimization algorithms from the scikit-learn module. Needs
+    a-priori delay-and-sum beamforming (:class:`BeamformerBase`).
     """
 
     #: Type of fit method to be used ('LassoLars',
@@ -1472,7 +1253,7 @@ class BeamformerDamasPlus(BeamformerDamas):
     #: These methods are implemented in
     #: the `scikit-learn <http://scikit-learn.org/stable/user_guide.html>`_
     #: module or within scipy.optimize respectively.
-    method = Trait('NNLS', 'LP', 'LassoLars', 'OMPCV', desc='method used for solving deconvolution problem')
+    method = Enum('NNLS', 'LP', 'LassoLars', 'OMPCV', desc='method used for solving deconvolution problem')
 
     #: Weight factor for LassoLars method,
     #: defaults to 0.0.
@@ -1482,7 +1263,7 @@ class BeamformerDamasPlus(BeamformerDamas):
     #: Maximum number of iterations,
     #: tradeoff between speed and precision;
     #: defaults to 500
-    max_iter = Int(500, desc='maximum number of iterations')
+    n_iter = Int(500, desc='maximum number of iterations')
 
     #: Unit multiplier for evaluating, e.g., nPa instead of Pa.
     #: Values are converted back before returning.
@@ -1492,7 +1273,7 @@ class BeamformerDamasPlus(BeamformerDamas):
 
     # internal identifier
     digest = Property(
-        depends_on=BEAMFORMER_BASE_DIGEST_DEPENDENCIES + ['alpha', 'method', 'max_iter', 'unit_mult'],
+        depends_on=BEAMFORMER_BASE_DIGEST_DEPENDENCIES + ['alpha', 'method', 'n_iter', 'unit_mult'],
     )
 
     @cached_property
@@ -1552,19 +1333,17 @@ class BeamformerDamasPlus(BeamformerDamas):
                 self._ac[i] = linprog(c=cT, A_ub=psf, b_ub=y).x / unit  # defaults to simplex method and non-negative x
             else:
                 if self.method == 'LassoLars':
-                    model = LassoLars(
-                        alpha=self.alpha * unit,
-                        max_iter=self.max_iter,
-                    )
+                    model = LassoLars(alpha=self.alpha * unit, max_iter=self.n_iter, positive=True)
                 elif self.method == 'OMPCV':
                     model = OrthogonalMatchingPursuitCV()
                 else:
                     msg = f'Method {self.method} not implemented.'
                     raise NotImplementedError(msg)
                 model.normalize = False
-                # from sklearn 1.2, normalize=True does not work the same way anymore and the pipeline approach
-                # with StandardScaler does scale in a different way, thus we monkeypatch the code and normalize
-                # ourselves to make results the same over different sklearn versions
+                # from sklearn 1.2, normalize=True does not work the same way anymore and the
+                # pipeline approach with StandardScaler does scale in a different way, thus we
+                # monkeypatch the code and normalize ourselves to make results the same over
+                # different sklearn versions
                 norms = norm(psf, axis=0)
                 # get rid of annoying sklearn warnings that appear
                 # for sklearn<1.2 despite any settings
@@ -1590,7 +1369,7 @@ class BeamformerOrth(BeamformerBase):
     beamformer = Property()
 
     # private storage of beamformer instance
-    _beamformer = Trait(BeamformerEig)
+    _beamformer = Instance(BeamformerEig)
 
     #: List of components to consider, use this to directly set the eigenvalues
     #: used in the beamformer. Alternatively, set :attr:`n`.
@@ -1657,7 +1436,7 @@ class BeamformerOrth(BeamformerBase):
 
         """
         f = self._f
-        numchannels = self.freq_data.numchannels
+        num_channels = self.freq_data.num_channels
         normfactor = self.sig_loss_norm()
         param_steer_type, steer_vector = self._beamformer_params()
         for i in ind:
@@ -1671,10 +1450,11 @@ class BeamformerOrth(BeamformerBase):
                     steer_vector(f[i]),
                     (ones(1), eve[:, n].reshape((-1, 1))),
                 )[0]
-                self._ac[i, beamformerOutput.argmax()] += eva[n] / numchannels
+                self._ac[i, beamformerOutput.argmax()] += eva[n] / num_channels
             self._fr[i] = 1
 
 
+@deprecated_alias({'n': 'n_iter'})
 class BeamformerCleansc(BeamformerBase):
     """CLEAN-SC deconvolution algorithm.
 
@@ -1683,8 +1463,8 @@ class BeamformerCleansc(BeamformerBase):
     """
 
     #: no of CLEAN-SC iterations
-    #: defaults to 0, i.e. automatic (max 2*numchannels)
-    n = Int(0, desc='no of iterations')
+    #: defaults to 0, i.e. automatic (max 2*num_channels)
+    n_iter = Int(0, desc='no of iterations')
 
     #: iteration damping factor
     #: defaults to 0.6
@@ -1696,7 +1476,7 @@ class BeamformerCleansc(BeamformerBase):
     stopn = Int(3, desc='stop criterion index')
 
     # internal identifier
-    digest = Property(depends_on=BEAMFORMER_BASE_DIGEST_DEPENDENCIES + ['n', 'damp', 'stopn'])
+    digest = Property(depends_on=BEAMFORMER_BASE_DIGEST_DEPENDENCIES + ['n_iter', 'damp', 'stopn'])
 
     @cached_property
     def _get_digest(self):
@@ -1722,9 +1502,9 @@ class BeamformerCleansc(BeamformerBase):
         """
         f = self._f
         normfactor = self.sig_loss_norm()
-        numchannels = self.freq_data.numchannels
+        num_channels = self.freq_data.num_channels
         result = zeros((self.steer.grid.size), 'f')
-        J = numchannels * 2 if not self.n else self.n
+        J = num_channels * 2 if not self.n_iter else self.n_iter
         powers = zeros(J, 'd')
 
         param_steer_type, steer_vector = self._beamformer_params()
@@ -1751,7 +1531,8 @@ class BeamformerCleansc(BeamformerBase):
                 hh = hh[:, newaxis]
                 csm1 = hmax * (hh * hh.conj().T)
 
-                # h1 = self.steer._beamformerCall(f[i], self.r_diag, normfactor, (array((hmax, ))[newaxis, :], hh[newaxis, :].conjugate()))[0]
+                # h1 = self.steer._beamformerCall(f[i], self.r_diag, normfactor, \
+                # (array((hmax, ))[newaxis, :], hh[newaxis, :].conjugate()))[0]
                 h1 = beamformerFreq(
                     param_steer_type,
                     self.r_diag,
@@ -1777,10 +1558,10 @@ class BeamformerClean(BeamformerBase):
     beamformer = Property()
 
     # private storage of beamformer instance
-    _beamformer = Trait(BeamformerBase)
+    _beamformer = Instance(BeamformerBase)
 
     #: The floating-number-precision of the PSFs. Default is 64 bit.
-    psf_precision = Trait('float64', 'float32', desc='precision of PSF.')
+    psf_precision = Enum('float64', 'float32', desc='precision of PSF.')
 
     # iteration damping factor
     # defaults to 0.6
@@ -1790,7 +1571,7 @@ class BeamformerClean(BeamformerBase):
     n_iter = Int(100, desc='maximum number of iterations')
 
     # how to calculate and store the psf
-    calcmode = Trait('block', 'full', 'single', 'readonly', desc='mode of psf calculation / storage')
+    calcmode = Enum('block', 'full', 'single', 'readonly', desc='mode of psf calculation / storage')
 
     # internal identifier
     digest = Property(
@@ -1885,6 +1666,7 @@ class BeamformerClean(BeamformerBase):
             self._fr[i] = 1
 
 
+@deprecated_alias({'max_iter': 'n_iter'})
 class BeamformerCMF(BeamformerBase):
     """Covariance Matrix Fitting algorithm.
 
@@ -1897,7 +1679,7 @@ class BeamformerCMF(BeamformerBase):
     #: These methods are implemented in
     #: the `scikit-learn <http://scikit-learn.org/stable/user_guide.html>`_
     #: module.
-    method = Trait(
+    method = Enum(
         'LassoLars',
         'LassoLarsBIC',
         'OMPCV',
@@ -1913,10 +1695,11 @@ class BeamformerCMF(BeamformerBase):
     #: (Use values in the order of 10^⁻9 for good results.)
     alpha = Range(0.0, 1.0, 0.0, desc='Lasso weight factor')
 
-    #: Maximum number of iterations,
+    #: Total or maximum number of iterations
+    #: (depending on :attr:`method`),
     #: tradeoff between speed and precision;
     #: defaults to 500
-    max_iter = Int(500, desc='maximum number of iterations')
+    n_iter = Int(500, desc='maximum number of iterations')
 
     #: Unit multiplier for evaluating, e.g., nPa instead of Pa.
     #: Values are converted back before returning.
@@ -1924,7 +1707,8 @@ class BeamformerCMF(BeamformerBase):
     #: within fitting method algorithms. Defaults to 1e9.
     unit_mult = Float(1e9, desc='unit multiplier')
 
-    #: If True, shows the status of the PyLops solver. Only relevant in case of FISTA or Split_Bregman
+    #: If True, shows the status of the PyLops solver. Only relevant in case of FISTA or
+    #: Split_Bregman
     show = Bool(False, desc='show output of PyLops solvers')
 
     #: Energy normalization in case of diagonal removal not implemented for inverse methods.
@@ -1939,7 +1723,7 @@ class BeamformerCMF(BeamformerBase):
             'freq_data.digest',
             'alpha',
             'method',
-            'max_iter',
+            'n_iter',
             'unit_mult',
             'r_diag',
             'precision',
@@ -1985,8 +1769,8 @@ class BeamformerCMF(BeamformerBase):
             return vstack([matrix.real, matrix.imag])
 
         # prepare calculation
-        nc = self.freq_data.numchannels
-        numpoints = self.steer.grid.size
+        nc = self.freq_data.num_channels
+        num_points = self.steer.grid.size
         unit = self.unit_mult
 
         for i in ind:
@@ -1996,7 +1780,7 @@ class BeamformerCMF(BeamformerBase):
 
             # reduced Kronecker product (only where solution matrix != 0)
             Bc = (h[:, :, newaxis] * h.conjugate().T[newaxis, :, :]).transpose(2, 0, 1)
-            Ac = Bc.reshape(nc * nc, numpoints)
+            Ac = Bc.reshape(nc * nc, num_points)
 
             # get indices for upper triangular matrices (use tril b/c transposed)
             ind = reshape(tril(ones((nc, nc))), (nc * nc,)) > 0
@@ -2015,24 +1799,25 @@ class BeamformerCMF(BeamformerBase):
             R = realify(reshape(csm.T, (nc * nc, 1))[ind, :])[ind_reim, :] * unit
             # choose method
             if self.method == 'LassoLars':
-                model = LassoLars(alpha=self.alpha * unit, max_iter=self.max_iter, **sklearn_ndict)
+                model = LassoLars(alpha=self.alpha * unit, max_iter=self.n_iter, positive=True, **sklearn_ndict)
             elif self.method == 'LassoLarsBIC':
-                model = LassoLarsIC(criterion='bic', max_iter=self.max_iter, **sklearn_ndict)
+                model = LassoLarsIC(criterion='bic', max_iter=self.n_iter, positive=True, **sklearn_ndict)
             elif self.method == 'OMPCV':
                 model = OrthogonalMatchingPursuitCV(**sklearn_ndict)
             elif self.method == 'NNLS':
                 model = LinearRegression(positive=True)
 
             if self.method == 'Split_Bregman' and config.have_pylops:
-                from pylops import Identity, MatrixMult, SplitBregman
-
-                Oop = MatrixMult(A)  # tranfer operator
-                Iop = self.alpha * Identity(numpoints)  # regularisation
-                self._ac[i], iterations = SplitBregman(
-                    Oop,
-                    [Iop],
-                    R[:, 0],
-                    niter_outer=self.max_iter,
+                from pylops import Identity, MatrixMult
+                from pylops.optimization.sparsity import splitbregman
+
+                Oop = MatrixMult(A)  # transfer operator
+                Iop = self.alpha * Identity(num_points)  # regularisation
+                self._ac[i], iterations, cost = splitbregman(
+                    Op=Oop,
+                    RegsL1=[Iop],
+                    y=R[:, 0],
+                    niter_outer=self.n_iter,
                     niter_inner=5,
                     RegsL2=None,
                     dataregsL2=None,
@@ -2045,17 +1830,16 @@ class BeamformerCMF(BeamformerBase):
                 self._ac[i] /= unit
 
             elif self.method == 'FISTA' and config.have_pylops:
-                from pylops import FISTA, MatrixMult
+                from pylops import MatrixMult
+                from pylops.optimization.sparsity import fista
 
-                Oop = MatrixMult(A)  # tranfer operator
-                self._ac[i], iterations = FISTA(
+                Oop = MatrixMult(A)  # transfer operator
+                self._ac[i], iterations, cost = fista(
                     Op=Oop,
-                    data=R[:, 0],
-                    niter=self.max_iter,
+                    y=R[:, 0],
+                    niter=self.n_iter,
                     eps=self.alpha,
                     alpha=None,
-                    eigsiter=None,
-                    eigstol=0,
                     tol=1e-10,
                     show=self.show,
                 )
@@ -2070,9 +1854,9 @@ class BeamformerCMF(BeamformerBase):
                     return func[0].T, der[:, 0]
 
                 # initial guess
-                x0 = ones([numpoints])
-                # boundarys - set to non negative
-                boundarys = tile((0, +inf), (len(x0), 1))
+                x0 = ones([num_points])
+                # boundaries - set to non negative
+                boundaries = tile((0, +inf), (len(x0), 1))
 
                 # optimize
                 self._ac[i], yval, dicts = fmin_l_bfgs_b(
@@ -2081,14 +1865,14 @@ class BeamformerCMF(BeamformerBase):
                     fprime=None,
                     args=(),
                     approx_grad=0,
-                    bounds=boundarys,
+                    bounds=boundaries,
                     m=10,
                     factr=10000000.0,
                     pgtol=1e-05,
                     epsilon=1e-08,
                     iprint=-1,
                     maxfun=15000,
-                    maxiter=self.max_iter,
+                    maxiter=self.n_iter,
                     disp=None,
                     callback=None,
                     maxls=20,
@@ -2096,11 +1880,12 @@ class BeamformerCMF(BeamformerBase):
 
                 self._ac[i] /= unit
             else:
-                # from sklearn 1.2, normalize=True does not work the same way anymore and the pipeline
-                # approach with StandardScaler does scale in a different way, thus we monkeypatch the
-                # code and normalize ourselves to make results the same over different sklearn versions
+                # from sklearn 1.2, normalize=True does not work the same way anymore and the
+                # pipeline approach with StandardScaler does scale in a different way, thus we
+                # monkeypatch the code and normalize ourselves to make results the same over
+                # different sklearn versions
                 norms = norm(A, axis=0)
-                # get rid of annoying sklearn warnings that appear for sklearn<1.2 despite any settings
+                # get rid of sklearn warnings that appear for sklearn<1.2 despite any settings
                 with warnings.catch_warnings():
                     warnings.simplefilter('ignore', category=FutureWarning)
                     # normalized A
@@ -2110,6 +1895,7 @@ class BeamformerCMF(BeamformerBase):
             self._fr[i] = 1
 
 
+@deprecated_alias({'max_iter': 'n_iter'})
 class BeamformerSODIX(BeamformerBase):
     """Source directivity modeling in the cross-spectral matrix (SODIX) algorithm.
 
@@ -2119,12 +1905,12 @@ class BeamformerSODIX(BeamformerBase):
     #: Type of fit method to be used ('fmin_l_bfgs_b').
     #: These methods are implemented in
     #: the scipy module.
-    method = Trait('fmin_l_bfgs_b', desc='fit method used')
+    method = Enum('fmin_l_bfgs_b', desc='fit method used')
 
     #: Maximum number of iterations,
     #: tradeoff between speed and precision;
     #: defaults to 200
-    max_iter = Int(200, desc='maximum number of iterations')
+    n_iter = Int(200, desc='maximum number of iterations')
 
     #: Weight factor for regularization,
     #: defaults to 0.0.
@@ -2148,7 +1934,7 @@ class BeamformerSODIX(BeamformerBase):
             'freq_data.digest',
             'alpha',
             'method',
-            'max_iter',
+            'n_iter',
             'unit_mult',
             'r_diag',
             'precision',
@@ -2180,7 +1966,7 @@ class BeamformerSODIX(BeamformerBase):
         """
         # prepare calculation
         f = self._f
-        numpoints = self.steer.grid.size
+        num_points = self.steer.grid.size
         # unit = self.unit_mult
         num_mics = self.steer.mics.num_mics
         # SODIX needs special treatment as the result from one frequency is used to
@@ -2201,18 +1987,18 @@ class BeamformerSODIX(BeamformerBase):
                         """Parameters
                         ----------
                         directions
-                        [numpoints*num_mics]
+                        [num_points*num_mics]
 
                         Returns
                         -------
                         func - Sodix function to optimize
                              [1]
                         derdrl - derivitaives in direction of D
-                            [num_mics*numpoints].
+                            [num_mics*num_points].
 
                         """
                         #### the sodix function ####
-                        Djm = directions.reshape([numpoints, num_mics])
+                        Djm = directions.reshape([num_points, num_mics])
                         p = h.T * Djm
                         csm_mod = dot(p.T, p.conj())
                         Q = csm - csm_mod
@@ -2230,33 +2016,33 @@ class BeamformerSODIX(BeamformerBase):
 
                     ##### initial guess ####
                     if not self._fr[(i - 1)]:
-                        D0 = ones([numpoints, num_mics])
+                        D0 = ones([num_points, num_mics])
                     else:
                         D0 = sqrt(
                             self._ac[(i - 1)]
                             * real(trace(csm) / trace(array(self.freq_data.csm[i - 1], dtype='complex128', copy=1))),
                         )
 
-                    # boundarys - set to non negative [2*(numpoints*num_mics)]
-                    boundarys = tile((0, +inf), (numpoints * num_mics, 1))
+                    # boundaries - set to non negative [2*(num_points*num_mics)]
+                    boundaries = tile((0, +inf), (num_points * num_mics, 1))
 
                     # optimize with gradient solver
                     # see https://docs.scipy.org/doc/scipy/reference/generated/scipy.optimize.fmin_l_bfgs_b.html
 
-                    qi = ones([numpoints, num_mics])
+                    qi = ones([num_points, num_mics])
                     qi, yval, dicts = fmin_l_bfgs_b(
                         function,
                         D0,
                         fprime=None,
                         args=(),
                         approx_grad=0,
-                        bounds=boundarys,
+                        bounds=boundaries,
                         factr=100.0,
                         pgtol=1e-12,
                         epsilon=1e-08,
                         iprint=-1,
                         maxfun=1500000,
-                        maxiter=self.max_iter,
+                        maxiter=self.n_iter,
                         disp=-1,
                         callback=None,
                         maxls=20,
@@ -2268,6 +2054,7 @@ class BeamformerSODIX(BeamformerBase):
                 self._fr[i] = 1
 
 
+@deprecated_alias({'max_iter': 'n_iter'})
 class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
     """Beamforming GIB methods with different normalizations.
 
@@ -2280,17 +2067,18 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
     #: within fitting method algorithms. Defaults to 1e9.
     unit_mult = Float(1e9, desc='unit multiplier')
 
-    #: Maximum number of iterations,
+    #: Total or maximum number of iterations
+    #: (depending on :attr:`method`),
     #: tradeoff between speed and precision;
     #: defaults to 10
-    max_iter = Int(10, desc='maximum number of iterations')
+    n_iter = Int(10, desc='maximum number of iterations')
 
     #: Type of fit method to be used ('Suzuki', 'LassoLars', 'LassoLarsCV', 'LassoLarsBIC',
     #: 'OMPCV' or 'NNLS', defaults to 'Suzuki').
     #: These methods are implemented in
     #: the `scikit-learn <http://scikit-learn.org/stable/user_guide.html>`_
     #: module.
-    method = Trait(
+    method = Enum(
         'Suzuki',
         'InverseIRLS',
         'LassoLars',
@@ -2336,7 +2124,7 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
             'precision',
             'alpha',
             'method',
-            'max_iter',
+            'n_iter',
             'unit_mult',
             'eps_perc',
             'pnorm',
@@ -2379,13 +2167,13 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
         f = self._f
         n = int(self.na)  # number of eigenvalues
         m = int(self.m)  # number of first eigenvalue
-        numchannels = self.freq_data.numchannels  # number of channels
-        numpoints = self.steer.grid.size
-        hh = zeros((1, numpoints, numchannels), dtype='D')
+        num_channels = self.freq_data.num_channels  # number of channels
+        num_points = self.steer.grid.size
+        hh = zeros((1, num_points, num_channels), dtype='D')
 
         # Generate a cross spectral matrix, and perform the eigenvalue decomposition
         for i in ind:
-            # for monopole and source strenght Q needs to define density
+            # for monopole and source strength Q needs to define density
             # calculate a transfer matrix A
             hh = self.steer.transfer(f[i])
             A = hh.T
@@ -2394,33 +2182,34 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
             eva, eve = eigh(csm)
             eva = eva[::-1]
             eve = eve[:, ::-1]
-            eva[eva < max(eva) / 1e12] = 0  # set small values zo 0, lowers numerical errors in simulated data
+            # set small values zo 0, lowers numerical errors in simulated data
+            eva[eva < max(eva) / 1e12] = 0
             # init sources
-            qi = zeros([n + m, numpoints], dtype='complex128')
-            # Select the number of coherent modes to be processed referring to the eigenvalue distribution.
-            # for s in arange(n):
+            qi = zeros([n + m, num_points], dtype='complex128')
+            # Select the number of coherent modes to be processed referring to the eigenvalue
+            # distribution.
             for s in list(range(m, n + m)):
                 if eva[s] > 0:
                     # Generate the corresponding eigenmodes
                     emode = array(sqrt(eva[s]) * eve[:, s], dtype='complex128')
                     # choose method for computation
                     if self.method == 'Suzuki':
-                        leftpoints = numpoints
-                        locpoints = arange(numpoints)
-                        weights = diag(ones(numpoints))
-                        epsilon = arange(self.max_iter)
-                        for it in arange(self.max_iter):
-                            if numchannels <= leftpoints:
+                        leftpoints = num_points
+                        locpoints = arange(num_points)
+                        weights = diag(ones(num_points))
+                        epsilon = arange(self.n_iter)
+                        for it in arange(self.n_iter):
+                            if num_channels <= leftpoints:
                                 AWA = dot(dot(A[:, locpoints], weights), A[:, locpoints].conj().T)
                                 epsilon[it] = max(absolute(eigvals(AWA))) * self.eps_perc
                                 qi[s, locpoints] = dot(
                                     dot(
                                         dot(weights, A[:, locpoints].conj().T),
-                                        inv(AWA + eye(numchannels) * epsilon[it]),
+                                        inv(AWA + eye(num_channels) * epsilon[it]),
                                     ),
                                     emode,
                                 )
-                            elif numchannels > leftpoints:
+                            elif num_channels > leftpoints:
                                 AA = dot(A[:, locpoints].conj().T, A[:, locpoints])
                                 epsilon[it] = max(absolute(eigvals(AA))) * self.eps_perc
                                 qi[s, locpoints] = dot(
@@ -2428,8 +2217,10 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
                                     emode,
                                 )
                             if self.beta < 1 and it > 1:
-                                # Reorder from the greatest to smallest magnitude to define a reduced-point source distribution , and reform a reduced transfer matrix
-                                leftpoints = int(round(numpoints * self.beta ** (it + 1)))
+                                # Reorder from the greatest to smallest magnitude to define a
+                                # reduced-point source distribution, and reform a reduced transfer
+                                # matrix
+                                leftpoints = int(round(num_points * self.beta ** (it + 1)))
                                 idx = argsort(abs(qi[s, locpoints]))[::-1]
                                 # print(it, leftpoints, locpoints, idx )
                                 locpoints = delete(locpoints, [idx[leftpoints::]])
@@ -2441,33 +2232,33 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
                                 weights = diag(absolute(qi[s, :]) ** (2 - self.pnorm))
 
                     elif self.method == 'InverseIRLS':
-                        weights = eye(numpoints)
-                        locpoints = arange(numpoints)
-                        for _it in arange(self.max_iter):
-                            if numchannels <= numpoints:
+                        weights = eye(num_points)
+                        locpoints = arange(num_points)
+                        for _it in arange(self.n_iter):
+                            if num_channels <= num_points:
                                 wtwi = inv(dot(weights.T, weights))
                                 aH = A.conj().T
                                 qi[s, :] = dot(dot(wtwi, aH), dot(inv(dot(A, dot(wtwi, aH))), emode))
                                 weights = diag(absolute(qi[s, :]) ** ((2 - self.pnorm) / 2))
                                 weights = weights / sum(absolute(weights))
-                            elif numchannels > numpoints:
+                            elif num_channels > num_points:
                                 wtw = dot(weights.T, weights)
                                 qi[s, :] = dot(dot(inv(dot(dot(A.conj.T, wtw), A)), dot(A.conj().T, wtw)), emode)
                                 weights = diag(absolute(qi[s, :]) ** ((2 - self.pnorm) / 2))
                                 weights = weights / sum(absolute(weights))
                     else:
-                        locpoints = arange(numpoints)
+                        locpoints = arange(num_points)
                         unit = self.unit_mult
                         AB = vstack([hstack([A.real, -A.imag]), hstack([A.imag, A.real])])
                         R = hstack([emode.real.T, emode.imag.T]) * unit
                         if self.method == 'LassoLars':
-                            model = LassoLars(alpha=self.alpha * unit, max_iter=self.max_iter)
+                            model = LassoLars(alpha=self.alpha * unit, max_iter=self.n_iter, positive=True)
                         elif self.method == 'LassoLarsBIC':
-                            model = LassoLarsIC(criterion='bic', max_iter=self.max_iter)
+                            model = LassoLarsIC(criterion='bic', max_iter=self.n_iter, positive=True)
                         elif self.method == 'OMPCV':
                             model = OrthogonalMatchingPursuitCV()
                         elif self.method == 'LassoLarsCV':
-                            model = LassoLarsCV()
+                            model = LassoLarsCV(max_iter=self.n_iter, positive=True)
                         elif self.method == 'NNLS':
                             model = LinearRegression(positive=True)
                         model.normalize = False
@@ -2494,15 +2285,16 @@ class BeamformerGIB(BeamformerEig):  # BeamformerEig #BeamformerBase
                         Warning,
                         stacklevel=2,
                     )
-                # Generate source maps of all selected eigenmodes, and superpose source intensity for each source type.
-            temp = zeros(numpoints)
+                # Generate source maps of all selected eigenmodes, and superpose source intensity
+                # for each source type.
+            temp = zeros(num_points)
             temp[locpoints] = sum(absolute(qi[:, locpoints]) ** 2, axis=0)
             self._ac[i] = temp
             self._fr[i] = 1
 
 
 class BeamformerAdaptiveGrid(BeamformerBase, Grid):
-    """Base class for array methods without predefined grid."""
+    """Abstract base class for array methods without predefined grid."""
 
     # the grid positions live in a shadow trait
     _gpos = Any
@@ -2510,7 +2302,7 @@ class BeamformerAdaptiveGrid(BeamformerBase, Grid):
     def _get_shape(self):
         return (self.size,)
 
-    def _get_gpos(self):
+    def _get_pos(self):
         return self._gpos
 
     def integrate(self, sector):
@@ -2561,7 +2353,7 @@ class BeamformerGridlessOrth(BeamformerAdaptiveGrid):
     n = Int(1)
 
     #: Geometrical bounds of the search domain to consider.
-    #: :attr:`bound` ist a list that contains exactly three tuple of
+    #: :attr:`bound` is a list that contains exactly three tuple of
     #: (min,max) for each of the coordinates x, y, z.
     #: Defaults to [(-1.,1.),(-1.,1.),(0.01,1.)]
     bounds = List(Tuple(Float, Float), minlen=3, maxlen=3, value=[(-1.0, 1.0), (-1.0, 1.0), (0.01, 1.0)])
@@ -2582,7 +2374,7 @@ class BeamformerGridlessOrth(BeamformerAdaptiveGrid):
 
     # internal identifier
     digest = Property(
-        depends_on=['freq_data.digest', '_steer_obj.digest', 'precision', 'r_diag', 'eva_list', 'bounds', 'shgo'],
+        depends_on=['freq_data.digest', 'steer.digest', 'precision', 'r_diag', 'eva_list', 'bounds', 'shgo'],
     )
 
     @cached_property
@@ -2618,14 +2410,14 @@ class BeamformerGridlessOrth(BeamformerAdaptiveGrid):
         """
         f = self._f
         normfactor = self.sig_loss_norm()
-        numchannels = self.freq_data.numchannels
+        num_channels = self.freq_data.num_channels
         # eigenvalue number list in standard form from largest to smallest
         eva_list = unique(self.eva_list % self.steer.mics.num_mics)[::-1]
         steer_type = self.steer.steer_type
         if steer_type == 'custom':
             msg = 'custom steer_type is not implemented'
             raise NotImplementedError(msg)
-        mpos = self.steer.mics.mpos
+        mpos = self.steer.mics.pos
         env = self.steer.env
         shgo_opts = {
             'n': 256,
@@ -2669,8 +2461,8 @@ class BeamformerGridlessOrth(BeamformerAdaptiveGrid):
                 # store result for position
                 self._gpos[:, i1] = oR['x']
                 # store result for level
-                self._ac[i, i1] = eva[n] / numchannels
-                # print(oR['x'],eva[n]/numchannels,oR)
+                self._ac[i, i1] = eva[n] / num_channels
+                # print(oR['x'],eva[n]/num_channels,oR)
             self._fr[i] = 1