Commit 0456ca2e authored by Philipp Arras's avatar Philipp Arras
Browse files

Merge branch 'fixup_domaindistr' into 'NIFTy_5'

Adopt mf_correlated fields to new domain distributor

See merge request ift/nifty-dev!54
parents e8105d79 147ffb79
......@@ -73,9 +73,6 @@ run_ipynb:
stage: demo_runs
script:
- jupyter nbconvert --execute --ExecutePreprocessor.timeout=None demos/Wiener_Filter.ipynb
artifacts:
paths:
- '*.png'
run_getting_started_1:
stage: demo_runs
......@@ -83,6 +80,9 @@ run_getting_started_1:
- python demos/getting_started_1.py
- python3 demos/getting_started_1.py
- mpiexec -n 2 --bind-to none python3 demos/getting_started_1.py 2> /dev/null
artifacts:
paths:
- '*.png'
run_getting_started_2:
stage: demo_runs
......@@ -90,12 +90,18 @@ run_getting_started_2:
- python demos/getting_started_2.py
- python3 demos/getting_started_2.py
- mpiexec -n 2 --bind-to none python3 demos/getting_started_2.py 2> /dev/null
artifacts:
paths:
- '*.png'
run_getting_started_3:
stage: demo_runs
script:
- python demos/getting_started_3.py
- python3 demos/getting_started_3.py
artifacts:
paths:
- '*.png'
run_bernoulli:
stage: demo_runs
......
......@@ -103,4 +103,4 @@ if __name__ == '__main__':
# Plot results
result_sky = sky.at(H.position).value
# PLOTTING
# FIXME PLOTTING
......@@ -79,10 +79,11 @@ def make_mf_correlated_field(s_space_spatial, s_space_energy,
pd_energy = PowerDistributor(pd_spatial.domain, p_space_energy, 1)
pd = pd_spatial*pd_energy
dom_distr_0 = DomainDistributor(pd.domain, 0)
dom_distr_1 = DomainDistributor(pd.domain, 1)
a_spatial = dom_distr_1(amplitude_model_spatial)
a_energy = dom_distr_0(amplitude_model_energy)
dom_distr_spatial = DomainDistributor(pd.domain, 0)
dom_distr_energy = DomainDistributor(pd.domain, 1)
a_spatial = dom_distr_spatial(amplitude_model_spatial)
a_energy = dom_distr_energy(amplitude_model_energy)
a = a_spatial*a_energy
A = pd(a)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment