Update about.html

README.md

@@ -23,7 +23,7 @@ pyIMQ for image quality measures is also required and can be found here: https:/
 
 If you prefer to not use the web service, a script can be used for batch processing locally. It can be used to input a set of images and output CSV file with stomata counts, and optionally create heatmaps of each processed image.
 
-Download the pre-trained model weights from here [[Download]](https://drive.google.com/open?id=1StStt1aiN8q1rvSnSVY--87CQ8Z4Pf9b) and unzip the two files (sc_feb2019.caffemodel and sc_feb2019.prototxt). 
+Download the most current pre-trained model weights from here [[Download]](https://drive.google.com/file/d/18qirGnLD3oEpInyp1KAVf9ZsKf_MQkRb/view?usp=sharing) (alexnetftc_iter_5000_fcn.caffemodel and sc_feb2019.prototxt), or the published model weights here [[Download]](https://drive.google.com/open?id=1StStt1aiN8q1rvSnSVY--87CQ8Z4Pf9b) (sc_feb2019.caffemodel and sc_feb2019.prototxt) and unzip the two files. 
 
 The processing command allows tweaking various settings such as the input scale and detection threshold. The interface is:
 

templates/about.html

@@ -17,10 +17,11 @@ <h2>About</h2>
         <p>Feel free to contact Karl at karl.fetter [at] gmail.com with questions.</p>
 	<h3>How to Cite</h3>
 		<p>Please cite us if you use this tool for your research. 
-		<p>Fetter, K.C., Eberhardt, S., Barclay, R.S., Wing, S. and Keller, S.R., 2019. StomataCounter: a neural network for automatic stomata identification and counting. <a href=https://doi.org/10.1111/nph.15892>New Phytologist</a>, 223(3), pp.1671-1681.    
-
-	<h3>Funding</h3>
-		<p>Funding to create Stomata Counter was provided by an NSF grant to Dr. Stephen Keller (Award # 1461868) and a Smithsonian Institution Fellowship to Karl Fetter.
+		<p>Fetter, K.C., Eberhardt, S., Barclay, R.S., Wing, S. and Keller, S.R., 2019. StomataCounter: a neural network for automatic stomata identification and counting. <a href=https://doi.org/10.1111/nph.15892>New Phytologist</a>, 223(3), pp.1671-1681.
+
+    	<h3>Funding</h3>
+			<p>Funding to create Stomata Counter was provided by an NSF grant to Dr. Stephen Keller (Award # 1461868) and a Smithsonian Institution Fellowship to Karl Fetter.
+
         <h3>Source Code</h3>
         	<p>The source code for StomataCounter is freely available on GitHub <a href="/source">here</a>. Setup requires a cuda8-capable GPU.</p>
         {{ super() }}

templates/base.html

@@ -89,7 +89,7 @@ <h2><strong>Maintenance on Sat 03/23/2019</strong>: We're running some maintenan
         {% block content %}
             <hr>
             <footer>
-                <p>Server by <a href="mailto:sven2sven2sven2@gmail.com">sven2</a>; content by <a href="mailto:kfetter@uvm.edu">Karl</a>.</p>
+                <p>Server by <a href="mailto:sven2sven2sven2@gmail.com">sven2</a>; content by <a href="mailto:karl.fetter@gmail.com">Karl</a>.</p>
             </footer>
         {% endblock %}
 

templates/index.html

@@ -21,10 +21,13 @@ <h1 class="display-3">Stomata Counter</h1>
         </div>
         <div class="col-xs-12" style="height:50px;"></div>
     </div> <!-- /container -->
+    <div class="container">
+        {{ super() }}
+    </div>
     <div class="container">
     	<div class="col-md-8">
             <h2>Welcome to StomataCounter!</h2>
-                <p>StomataCounter is a tool to work with plant epidermal micrographs to phenotype stomatal density. Supporting this method is a convolutional neural network trained about about 4,700 micrographs from 700 species of plants. You can read about how StomataCounter was developed and the tests we performed to validate StomataCounter's effectiveness in the <a href="https://doi.org/10.1101/327494">preprint</a>. We recommend you register an account with us so that you can return to your jobs after you leave the website.</p>
+                <p>StomataCounter is a tool to work with plant epidermal micrographs to phenotype stomatal density. Supporting this method is a convolutional neural network trained about about 4,700 micrographs from 700 species of plants. You can read about how StomataCounter was developed and the tests we performed to validate StomataCounter's effectiveness in the <a href="https://doi.org/10.1111/nph.15892">New Phytologist manuscript</a>. We recommend you register an account with us so that you can return to your jobs after you leave the website.</p>
             <h3>Instructions for using this site</h3>
                 <p>The simplest way to use StomataCounter is to upload a jpeg using the upload button below, refresh your browser on the Dataset page after a few moments, then export the results using the Dataset operations pulldown menu.</p>
                 <p>Most users will have several hundred images to measure and uploading zip files of jpegs is more convencient. You can add more zipfiles or individual images to a dataset by navigating to that dataset's page and following the instructions to add more images. Once StomataCounter has finished detecting and counting stomata, you should view the results of all or a set of images to determine how well the method performed. Click on an image to view the result. You should annotate 50 or 100 images (or whatever number you're comfortable with) and view the correlation of human to automatic stomata counts. This is done by clicking on the Dataset operations drop down menu and selecting "Export correlation graph".</p>