simplify

proxtoolbox/experiments/orbitaltomography/orthogonal_orbits.py

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