[python-dtcwt] 16/497: separate specification of default wavelet

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit bf64167596c18240d7603c5a7b0cdded88f6f396
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Wed Aug 7 13:43:24 2013 +0100

    separate specification of default wavelet
---
 dtcwt/defaults.py    | 3 +++
 dtcwt/transform2d.py | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dtcwt/defaults.py b/dtcwt/defaults.py
new file mode 100644
index 0000000..3f190fe
--- /dev/null
+++ b/dtcwt/defaults.py
@@ -0,0 +1,3 @@
+DEFAULT_BIORT='near_sym_a'
+
+DEFAULT_QSHIFT='qshift_a'
diff --git a/dtcwt/transform2d.py b/dtcwt/transform2d.py
index b34159a..bce3edc 100644
--- a/dtcwt/transform2d.py
+++ b/dtcwt/transform2d.py
@@ -2,12 +2,10 @@ import numpy as np
 import logging
 
 from dtcwt import biort as _biort, qshift as _qshift
+from dtcwt.defaults import DEFAULT_BIORT, DEFAULT_QSHIFT
 from dtcwt.lowlevel import colfilter, coldfilt, colifilt
 
-BIORT_DEFAULT='near_sym_a'
-QSHIFT_DEFAULT='qshift_a'
-
-def dtwavexfm2(X, nlevels=3, biort=BIORT_DEFAULT, qshift=QSHIFT_DEFAULT, include_scale=False):
+def dtwavexfm2(X, nlevels=3, biort=DEFAULT_BIORT, qshift=DEFAULT_QSHIFT, include_scale=False):
     """Function to perform a n-level DTCWT-2D decompostion on a 2D matrix X
 
     Yl, Yh = dtwavexfm2(X, nlevels, biort, qshift)
@@ -170,7 +168,7 @@ def dtwavexfm2(X, nlevels=3, biort=BIORT_DEFAULT, qshift=QSHIFT_DEFAULT, include
         return Yl, tuple(Yh)
 
 
-def dtwaveifm2(Yl,Yh,biort=BIORT_DEFAULT,qshift=QSHIFT_DEFAULT,gain_mask=None):
+def dtwaveifm2(Yl,Yh,biort=DEFAULT_BIORT,qshift=DEFAULT_QSHIFT,gain_mask=None):
     """
     Function to perform an n-level dual-tree complex wavelet (DTCWT) 2-D
     reconstruction.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git