Commit fb548f63 authored by Chris Smith's avatar Chris Smith
Browse files

Merge remote-tracking branch 'origin/master'

parents 5b945e96 ebc9786b
...@@ -34,13 +34,20 @@ New features ...@@ -34,13 +34,20 @@ New features
------------ ------------
Core development Core development
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
* Generic interactive visualizer for 3 and 4D float numpy arrays.
* No need to handle h5py datasets, compound datasets, complex datasets etc.
* Add features time permitting.
* Clean up Cluser results plotting
* Consider implementing doSVD as a Process. Maybe the Decomposition and Cluster classes could extend Process? * Consider implementing doSVD as a Process. Maybe the Decomposition and Cluster classes could extend Process?
* Simplify and demystify analyis / optimize. Use parallel_compute instead of optimize and gues_methods and fit_methods * Simplify and demystify analyis / optimize. Use parallel_compute instead of optimize and gues_methods and fit_methods
* multi-node computing capability in parallel_compute * multi-node computing capability in parallel_compute
* Data Generators * Data Generators
* Consistency in the naming of and placement of attributes (chan or meas group) in all translators
GUI GUI
~~~~~~~~~~~ ~~~~~~~~~~~
* Need to be able to run a visualizer even on sliced data. What would this object be? (sliced Main data + vectors for each axis + axis labels ....). Perhaps the slice() function should return this object instead of a numpy array? As it stands, the additional information (for the visualizer) is not returned by the slice function. * Need to be able to run a visualizer even on sliced data. What would this object be? (sliced Main data + vectors for each axis + axis labels ....). Perhaps the slice() function should return this object instead of a numpy array? As it stands, the additional information (for the visualizer) is not returned by the slice function.
* Generic visualizer in plot.lly / dash? that can use the PycroDataset class * Generic visualizer in plot.lly / dash? that can use the PycroDataset class
* One suggestion is 2 (or more panes). * One suggestion is 2 (or more panes).
......
...@@ -9,17 +9,25 @@ pycroscopy\.processing\.fft ...@@ -9,17 +9,25 @@ pycroscopy\.processing\.fft
.. autosummary:: .. autosummary::
are_compatible_filters
build_composite_freq_filter
downSample downSample
getNoiseFloor getNoiseFloor
get_fft_stack get_fft_stack
harmonicsPassFilter
makeLPF
noiseBandFilter
.. rubric:: Classes
.. autosummary::
FrequencyFilter
HarmonicPassFilter
LowPassFilter
NoiseBandFilter
......
...@@ -9,8 +9,7 @@ pycroscopy\.processing\.giv\_utils ...@@ -9,8 +9,7 @@ pycroscopy\.processing\.giv\_utils
.. autosummary:: .. autosummary::
bayesian_inference_dataset bayesian_inference_on_period
bayesian_inference_unit
do_bayesian_inference do_bayesian_inference
plot_bayesian_results plot_bayesian_results
plot_bayesian_spot_from_h5 plot_bayesian_spot_from_h5
......
...@@ -10,12 +10,8 @@ pycroscopy\.processing\.gmode\_utils ...@@ -10,12 +10,8 @@ pycroscopy\.processing\.gmode\_utils
.. autosummary:: .. autosummary::
decompress_response decompress_response
fft_filter_dataset
filter_chunk_parallel
filter_chunk_serial
reshape_from_lines_to_pixels reshape_from_lines_to_pixels
test_filter test_filter
unit_filter
......
...@@ -16,6 +16,7 @@ pycroscopy\.viz\.plot\_utils ...@@ -16,6 +16,7 @@ pycroscopy\.viz\.plot\_utils
export_fig_data export_fig_data
get_cmap_object get_cmap_object
make_linear_alpha_cmap make_linear_alpha_cmap
make_scalar_mappable
plotScree plotScree
plot_1d_spectrum plot_1d_spectrum
plot_2d_spectrogram plot_2d_spectrogram
......
...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.MicroDataGroup`` ...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.MicroDataGroup``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_02_writing_to_h5.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.MicroDataGroup`` ...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.MicroDataGroup``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_02_writing_to_h5.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.MicroDataGroup`` ...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.MicroDataGroup``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.MicroDataGroup`` ...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.MicroDataGroup``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
......
...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.MicroDataset`` ...@@ -27,9 +27,9 @@ Examples using ``pycroscopy.MicroDataset``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_02_writing_to_h5_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_02_writing_to_h5.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.MicroDataset`` ...@@ -37,7 +37,7 @@ Examples using ``pycroscopy.MicroDataset``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_02_writing_to_h5.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_02_writing_to_h5.py`
.. raw:: html .. raw:: html
...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.MicroDataset`` ...@@ -45,9 +45,9 @@ Examples using ``pycroscopy.MicroDataset``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.MicroDataset`` ...@@ -55,7 +55,7 @@ Examples using ``pycroscopy.MicroDataset``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
......
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.NumpyTranslator`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.NumpyTranslator``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_01_translator_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_01_translator_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_01_translator.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_01_translator.py`
.. raw:: html .. raw:: html
...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.NumpyTranslator`` ...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.NumpyTranslator``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_01_translator.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_01_translator.py`
.. raw:: html .. raw:: html
......
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.Process`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.Process``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_05_data_processing_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.Process`` ...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.Process``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_05_data_processing.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_05_data_processing.py`
.. raw:: html .. raw:: html
......
...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.PycroDataset`` ...@@ -9,9 +9,9 @@ Examples using ``pycroscopy.PycroDataset``
.. only:: html .. only:: html
.. figure:: /auto_examples/tutorials/images/thumb/sphx_glr_plot_tutorial_03_multidimensional_data_thumb.png .. figure:: /auto_examples/dev_tutorials/images/thumb/sphx_glr_plot_tutorial_03_multidimensional_data_thumb.png
:ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_03_multidimensional_data.py` :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html .. raw:: html
...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.PycroDataset`` ...@@ -19,7 +19,7 @@ Examples using ``pycroscopy.PycroDataset``
.. only:: not html .. only:: not html
* :ref:`sphx_glr_auto_examples_tutorials_plot_tutorial_03_multidimensional_data.py` * :ref:`sphx_glr_auto_examples_dev_tutorials_plot_tutorial_03_multidimensional_data.py`
.. raw:: html .. raw:: html
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment