From 2ef52e040133f01658fbb8262ba667b47013d11d Mon Sep 17 00:00:00 2001
From: Emily Laubscher <43769564+elaubsch@users.noreply.github.com>
Date: Tue, 25 Jun 2024 04:51:57 -0700
Subject: [PATCH] Add SpotNet v1.1 (#706)

* Add SpotNet v1.1

* Update spotnet version in gallery example.

---------

Co-authored-by: Ross Barnowski <rossbar@caltech.edu>
---
 deepcell/datasets/spot_net.py   | 18 ++++++++++++------
 docs/source/datasets/spotnet.py |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/deepcell/datasets/spot_net.py b/deepcell/datasets/spot_net.py
index 4a06c9ee..ba8650de 100644
--- a/deepcell/datasets/spot_net.py
+++ b/deepcell/datasets/spot_net.py
@@ -38,19 +38,23 @@
         "url": "data/spotnet/SpotNet-v1_0.zip",
         "file_hash": "ad7ba11bffa242e36bd51b59f5f0abd3"
     },
+    "1.1": {
+        "url": "data/spotnet/SpotNet-v1_1.zip",
+        "file_hash": "43691bd2d19b49c7832edb198468a4ab"
+    }
 }
 
 SAMPLE_URL = "https://deepcell-data.s3.us-west-1.amazonaws.com/spot_detection/SpotNetExampleData-v1_0.zip"
 SAMPLE_HASH = "bb8675da94e34805a8853b029b74e61a"
 
 class SpotNet(SpotsDataset):
-    def __init__(self, version="1.0"):
+    def __init__(self, version="1.1"):
         """
         The SpotNet dataset is composed of a train, val, and test split of raw fluorescent
         spot images and coordinate spot annotations.
-            - The train split is composed of 838 images, each of which are 128x128 pixels.
-            - The val split is composed of 94 images, each of which are 128x128 pixels.
-            - The test split is composed of 100 images, each of which are 128x128 pixels.
+            - The train split is composed of 849 images, each of which are 128x128 pixels.
+            - The val split is composed of 95 images, each of which are 128x128 pixels.
+            - The test split is composed of 94 images, each of which are 128x128 pixels.
         See Laubscher et al. (2023) for details on image sources.
 
         This dataset is licensed under a modified Apache license for non-commercial academic
@@ -60,12 +64,14 @@ def __init__(self, version="1.0"):
         Change Log
             - SpotNet 1.0 (Aug 2023): The original dataset used for all experiments in
               Laubscher et al. (2023)
+            - SpotNet 1.1 (Jan 2024): The updated dataset, now including Airlocalize
+              annotations to create consensus annotations
 
         Args:
-            version (str, optional): Defaults to 1.0
+            version (str, optional): Defaults to 1.1
 
         Example:
-            >>> spotnet = SpotNet(version='1.0')  # doctest: +SKIP
+            >>> spotnet = SpotNet(version='1.1')  # doctest: +SKIP
             >>> X_val, y_val = spotnet.load_data(split='val')  # doctest: +SKIP
 
         Raises:
diff --git a/docs/source/datasets/spotnet.py b/docs/source/datasets/spotnet.py
index 6e1c7cc4..7608e61e 100644
--- a/docs/source/datasets/spotnet.py
+++ b/docs/source/datasets/spotnet.py
@@ -26,6 +26,6 @@
 
 from deepcell.datasets import SpotNet
 
-spotnet = SpotNet(version='1.0')
+spotnet = SpotNet(version='1.1')
 X_val, y_val = spotnet.load_data(split='val')
 # sphinx_gallery_thumbnail_path = '../images/spots.png'