dap/algos/streakfind.py

@@ -14,6 +14,10 @@ from streak_finder.label import Structure2D
 DEFAULT_NUM_THREADS = 16
 
 def calc_cbd_analysis(results, data, pf_pixel_mask):
+    do_snr = results.get("do_snr", False)
+    if not do_snr:
+        return data
+
     try:
         cryst_data = _generate_cryst_data(results, data, pf_pixel_mask)
     except Exception as error:  # Broad exception - we don't want to break anything here
@@ -26,13 +30,10 @@ def calc_cbd_analysis(results, data, pf_pixel_mask):
     except Exception as error:  # Broad exception - we don't want to break anything here
         print(f"Error processing CBD data:\n{error}")
         results["cbd_error"] = f"Error processing CBD data:\n{error}"
-    return cryst_data.snr
+    print(f"Returning data shape {cryst_data.snr[0].shape}")
+    return cryst_data.snr[0]
 
 def _generate_cryst_data(results, data, pf_pixel_mask) -> CrystData:
-    do_snr = results.get("do_snr", False)
-    if not do_snr:
-        return
-
     params_required = [
         "whitefield_data_file",
         "mask_data_file",
@@ -73,7 +74,8 @@ def _generate_cryst_data(results, data, pf_pixel_mask) -> CrystData:
     )
     if scale_whitefield:
         data = data.scale_whitefield(method='median', num_threads=num_threads)
-
+    
+    data = data.update_snr()
     return data
 
 def _calc_streakfinder_analysis(results, cryst_data: CrystData):