deepliif 1.1.15__py3-none-any.whl → 1.2.1__py3-none-any.whl

deepliif/models/__init__.py

@@ -283,11 +283,11 @@ def run_dask(img, model_path=None, nets=None, eager_mode=False, opt=None, seg_on
     if opt.model in ['DeepLIIF','DeepLIIFKD']:
         if seg_weights is None:
             weights = {
-                'G51': 0.25, # IHC
-                'G52': 0.25, # Hema
-                'G53': 0.25, # DAPI
-                'G54': 0.00, # Lap2
-                'G55': 0.25, # Marker
+                'G51': 0.5, # IHC
+                'G52': 0.0, # Hema
+                'G53': 0.0, # DAPI
+                'G54': 0.0, # Lap2
+                'G55': 0.5, # Marker
             }
         else:
             weights = {

deepliif/postprocessing.py

@@ -1053,17 +1053,17 @@ def calculate_large_noise_thresh(large_noise_thresh, resolution):
     if large_noise_thresh != 'default':
         return large_noise_thresh
     if resolution == '10x':
-        return 250
-    elif resolution == '20x':
         return 1000
-    else: # 40x
+    elif resolution == '20x':
         return 4000
+    else: # 40x
+        return 16000
 
 
 def compute_cell_results(seg, marker, resolution, version=3,
                          seg_thresh=DEFAULT_SEG_THRESH,
                          noise_thresh=DEFAULT_NOISE_THRESH,
-                         large_noise_thresh='default'):
+                         large_noise_thresh=None):
     """
     Perform postprocessing to compute individual cell results.
 
@@ -1134,7 +1134,7 @@ def compute_final_results(orig, seg, marker, resolution,
                           size_thresh_upper=None,
                           seg_thresh=DEFAULT_SEG_THRESH,
                           noise_thresh=DEFAULT_NOISE_THRESH,
-                          large_noise_thresh='default'):
+                          large_noise_thresh=None):
     """
     Perform postprocessing to compute final count and image results.