Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
79f806e2
Commit
79f806e2
authored
Oct 07, 2017
by
Martin Reinecke
Browse files
rearrange
parent
15d0cad6
Pipeline
#19378
failed with stage
in 4 minutes and 2 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
18 additions
and
137 deletions
+18
-137
nifty/spaces/gl_space.py
nifty/spaces/gl_space.py
+1
-1
nifty/spaces/gl_space/__init__.py
nifty/spaces/gl_space/__init__.py
+0
-19
nifty/spaces/hp_space.py
nifty/spaces/hp_space.py
+1
-2
nifty/spaces/hp_space/__init__.py
nifty/spaces/hp_space/__init__.py
+0
-19
nifty/spaces/lm_space.py
nifty/spaces/lm_space.py
+1
-3
nifty/spaces/lm_space/__init__.py
nifty/spaces/lm_space/__init__.py
+0
-19
nifty/spaces/power_space.py
nifty/spaces/power_space.py
+13
-15
nifty/spaces/power_space/__init__.py
nifty/spaces/power_space/__init__.py
+0
-19
nifty/spaces/rg_space.py
nifty/spaces/rg_space.py
+1
-1
nifty/spaces/rg_space/__init__.py
nifty/spaces/rg_space/__init__.py
+0
-19
nifty/spaces/space.py
nifty/spaces/space.py
+1
-1
nifty/spaces/space/__init__.py
nifty/spaces/space/__init__.py
+0
-19
No files found.
nifty/spaces/gl_space
/gl_space
.py
→
nifty/spaces/gl_space.py
View file @
79f806e2
...
...
@@ -18,7 +18,7 @@
from
__future__
import
division
import
numpy
as
np
from
.
.space
import
Space
from
.space
import
Space
class
GLSpace
(
Space
):
...
...
nifty/spaces/gl_space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.gl_space
import
GLSpace
nifty/spaces/hp_space
/hp_space
.py
→
nifty/spaces/hp_space.py
View file @
79f806e2
...
...
@@ -18,8 +18,7 @@
from
__future__
import
division
import
numpy
as
np
from
..space
import
Space
from
.space
import
Space
class
HPSpace
(
Space
):
...
...
nifty/spaces/hp_space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.hp_space
import
HPSpace
nifty/spaces/lm_space
/lm_space
.py
→
nifty/spaces/lm_space.py
View file @
79f806e2
...
...
@@ -17,10 +17,8 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from
__future__
import
division
import
numpy
as
np
from
..space
import
Space
from
.space
import
Space
class
LMSpace
(
Space
):
...
...
nifty/spaces/lm_space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.lm_space
import
LMSpace
nifty/spaces/power_space
/power_space
.py
→
nifty/spaces/power_space.py
View file @
79f806e2
...
...
@@ -17,10 +17,9 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
import
numpy
as
np
from
...spaces.space
import
Space
from
.space
import
Space
from
functools
import
reduce
from
..
.
import
dobj
from
..
import
dobj
class
PowerSpace
(
Space
):
...
...
@@ -51,9 +50,6 @@ class PowerSpace(Space):
mapped to which power bin
k_lengths : numpy.ndarray
Sorted array of all k-modes.
rho : numpy.ndarray
The amount of k-modes that get mapped to one power bin is given by
rho.
dim : np.int
Total number of dimensionality, i.e. the number of pixels.
harmonic : bool
...
...
@@ -148,7 +144,11 @@ class PowerSpace(Space):
if
not
(
isinstance
(
harmonic_partner
,
Space
)
and
harmonic_partner
.
harmonic
):
raise
ValueError
(
"harmonic_partner must be a harmonic space."
)
if
harmonic_partner
.
scalar_dvol
()
is
None
:
raise
ValueError
(
"harmonic partner must have "
"scalar volume factors"
)
self
.
_harmonic_partner
=
harmonic_partner
pdvol
=
harmonic_partner
.
scalar_dvol
()
if
binbounds
is
not
None
:
binbounds
=
tuple
(
binbounds
)
...
...
@@ -165,12 +165,13 @@ class PowerSpace(Space):
temp_k_lengths
=
np
.
bincount
(
temp_pindex
.
ravel
(),
weights
=
k_length_array
.
ravel
())
\
/
temp_rho
temp_dvol
=
temp_rho
*
pdvol
self
.
_powerIndexCache
[
key
]
=
(
binbounds
,
temp_pindex
,
temp_k_lengths
,
temp_
rho
)
temp_
dvol
)
(
self
.
_binbounds
,
self
.
_pindex
,
self
.
_k_lengths
,
self
.
_
rho
)
=
\
(
self
.
_binbounds
,
self
.
_pindex
,
self
.
_k_lengths
,
self
.
_
dvol
)
=
\
self
.
_powerIndexCache
[
key
]
@
staticmethod
...
...
@@ -199,7 +200,10 @@ class PowerSpace(Space):
return
self
.
shape
[
0
]
def
scalar_dvol
(
self
):
return
1.
return
None
def
dvol
(
self
):
return
self
.
_dvol
def
get_k_length_array
(
self
):
return
self
.
k_lengths
.
copy
()
...
...
@@ -232,9 +236,3 @@ class PowerSpace(Space):
""" Sorted array of all k-modes.
"""
return
self
.
_k_lengths
@
property
def
rho
(
self
):
"""Degeneracy factor of the individual k-vectors.
"""
return
self
.
_rho
nifty/spaces/power_space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.power_space
import
PowerSpace
nifty/spaces/rg_space
/rg_space
.py
→
nifty/spaces/rg_space.py
View file @
79f806e2
...
...
@@ -32,7 +32,7 @@ from __future__ import division
from
builtins
import
range
from
functools
import
reduce
import
numpy
as
np
from
.
.space
import
Space
from
.space
import
Space
class
RGSpace
(
Space
):
...
...
nifty/spaces/rg_space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.rg_space
import
RGSpace
nifty/spaces/space
/space
.py
→
nifty/spaces/space.py
View file @
79f806e2
...
...
@@ -18,7 +18,7 @@
import
abc
from
..
.
domain_object
import
DomainObject
from
..domain_object
import
DomainObject
class
Space
(
DomainObject
):
...
...
nifty/spaces/space/__init__.py
deleted
100644 → 0
View file @
15d0cad6
# This program 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 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2017 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
.space
import
Space
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment