merge master

proxtoolbox/experiments/orbitaltomography/orthogonal_orbits.py

@@ -183,20 +183,8 @@ class OrthogonalOrbitals(PlanarMolecule):
                                 figsize=figsize)
             self.output['plots'].append(f)
 
-        # f1 = self.plot_guess(self.output['u1'], name='Best approximation: physical constraint satisfied', show=False)
-        # f2 = self.plot_guess(self.output['u2'], name='Best approximation: Fourier constraint satisfied', show=False)
-        # prop = self.propagator(self)
-        # u_hat = prop.eval(self.algorithm.prox1.eval(self.algorithm.u))
-        # h = self.plot_guess(u_hat, show=False, name="Fourier domain measurement projection")
-
-        # self.output['plots'].append(f1)
-        # self.output['plots'].append(f2)
-        # self.output['plots'].append(h)
         plt.show()
 
-    # def saveOutput(self, **kwargs):
-    #     super(PlanarMolecule, self).saveOutput(**kwargs)
-
     def plot_guess(self, u, name=None, show=True, interpolate_and_zoom=False, figsize=(12, 6)):
         """"Given a list of fields, plot the individual fields and the combined intensity"""
         prop = self.propagator(self)  # This is not a string but the indicated class itself, to be instantiated