[python-dtcwt] 375/497: Pyramid: fix behaviour when one highpass is None

[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 a55d060db4b817159a537e6ad3607775b9504bce
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Sat Feb 8 12:01:51 2014 +0000

    Pyramid: fix behaviour when one highpass is None
    
    The 3d transform can return 'None' for the first level is
    discard_level_1 is set. Update Pyramid to understand this.
---
 dtcwt/numpy/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dtcwt/numpy/common.py b/dtcwt/numpy/common.py
index f85fb92..06cd9e0 100644
--- a/dtcwt/numpy/common.py
+++ b/dtcwt/numpy/common.py
@@ -28,6 +28,6 @@ class Pyramid(object):
     """
     def __init__(self, lowpass, highpasses, scales=None):
         self.lowpass = asfarray(lowpass)
-        self.highpasses = tuple(asfarray(x) for x in highpasses)
+        self.highpasses = tuple(asfarray(x) if x is not None else None for x in highpasses)
         self.scales = tuple(asfarray(x) for x in scales) if scales is not None else None
 

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