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.

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

X-Ray Speckle Visibility Spectroscopy #293

Merged
merged 36 commits into from
Sep 10, 2015
Merged

X-Ray Speckle Visibility Spectroscopy #293

merged 36 commits into from
Sep 10, 2015

Commits on Aug 18, 2015

  1. # This is a combination of 8 commits.

    # The first commit's message is:
    WIP: added the functions for static tests for image data, before doing xsvs
    
    # This is the 2nd commit message:
    
    DOC: fixed the documentation for the funstions
    
    # This is the 3rd commit message:
    
    ENH: added a time bining function for integration
    
    # This is the 4th commit message:
    
    C: added documentation for static tests
    
    # This is the 5th commit message:
    
    BUG: fixed a bug in the static tests function
    
    # This is the 6th commit message:
    
    BUG: removed a bug in the time_bin function
    
    # This is the 7th commit message:
    
    ENH: added a new function to find the maximum speckle count in any image
    
    # This is the 8th commit message:
    
    TST: added tests to test_time_bining, test_max_counts, test_intesnity_distribution
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    fb94bb8 View commit details
    Browse the repository at this point in the history
  2. API: added new function to find the suitable center for the speckle p…

    …attern
    
    Conflicts:
    	skxray/speckle_visibility.py
    
    API: added a seperate dir for xsvs, and move the static tests module to that
    
    API: added new function to find the suitable center for the speckle pattern
    
    Conflicts:
    	skxray/speckle_visibility.py
    
    API: added a seperate dir for xsvs, and move the static tests module to that
    
    TST: start working on tests for the speckle_visibility module sttaic tests
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    6baa470 View commit details
    Browse the repository at this point in the history
  3. API: added new module containing fitting functions for XSVS

    (Negative binomial distribution, poission distribution, gamma distribution, etc ..)
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    558270d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a735748 View commit details
    Browse the repository at this point in the history
  5. ENH: changes to the xsvs function

    DOC: fixed the documentation
    
    DOC: fixed the documentation
    
    ENH
    
    DOC: fixed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    DOC: finxed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    BUG: changed the dict.items() back to dict.iteritems() -Problem with python 3
    
    DOC: finxed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    BUG: changed the dict.items() back to dict.iteritems() -Problem with python 3
    
    DOC: changed the documentation for speckle_visibility.py
    
    DOC: finxed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    BUG: changed the dict.items() back to dict.iteritems() -Problem with python 3
    
    DOC: changed the documentation for speckle_visibility.py
    
    DOC: fixed the documentation of suitable center
    
    DOC: finxed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    BUG: changed the dict.items() back to dict.iteritems() -Problem with python 3
    
    DOC: changed the documentation for speckle_visibility.py
    
    DOC: fixed the documentation of suitable center
    
    API: added new function for saxs_circular_average
    
    DOC: finxed the documentation
    
    ENH
    
    BUG: fixed the bug in dict.iteritems(0 for python 3
    
    BUG: fixed the bug for python 3 -remove the iteritems
    
    BUG: changed the dict.items() back to dict.iteritems() -Problem with python 3
    
    DOC: changed the documentation for speckle_visibility.py
    
    DOC: fixed the documentation of suitable center
    
    API: added new function for saxs_circular_average
    
    TST: added test function for circular_average function to find saxs integration
    
    TST: fixed the nx=6 in the tests for circular_average
    
    DOC: added more documentation
    
    DOC: added more documentation
    
    ENH: added the pixel_size to the circular_average function
    
    ENH: changes to the bi edges
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    147caf8 View commit details
    Browse the repository at this point in the history
  6. DOC: fixed the documentationof the xsvs.py _process

    DOC: fixed the documentationof the xsvs.py _process
    
    BUG: fixed the bug with python 3 ( dict.iteritem() not working)
    API moved the circular_average function to core.py
    and the test to test_core.py
    
    BUG: finxed the bug with python 3 in dict.values()
    
    BUG: python 3
    
    DOC: fixed the documentationof the xsvs.py _process
    
    BUG: fixed the bug with python 3 ( dict.iteritem() not working)
    API moved the circular_average function to core.py
    and the test to test_core.py
    
    BUG: finxed the bug with python 3 in dict.values()
    
    BUG: python 3
    
    TST: added tests to check the static_tests one label
    
    DOC: fixed the documentationof the xsvs.py _process
    
    BUG: fixed the bug with python 3 ( dict.iteritem() not working)
    API moved the circular_average function to core.py
    and the test to test_core.py
    
    BUG: finxed the bug with python 3 in dict.values()
    
    BUG: python 3
    
    TST: added tests to check the static_tests one label
    
    ENH: moved the circular_average function to speckle_visibility.py
    
    ENH:  changes to documentation
    
    TST: fixed the static_tests() and remove the unwanted parts in the core.py
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    d26e986 View commit details
    Browse the repository at this point in the history
  7. ENH: changes to documentation

    TST: fixed the static_tests() and remove the unwanted parts in the core.py
    
    BUG: added list() to dict.values) for python 3
    
    STY: fixed with pepe8
    
    STY: fixed with pepe8
    
    BUG: fixed the bug with python 3 in dict.values()
    
    BUG: python 3
    
    STY: fixed with pepe8
    
    BUG: fixed the bug with python 3 in dict.values()
    
    BUG: python 3
    
    TST: added tests to check the static_tests one label
    
    ENH:fixed the core.py
    
    ENH:fixed the core.py
    
    ENH: moved the circular_average function to speckle_visibility.py
    
    ENH:  changes to documentation
    
    Conflicts:
    	skxray/speckle_visibility/speckle_visibility.py
    	skxray/tests/test_speckle_visibility.py
    
    ENH:  changes to documentation
    
    Conflicts:
    	skxray/speckle_visibility/speckle_visibility.py
    	skxray/tests/test_speckle_visibility.py
    
    TST: fixed the static_tests() and remove the unwanted parts in the core.py
    
    ENH:  changes to documentation
    
    Conflicts:
    	skxray/speckle_visibility/speckle_visibility.py
    	skxray/tests/test_speckle_visibility.py
    
    TST: fixed the static_tests() and remove the unwanted parts in the core.py
    
    BUG: added list() to dict.values) for python 3
    
    STY: fixed with pepe8
    
    Conflicts:
    	skxray/tests/test_speckle_visibility.py
    
    STY: fixed with pepe8
    
    Conflicts:
    	skxray/tests/test_speckle_visibility.py
    
    API: changed the static_test_functions and tests for them
    Doc: added more documentation
    
    Conflicts:
    	skxray/core/utils.py
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    61341f8 View commit details
    Browse the repository at this point in the history
  8. ENH: changes after comments, fixed the documentation, change the func…

    …tion names and fix teh bugs
    
    Conflicts:
    	skxray/speckle_visibility/speckle_visibility.py
    	skxray/tests/test_speckle_visibility.py
    
    Conflicts:
    	skxray/speckle_visibility/speckle_visibility.py
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    95470d6 View commit details
    Browse the repository at this point in the history
  9. STY: fixed with pep8 and changes in importing skimage

    ENH: added threshold mask to the bin_ceners in circular_average function
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    d59d965 View commit details
    Browse the repository at this point in the history
  10. DOC: fixed the documentation

    API: moved the speckle_visibility file, del the speckle_visibility dir, and rename the module to speckle_analysis.py
    
    BUG: removed the label_num = np.unique(labels)[1:]
    
    API: changed the skxray/tests/test_speckle_visibility.py to skxray/tests/test_speckle_analysis.py
    
    API: added new function for speckle count of pixels within required ROI labels
    
    ENH: added
    
    ENH
    
    API: removed the xsvs1 functions
    
    API:removed the circular_average function
    
    DOC: fixed the documentation
    
    DOC:fixed the documentation
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    62a7100 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    75fb1bf View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    882a3a7 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9212960 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    aae0f9b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1be549c View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    f81441b View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    a5468a8 View commit details
    Browse the repository at this point in the history
  18. TST: start adding tests to the xsvs function

    fixed the problem with the std_dev
    sameera2004 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    c33dd73 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    d7dffee View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    78791fa View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    bb3aeb3 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    4fb539e View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    3e3b995 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    8bc9d6d View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Configuration menu
    Copy the full SHA
    2be429d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. API: cheanged the module name to speckle.py from xsvs.py

    fixed some bugs in the codes according to the comments
    sameera2004 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    7584f08 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Configuration menu
    Copy the full SHA
    48cd057 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. Configuration menu
    Copy the full SHA
    1d28ed1 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. Merge remote-tracking branch 'upstream/master' into xsvs2

    * upstream/master: (46 commits)
      DOC: more doc on optional param
      DOC: add doc about api change
      TST: add test for nnls
      DEV: better way to define weights for nnls
      BUG: new version of lmfit
      MNT: Resetting conda build string back to development
      Tagging v0.0.4
      Bumping version number in conda-recipe
      DOC: Added summary page for skxray.core
      MNT: Need two '=' in meta.yaml
      Helps to install packages to the right environment, eh?
      --add -> --set
      config -> conda, duh
      Make all conda operations default to yes
      MNT: Install deps from scikit-xray channel
      DOC: rename NSLS-II to scikit-xray and whitespace
      Update introduction
      Update docs to reflect skxray library inversion
      CLN: Remove unused skip_if import
      BLD/CLN: Isolate dependencies.
      ...
    sameera2004 committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    c98f0a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. Configuration menu
    Copy the full SHA
    180db89 View commit details
    Browse the repository at this point in the history
  2. ENH: changed cur

    sameera2004 committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    4b783d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. Merge remote-tracking branch 'upstream/master' into xsvs2

    * upstream/master: (31 commits)
      DOC: added spaces and fixed the documentation
      BUG: changed the mean_intensity to an array instead of returning a list
      STY: fixed with pep8
      TST: fixed the bug in the tests
      ENH: changed the return of the mean_intensity function to an array(ealier it was returning a list)
      ENH: took out one [0] from the kymograph function and took out returning strings on the mean intensity function
      TST: took out the python 3 issue with dict_values()
      BLD: add updated .travis.yml file
      TST: took out pandas dependency in the test suite
      BLD: changed pip install to conda install pandas in .travis.yml
      APi: removed the mean_image_sets to combine mean_image_sets
      BLD: install pandas
      TST: fixed the issues with the mean intensity tests added new function to get combine mean intensities for image sets
      MNT: Remove pandas dep.
      ENH: Remove helper function
      TST: Rework and fix tests
      MNT: Mostly documentation
      DOC: Update the docstrings
      MNT: Remove lingering merge conflict
      TST: Remove test of private function
      ...
    sameera2004 committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    7f75022 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    be553a8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5811f1e View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. Configuration menu
    Copy the full SHA
    de067b9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64a31a9 View commit details
    Browse the repository at this point in the history