Skip to content

Commit

Permalink
Merge pull request soft-matter#210 from caspervdw/doc-change
Browse files Browse the repository at this point in the history
DOC: Add caspervdw funding, 3D pic
  • Loading branch information
nkeim committed Feb 26, 2015
2 parents 926e8e0 + 31f852d commit 751f1e5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
Binary file added doc/featured-thumbnails/tracking-sphere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Trackpy: Fast, Flexible Particle-Tracking Toolkit
<img src="_static/foam.png">
</div>
<div class="col-md-2 thumbnail">
<img src="_static/fluorescent-particles-in-cfs.png">
<img src="_static/tracking-sphere.png">
</div>
<div class="col-md-2 thumbnail">
<img src="_static/trajectories-in-water.png">
Expand Down
6 changes: 6 additions & 0 deletions doc/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Core Contributors
* **Nathan Keim** alternative trajectory-linking implementations, major
speed-ups, prediction, adaptive search
* **Thomas Caswell** multiple implementations of sophisticated trajectory-linking, tests
* **Casper van der Wel** anisotropic (3D) feature-finding, 3D plotting and analyses


Support
Expand All @@ -122,3 +123,8 @@ reached at [email protected].
This package was developed in part by Nathan C. Keim, as part of his postdoctoral
research in Paulo Arratia's group at the University of Pennsylvania,
Philadelphia. This work was supported by NSF-MRSEC DMR-1120901.

This package was developed in part by Casper van der Wel, as part of his
PhD thesis work in Daniela Kraft’s group at the Huygens-Kamerlingh-Onnes laboratory,
Institute of Physics, Leiden University, The Netherlands. This work was
supported by the Netherlands Organisation for Scientific Research (NWO/OCW).

0 comments on commit 751f1e5

Please sign in to comment.