Updated in phase relevant part setting proxoperators for Near_field_Siemens_experimental

proxtoolbox/Problems/Phase/phase.py

@@ -92,16 +92,28 @@ class Phase(Problem):
         if self.config['experiment'] == 'single diffraction' or self.config['experiment'] == 'CDI':
             if self.config['distance'] == 'far field':
                 if self.config['constraint'] == 'phaselift':
-                    proxoperators[1] = 'P_Rank1';
+                    proxoperators[1] = 'P_Rank1'
                 elif self.config['constraint'] == 'phaselift2':
-                    proxoperators[1] = 'P_rank1_SR';
+                    proxoperators[1] = 'P_rank1_SR'
                 else:
                     if self.config['noise'] == 'Poisson':
-                        proxoperators[1] ='Approx_PM_Poisson';
+                        proxoperators[1] ='Approx_PM_Poisson'
                     else:
-                        proxoperators[1] ='Approx_PM_Gaussian';
+                        proxoperators[1] ='Approx_PM_Gaussian'
             else:
-                proxoperators[1]='P_Fresnel';
+                if self.config['noise'] == 'Poisson':
+                    proxoperators[1]='Approx_P_FreFra_Poisson'
+        # possibly not necessary, but we set the prox operators here for specific
+        # named data sets
+        elif (self.config['experiment'] == 'Krueger') or (self.config['experiment'] == 'Near_field_cell_syn'):
+             proxoperators[0]='P_Amod'
+             proxoperators[1]='Approx_P_FreFra_Poisson'
+        # The following selects the prox mappings for diversity diffraction not
+        # performed in the product space. So far only used for RCAAR.
+        elif self.config['experiment'] in ('dict', 'dictyM103_stx6_600frames','xenopus','living_worm'):
+            proxoperators[0]='P_Amod' # Not sure this is the appropriate prox operator for these
+                                   # experiments...
+            proxoperators[1]='Approx_P_FreFra_Poisson'
 
         # The following selects the projectors for diversity diffraction not
         # performed in the product space. So far only used for RCAAR.