Merge pull request #12 from gardner-lab/Liberti

Liberti
gardner-lab · Dec 5, 2018 · 366f640 · 366f640
2 parents 4acb496 + 95049f8
commit 366f640
Show file tree

Hide file tree

Showing 28 changed files with 106,796 additions and 9 deletions.
diff --git a/Accessories/testfile.png b/Accessories/testfile.png
diff --git a/CaBMI_miniscope/CaBMI_BasePlate.skp → ...Files/CaBMI_miniscope/CaBMI_BasePlate.skp b/CaBMI_miniscope/CaBMI_BasePlate.skp → ...Files/CaBMI_miniscope/CaBMI_BasePlate.skp
diff --git a/CaBMI_miniscope/CaBMI_BasePlate.stl → ...Files/CaBMI_miniscope/CaBMI_BasePlate.stl b/CaBMI_miniscope/CaBMI_BasePlate.stl → ...Files/CaBMI_miniscope/CaBMI_BasePlate.stl
diff --git a/FinchScope/DesignFiles/CaBMI_miniscope/CaBMI_BasePlate_v2.stl b/FinchScope/DesignFiles/CaBMI_miniscope/CaBMI_BasePlate_v2.stl
diff --git a/CaBMI_miniscope/CaBMI_BasePlate~.skp → ...iles/CaBMI_miniscope/CaBMI_BasePlate~.skp b/CaBMI_miniscope/CaBMI_BasePlate~.skp → ...iles/CaBMI_miniscope/CaBMI_BasePlate~.skp
diff --git a/CaBMI_miniscope/CaBMI_miniscope.skp → ...Files/CaBMI_miniscope/CaBMI_miniscope.skp b/CaBMI_miniscope/CaBMI_miniscope.skp → ...Files/CaBMI_miniscope/CaBMI_miniscope.skp
diff --git a/CaBMI_miniscope/CaBMI_miniscope.stl → ...Files/CaBMI_miniscope/CaBMI_miniscope.stl b/CaBMI_miniscope/CaBMI_miniscope.stl → ...Files/CaBMI_miniscope/CaBMI_miniscope.stl
diff --git a/CaBMI_miniscope/CaBMI_miniscope~.skp → ...iles/CaBMI_miniscope/CaBMI_miniscope~.skp b/CaBMI_miniscope/CaBMI_miniscope~.skp → ...iles/CaBMI_miniscope/CaBMI_miniscope~.skp
diff --git a/FinchScope/DesignFiles/Enclosure/Bottem.skp b/FinchScope/DesignFiles/Enclosure/Bottem.skp
diff --git a/FinchScope/DesignFiles/Enclosure/Bottem.stl b/FinchScope/DesignFiles/Enclosure/Bottem.stl
diff --git a/FinchScope/DesignFiles/Enclosure/Bottem~.skp b/FinchScope/DesignFiles/Enclosure/Bottem~.skp
diff --git a/FinchScope/DesignFiles/Enclosure/top.skp b/FinchScope/DesignFiles/Enclosure/top.skp
diff --git a/FinchScope/DesignFiles/Enclosure/top.stl b/FinchScope/DesignFiles/Enclosure/top.stl
diff --git a/FinchScope/DesignFiles/Enclosure/top~.skp b/FinchScope/DesignFiles/Enclosure/top~.skp
diff --git a/...esignFiles/FinchScope/FS_122016_2.0mm.skp → .../Microscope Housing (FS_122016_2.0mm).skp b/...esignFiles/FinchScope/FS_122016_2.0mm.skp → .../Microscope Housing (FS_122016_2.0mm).skp
diff --git a/...esignFiles/FinchScope/FS_122016_2.0mm.stl → .../Microscope Housing (FS_122016_2.0mm).stl b/...esignFiles/FinchScope/FS_122016_2.0mm.stl → .../Microscope Housing (FS_122016_2.0mm).stl
diff --git a/FinchScope/DesignFiles/FinchScope/archive/FS_122016_2.0mm.skp b/FinchScope/DesignFiles/FinchScope/archive/FS_122016_2.0mm.skp
diff --git a/FinchScope/DesignFiles/FinchScope/archive/FS_122016_2.0mm.stl b/FinchScope/DesignFiles/FinchScope/archive/FS_122016_2.0mm.stl
diff --git a/FinchScope Dual Color/placeholder → ...ignFiles/FinchScope_DualColor/placeholder b/FinchScope Dual Color/placeholder → ...ignFiles/FinchScope_DualColor/placeholder
diff --git a/FinchScope WideField/placeholder → ...ignFiles/FinchScope_WideField/placeholder b/FinchScope WideField/placeholder → ...ignFiles/FinchScope_WideField/placeholder
diff --git a/FinchScopeMk5.3_paperExample.pdf → FinchScope/FinchScopeMk5.3_paperExample.pdf b/FinchScopeMk5.3_paperExample.pdf → FinchScope/FinchScopeMk5.3_paperExample.pdf
diff --git a/ACS3.png → FinchScope/img/ACS3.png b/ACS3.png → FinchScope/img/ACS3.png
diff --git a/ACS3_1.png → FinchScope/img/ACS3_1.png b/ACS3_1.png → FinchScope/img/ACS3_1.png
diff --git a/ACS3_2.png → FinchScope/img/ACS3_2.png b/ACS3_2.png → FinchScope/img/ACS3_2.png
diff --git a/ACS3_3a.png → FinchScope/img/ACS3_3a.png b/ACS3_3a.png → FinchScope/img/ACS3_3a.png
diff --git a/TRACES.png → FinchScope/img/TRACES.png b/TRACES.png → FinchScope/img/TRACES.png
diff --git a/im1.png → FinchScope/img/im1 copy.png b/im1.png → FinchScope/img/im1 copy.png
diff --git a/README.md b/README.md
@@ -2,22 +2,22 @@
 
 
 
-<font size="10"> <img src="im1.png" width="50"/>FinchScope Project</font>
+<font size="10"> <img src="FinchScope/img/im1.png" width="50"/>FinchScope Project</font>
 =======
 
 
 ============
 
 ## Overview
-The FinchScope project aims to provide a modular in-vivo ABA (awake, behaving animal) optophysiology rig, with a transparent acquisition and analysis pipeline. The goal is to produce a customizable and scaleable single-photon fluorescent imaging microscope system that takes advantage of developing open-source analysis platforms. You can read more about the project [here.](http://iopscience.iop.org/1741-2552/14/4/045001/)
+The FinchScope project aims to provide a modular in-vivo  optophysiology rig, with a transparent acquisition and analysis pipeline. The goal is to produce a customizable and scaleable single-photon fluorescent imaging microscope system that takes advantage of developing open-source analysis platforms. You can read more about the project [here.](http://iopscience.iop.org/1741-2552/14/4/045001/)
 
-The project was initially developed by [Will Liberti](https://github.com/WALIII) in the Gardner Lab, for multi-month imaging of neural activity in songbirds. It has since been adapted for rodents. This effort would not have been possible without the critical advice and support at the outset of the project by Daniel Aharoni and Peyman Golshani, of the [UCLA Miniscope project](http://miniscope.org/index.php?title=Main_Page)
+The project was developed by [Will Liberti](https://github.com/WALIII) in the [Gardner Lab](http://people.bu.edu/timothyg/Home.html), for multi-month imaging of neural activity in songbirds [[1]](https://doi.org/10.1371/journal.pbio.1002158) [[2]](https://www.nature.com/articles/nn.4405) [[3]](https://ccneuro.org/2018/proceedings/1133.pdf) and  rodents. This effort would not have been possible without the critical advice and support at the outset of the project by Daniel Aharoni and Peyman Golshani, of the [UCLA Miniscope project](http://miniscope.org/index.php?title=Main_Page)
 
 
 
-![ScreenShot](ACS3.png)
+![ScreenShot](FinchScope/img/ACS3.png)
 
-![ScreenShot](TRACES.png)
+![ScreenShot](FinchScope/img/TRACES.png)
 
 <video src="video.mp4" width="320" height="200" controls preload></video>
 
@@ -30,9 +30,17 @@ The project was initially developed by [Will Liberti](https://github.com/WALIII)
 The FinchScope is a lightweight wireless-capable microscope for biological imaging- Designed specifically for monitoring the neural activity (via genetically encoded calcium indicators) of zebra finches while they sing their courtship songs. You can find the Construction and Assembly Guide for [the Microscope](https://github.com/WALIII/FreedomScope/wiki/Assembly-Guide), As well as a for the [Data Acquisition Box (DAQ)](https://github.com/WALIII/FreedomScope/wiki/DAQ-Guide).  Also, we have a [Guide Through a Basic Analysis Pipeline](https://github.com/WALIII/FreedomScope/wiki/Analysis-Guide)
 
 
-### ActiveComm
-The ActiveCom is a low noise active(driven by a motor and sensor) commutator designed for ABA electrophysiology and optophysiology.
+### Active Commutator
+The [Active Commutator](https://github.com/WALIII/FreedomScope/wiki/Commutators) is a low cost, low noise, active(driven by a motor and sensor) electrical rotary joint designed for electrophysiology (single and multichannel micro-electrode arrays) and optophysiology ( optogenetics, miniature microscopes, and fiber photometry).
 
 
-## Contact:
-email dpleman [at] bu.edu; bliberti [at] bu.edu
+### Referencing
+If you use any part of this project in your work, please cite out Journal of Neural Engineering Paper:
+[Liberti III, William A., et al. "An open source, wireless capable miniature microscope system." Journal of neural engineering 14.4 (2017): 045001.](http://iopscience.iop.org/1741-2552/14/4/045001/)
+
+## Contributors:
+* [Will Liberti]([email protected])
+* [Nathan Perkins]([email protected])
+* [Daniel Leman]([email protected])
+* [Ian Davison]([email protected])        
+