Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wei recon demo #68

Merged
merged 11 commits into from
Oct 14, 2015
Merged

Wei recon demo #68

merged 11 commits into from
Oct 14, 2015

Commits on Aug 6, 2015

  1. API: Moving image segmentation tools to VTTools from skxray.api where… 

    … they were originally

There is still some rearrangement that may occur, but in general, I believe that these function imports are now in their proper places.
    @giltis
    giltis committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    606df47 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. DEV: Adding img readers

    @giltis
    giltis committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    f751001 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'nikea/master' into skxray_refactor 

    Conflicts:
	vt_config/NSLS-II/init.py
    @giltis
    giltis committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    0a251e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. DEV: DataFinder module addition 

    Function searches tree to find requested data set. This improves functionality of our demos, since the requirement that users and viewers of the demos modify all data import paths is no longer mandated.
This function is required for the current implementation of the GridRec.vt demo
    @giltis
    giltis committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    15945f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. FIX: Removed the extraneous image processing files which were added a… 

    …ccidentally
    @giltis
    giltis committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    40b84fd View commit details
    Browse the repository at this point in the history

  2. CLEAN: removed commented test code from FindData compute function

    @giltis
    giltis committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    476af79 View commit details
    Browse the repository at this point in the history

  3. TRAVIS: Updated .travis.yml with pyyaml and current links to skxray

    @giltis
    giltis committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    0be5b4c View commit details
    Browse the repository at this point in the history

  4. BUG: Backslash error in .travis.yml

    @giltis
    giltis committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    e46f4c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. Removed module load to unrelated to_wrap library.

    Wei Xu committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    c88b889 View commit details
    Browse the repository at this point in the history

  2. Add a comment

    Wei Xu committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    680c8ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from celiafish/newbranch 

    Solved some conflicts
    Gabriel Iltis committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    34a4bb5 View commit details
    Browse the repository at this point in the history