Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nam
ProxPython
Commits
6c4474c3
Commit
6c4474c3
authored
Apr 08, 2017
by
alexander.dornheim
Browse files
Corrected to semantic mistakes in phase
parent
d31b1238
Changes
1
Hide whitespace changes
Inline
Side-by-side
proxtoolbox/Problems/Phase/phase.py
View file @
6c4474c3
...
...
@@ -39,7 +39,7 @@ class Phase(Problem):
self
.
config
[
'fresnel_nr'
]
=
0
self
.
config
[
'use_farfield_formula'
]
=
1
#call data processor, read data
...
...
@@ -59,7 +59,7 @@ class Phase(Problem):
self
.
config
[
'normM'
]
=
self
.
config
[
'norm_rt_data'
];
#previously (in matlab) norm_data
if
'Nz'
not
in
self
.
config
:
self
.
config
[
Nz
]
=
1
;
self
.
config
[
'
Nz
'
]
=
1
;
#If method_config[formulation is does not exist, i.e. not specified in
...
...
@@ -94,7 +94,7 @@ class Phase(Problem):
proxoperators
[
2
]
=
'Approx_PM_Poisson'
;
# Patrick: This is just to monitor the change of phases!
if
self
.
config
[
'experiment'
]
==
'single diffraction'
:
if
self
.
config
[
distance
]
==
'far field'
:
if
self
.
config
[
'
distance
'
]
==
'far field'
:
if
self
.
config
[
'constraint'
]
==
'phaselift'
:
proxoperators
[
1
]
=
'P_Rank1'
;
elif
self
.
config
[
'constraint'
]
==
'phaselift2'
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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