Merge pull request #58 from blowekamp/histogram_refactor

Histogram refactor
niaid · Apr 26, 2023 · 37c3c2a · 37c3c2a
2 parents c4f238a + d96a426
commit 37c3c2a
Show file tree

Hide file tree

Showing 9 changed files with 310 additions and 508 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -1,19 +1,23 @@
 API
 ===
 
+
+.. automodule:: pytools
+    :members:
+
 .. automodule:: pytools.meta
     :members:
 
 .. automodule:: pytools.utils.zarr
     :members:
 
-.. automodule:: pytools.convert
+.. automodule:: pytools.utils.histogram
     :members:
 
-.. automodule:: pytools.ng.mrc2nifti
+.. automodule:: pytools.convert
     :members:
 
-.. automodule:: pytools.ng.build_histogram
+.. automodule:: pytools.ng.mrc2nifti
     :members:
 
 .. automodule:: pytools.zarr_rechunk

diff --git a/docs/commandline.rst b/docs/commandline.rst
@@ -5,22 +5,17 @@ The Pytools packages contain a command line executables for various tasks. They
 
 .. code-block :: bash
 
-    mrc_visual_min_max --help
+   mrc2nifti --help
 
 Or the preferred way using the `python` executable to execute the module entry point:
 
 .. code-block :: bash
 
-    python -m mrc_visual_min_max --help
+    python -m mrc2nifti --help
 
 With either method of invoking the command line interface, the following sections describes the sub-commands available
 and the command line options available.
 
 .. click:: pytools.ng.mrc2nifti:main
    :prog: mrc2nifti
 
-.. click:: pytools.ng.mrc2ngpc:main
-   :prog: mrc2npgc
-
-.. click:: pytools.ng.build_histogram:main
-   :prog: mrc_visual_min_max
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,7 +42,6 @@ local_scheme = "dirty-tag"
 
 [project.scripts]
 mrc2nifti = "pytools.ng.mrc2nifti:main"
-mrc_visual_min_max = "pytools.ng.build_histogram:main"
 zarr_rechunk = "pytools.zarr_rechunk:main"
 zarr_build_multiscales = "pytools.zarr_build_multiscales:main"
 
diff --git a/pytools/__init__.py b/pytools/__init__.py
@@ -12,10 +12,19 @@
 #  limitations under the License.
 #
 
+from .workflow_functions import visual_min_max
+
+import logging
+
+logger = logging.getLogger(__name__)
+del logging
+
+_installed_package = "tomojs_pytools"
 
 try:
     from ._version import version as __version__
 except ImportError:
     pass
 
-__all__ = ["__version__"]
+
+__all__ = ["__version__", "visual_min_max", "logger"]