Merge pull request #533 from NERSC/more_bug_fixes

More bug fixes

Author: swelborn

operators/quantem-direct-ptycho/run.py

@@ -234,15 +234,16 @@ def quantem_direct_ptycho(
                 aberration_coefs=opt_aberration_coefs,
                 rotation_angle=opt_rotation_angle,
                 deconvolution_kernel=deconvolution_kernel,
-                n_trials=5,  # TODO increase this later
+                n_trials=50,
+                max_batch_size=10,
             )
         else:
             logger.info(f"Scan {scan_number}: Using manual hyperparameter settings")
 
         initial_parallax = direct_ptycho.reconstruct(
             deconvolution_kernel=deconvolution_kernel,
             upsampling_factor=upsampling_factor,
-            max_batch_size=32, # this used to be 10. Lets try 32
+            max_batch_size=10,
         )
 
         # Process and return result

operators/update-distiller-metadata/run.py

@@ -201,8 +201,10 @@ def update_distiller_metadata(
         return
 
     # Extract C12 magnitude and angle from metadata if available
-    C12_magnitude = inputs.header.meta.get("C12", None)
-    C12_angle = inputs.header.meta.get("phi12", None)
+    direct_ptycho_params = inputs.header.meta.get("direct_ptycho_params", None)
+    if direct_ptycho_params is not None:
+        C12_magnitude = direct_ptycho_params.get("C12", None)
+        C12_angle = direct_ptycho_params.get("phi12", None)
 
     if C12_magnitude is not None and C12_angle is not None:
         logger.info(f"C12: {C12_magnitude} {C12_angle}")