diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
commit | 04682315bf151fb2c7c24673676cd8e07ab5fe2e (patch) | |
tree | bfa4a5157719b134adc5f6f3783f790220ae2f6b /gr-digital/python/fftshift.py | |
parent | 78527080d5cfcc611646d4694ecb9a026b343652 (diff) | |
parent | 3206f12930a131914ca2c0d15969c54d8dee5775 (diff) |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-digital/examples/ofdm/ofdm_bugsquatch.py
gr-digital/include/digital/scale_tags.h
gr-digital/include/digital/tagged_stream_check.h
gr-digital/include/digital/ts_insert_zeros_cc.h
gr-digital/python/qa_ofdm_sync_sc_cfb.py
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
Diffstat (limited to 'gr-digital/python/fftshift.py')
-rw-r--r-- | gr-digital/python/fftshift.py | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gr-digital/python/fftshift.py b/gr-digital/python/fftshift.py deleted file mode 100644 index c8c7c7f140..0000000000 --- a/gr-digital/python/fftshift.py +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2012 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -# Aliases for fftpack.(i)fftshift() - -from scipy import fftpack - -def fftshift(x): - return fftpack.fftshift(x) - -def ifftshift(x): - return fftpack.ifftshift(x) - |