8000 new mono drivingfunction handling by fs446 · Pull Request #125 · sfstoolbox/sfs-python · GitHub
[go: up one dir, main page]
Skip to content

new mono drivingfunction handling #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 13, 2019
Merged

new mono drivingfunction handling #125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e16d181
new mono drivingfunction handling
fs446 Mar 12, 2019
bcc8239
__init.py__, soundfigure into wfs handling
fs446 Mar 12, 2019
9a7b091
Update __init__.py
fs446 Mar 13, 2019
da37636
Update esaedge.py
fs446 Mar 13, 2019
23c4f8e
Update nfchoa.py
fs446 Mar 13, 2019
3779e59
Update esaedge.py
fs446 Mar 13, 2019
0615628
Update nfchoa.py
fs446 Mar 13, 2019
0c86e4d
Update sdm.py
fs446 Mar 13, 2019
aed7ab7
Update sdm.py
fs446 Mar 13, 2019
b227cbb
Update wfs.py
fs446 Mar 13, 2019
1a726e2
Update horizontal_plane_arrays.py
fs446 Mar 13, 2019
74687a7
soundfigure_3d update
fs446 Mar 13, 2019
7424338
esaedge to esa
fs446 Mar 13, 2019
fad204d
Update __init__.py
fs446 Mar 13, 2019
5eeaecc
Update esa.py
fs446 Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
new mono drivingfunction handling
  • Loading branch information
@fs446
fs446 committed Mar 12, 2019
commit e16d1813aa59a695b25cea71ea1bbe6678c65b01
22 changes: 11 additions & 11 deletions doc/examples/sound_field_synthesis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@


# === compute driving function and determine active secondary sources ===
#d, selection, secondary_source = sfs.mono.drivingfunction.delay_3d_plane(omega, array.x, array.n, npw)
#d, selection, secondary_source = sfs.mono.wfs.plane_3d_delay(omega, array.x, array.n, npw)

#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_2d_line(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.wfs.line_2d(omega, array.x, array.n, xs)

#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_2d_plane(omega, array.x, array.n, npw)
d, selection, secondary_source = sfs.mono.drivingfunction.wfs_25d_plane(omega, array.x, array.n, npw, xref)
#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_3d_plane(omega, array.x, array.n, npw)
#d, selection, secondary_source = sfs.mono.wfs.plane_2d(omega, array.x, array.n, npw)
d, selection, secondary_source = sfs.mono.wfs.plane_25d(omega, array.x, array.n, npw, xref)
#d, selection, secondary_source = sfs.mono.wfs.plane_3d(omega, array.x, array.n, npw)

#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_2d_point(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_25d_point(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.drivingfunction.wfs_3d_point(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.wfs.point_2d(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.wfs.point_25d(omega, array.x, array.n, xs)
#d, selection, secondary_source = sfs.mono.wfs.point_3d(omega, array.x, array.n, xs)

#d, selection, secondary_source = sfs.mono.drivingfunction.nfchoa_2d_plane(omega, array.x, R, npw)
#d, selection, secondary_source = sfs.mono.nfchoa.plane_2d(omega, array.x, R, npw)

#d, selection, secondary_source = sfs.mono.drivingfunction.nfchoa_25d_point(omega, array.x, R, xs)
#d, selection, secondary_source = sfs.mono.drivingfunction.nfchoa_25d_plane(omega, array.x, R, npw)
#d, selection, secondary_source = sfs.mono.nfchoa.point_25d(omega, array.x, R, xs)
#d, selection, secondary_source = sfs.mono.nfchoa.plane_25d(omega, array.x, R, npw)


# === compute tapering window ===
Expand Down
13 changes: 11 additions & 2 deletions sfs/mono/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@
.. autosummary::
:toctree:

drivingfunction
esaedge
nfchoa
sdm
wfs

source
soundfigure

"""
import numpy as _np

from . import drivingfunction

from . import esaedge
from . import nfchoa
from . import sdm
from . import wfs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could move those 4 import statements to the very bottom of the file, to make clear that they are not needed in the code below.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ordering seems to make a difference
this works:
9a7b091

def below the imports not.


from . import source
from . import soundfigure

Expand Down
Loading
0