Updated Reqs

Author: JBeckwith

requirements.txt

@@ -61,6 +61,7 @@ ipython==8.12.3
 isoduration==20.11.0
 jedi==0.19.1
 Jinja2==3.1.4
+joblib==1.5.0
 json5==0.9.17
 jsonpointer==2.4
 jsonschema==4.21.1
@@ -157,6 +158,7 @@ rfc3986-validator==0.1.1
 rich==13.9.4
 rpds-py==0.18.0
 scikit-image==0.25.2
+scikit-learn==1.6.1
 scipy==1.13.0
 seaborn==0.13.2
 Send2Trash==1.8.2
@@ -179,6 +181,7 @@ stack-data==0.6.3
 superqt==0.7.1
 tabulate==0.9.0
 terminado==0.18.0
+threadpoolctl==3.6.0
 tifffile==2024.2.12
 tinycss2==1.2.1
 tokenize-rt==5.2.0

src/HelperFunctions.py

@@ -184,7 +184,10 @@ def make_datarray_spot(
                     dataarray = stack
                 else:
                     da = stack
-                    dataarray = np.hstack([dataarray, da])
+                    if dataarray is not None:
+                        dataarray = np.hstack([dataarray, da])
+                    else:
+                        dataarray = da
         if dataarray is not None:
             dataarray = np.asarray(np.matrix(np.squeeze(dataarray)).transpose())
             if len(dataarray.shape) > 1:

src/RASPRoutines.py

@@ -672,20 +672,21 @@ def _analysis_loop(
                 cell_sigma2=self.cell_sigma2,
                 d=self.d,
             )
-            IO.save_analysis(
-                to_save,
-                to_save_largeobjects,
-                analysis_directory,
-                imtype,
-                protein_string,
-                cell_string,
-                files,
-                i,
-                z_planes,
-                lo_mask,
-                cell_mask=cell_mask if cell_analysis else None,
-                one_savefile=one_savefile,
-            )
+            if to_save is not None:
+                IO.save_analysis(
+                    to_save,
+                    to_save_largeobjects,
+                    analysis_directory,
+                    imtype,
+                    protein_string,
+                    cell_string,
+                    files,
+                    i,
+                    z_planes,
+                    lo_mask,
+                    cell_mask=cell_mask if cell_analysis else None,
+                    one_savefile=one_savefile,
+                )
 
         start = time.time()