pdnl-process 0.4__tar.gz → 0.5__tar.gz

{pdnl_process-0.4 → pdnl_process-0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdnl_process
-Version: 0.4
+Version: 0.5
 Summary: PDNL Process
 Project-URL: Homepage, https://github.com/PennCompPathology/pdnl_process
 Author-email: Noah Capp <noahmcapp@gmail.com>

{pdnl_process-0.4 → pdnl_process-0.5}/pdnl_process/main.py

@@ -62,12 +62,19 @@ def main():
                 normalize_background=params.get('normalize_background', False),
                 stain_vector=params.get('stain_vector', None)
             )
-            hist = processor.dab.get_histogram(mask=processor.main_mask)
-            if histogram is None:
-                histogram = hist
-            else:
-                histogram = histogram + hist
-            processor.dab.save(os.path.join(out_d, 'stain.npy'))
+        if args.staining_code == 'CV-DAB':
+            processor = pdnl_sana.process.CVDABProcessor(
+                logger, frame, main_mask=mask,
+                apply_smoothing=params.get('apply_smoothing', False),
+                normalize_background=params.get('normalize_background', False),
+                stain_vector=params.get('stain_vector', None)
+            )                
+        hist = processor.dab.get_histogram(mask=processor.main_mask)
+        if histogram is None:
+            histogram = hist
+        else:
+            histogram = histogram + hist
+        processor.dab.save(os.path.join(out_d, 'stain.npy'))
 
     # calculate the threshold
     if not histogram is None:

{pdnl_process-0.4 → pdnl_process-0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pdnl_process"
-version = "0.4"
+version = "0.5"
 authors = [
   { name="Noah Capp", email="noahmcapp@gmail.com" },
 ]