Commit 18538e9f authored by jansen31's avatar jansen31
Browse files

simplify

parent 1ca20b28
...@@ -16,11 +16,10 @@ class OrthogonalOrbitals(PlanarMolecule): ...@@ -16,11 +16,10 @@ class OrthogonalOrbitals(PlanarMolecule):
'data_filename': None, 'data_filename': None,
'from_intensity_data': True, 'from_intensity_data': True,
'object': 'real', 'object': 'real',
'degeneracy': 2, # Number of degenerate states to reconstruct
'constraint': 'sparse real', 'constraint': 'sparse real',
'sparsity_parameter': 40, 'sparsity_parameter': 75,
'use_sparsity_with_support': True, 'use_sparsity_with_support': True,
'threshold_for_support': 0.01, 'threshold_for_support': 0.05,
'support_filename': None, 'support_filename': None,
'Nx': None, 'Nx': None,
'Ny': None, 'Ny': None,
...@@ -30,14 +29,10 @@ class OrthogonalOrbitals(PlanarMolecule): ...@@ -30,14 +29,10 @@ class OrthogonalOrbitals(PlanarMolecule):
'lambda_0': 0.85, 'lambda_0': 0.85,
'lambda_max': 0.50, 'lambda_max': 0.50,
'lambda_switch': 50, 'lambda_switch': 50,
'data_ball': .999826,
'TOL2': 1e-15,
'diagnostic': True, 'diagnostic': True,
'algorithm': 'CP', 'algorithm': 'CP', # Cyclic Projections: reduces to AP when only given 2 proxoperators
'iterate_monitor_name': 'FeasibilityIterateMonitor', # 'IterateMonitor', # 'iterate_monitor_name': 'FeasibilityIterateMonitor', # 'IterateMonitor', #
'rotate': False,
'verbose': 1, 'verbose': 1,
'graphics': 1,
'interpolate_and_zoom': True, 'interpolate_and_zoom': True,
'debug': True, 'debug': True,
'progressbar': None 'progressbar': None
...@@ -107,9 +102,8 @@ class OrthogonalOrbitals(PlanarMolecule): ...@@ -107,9 +102,8 @@ class OrthogonalOrbitals(PlanarMolecule):
absolute_autocorrelation=True, absolute_autocorrelation=True,
binary_dilate_support=1) binary_dilate_support=1)
if self.use_sparsity_with_support: if self.use_sparsity_with_support:
self.sparsity_support = support_from_stack(self.data, self.sparsity_support = self.support
threshold=self.threshold_for_support,
binary_dilate_support=1)
self.createRandomGuess() self.createRandomGuess()
# some variables wich are necessary for the algorithm: # some variables wich are necessary for the algorithm:
......
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