From e1b79f4ef9c1cbd20cdd92fe6b390f0cffa5ef43 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Wed, 9 Jan 2019 11:10:22 +0100
Subject: [PATCH] Fix order of imports
---
src/imcflibs/imagej/projections.py | 4 ++--
src/imcflibs/imagej/shading.py | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/imcflibs/imagej/projections.py b/src/imcflibs/imagej/projections.py
index e129085..bb615fd 100644
--- a/src/imcflibs/imagej/projections.py
+++ b/src/imcflibs/imagej/projections.py
@@ -1,10 +1,10 @@
"""Functions for creating Z projections."""
+from ij.plugin import ZProjector
+
from .bioformats import export_using_orig_name
from ..log import LOG as log
-from ij.plugin import ZProjector
-
def average(imp):
"""Create an average intensity projection.
diff --git a/src/imcflibs/imagej/shading.py b/src/imcflibs/imagej/shading.py
index eeaeff1..7bb69ab 100644
--- a/src/imcflibs/imagej/shading.py
+++ b/src/imcflibs/imagej/shading.py
@@ -2,14 +2,14 @@
import os
+from ij import IJ
+from ij.plugin import ImageCalculator, RGBStackMerge
+
from ..imagej import bioformats
from ..imagej import projections
from ..pathtools import listdir_matching
from ..log import LOG as log
-from ij import IJ
-from ij.plugin import ImageCalculator, RGBStackMerge
-
def apply_model(imps, model, merge=True):
"""Apply a given shading model to a list of images / stacks.
@@ -19,7 +19,7 @@ def apply_model(imps, model, merge=True):
WARNING: the operation happens in-place, i.e. the original "imps" images
will be modified!
-
+
Parameters
----------
imps : list(ij.ImagePlus)
@@ -32,7 +32,7 @@ def apply_model(imps, model, merge=True):
merge : bool, optional
Whether or not to combine the resulting ImagePlus objects into a single
multi-channel stack (default=True).
-
+
Returns
-------
ij.ImagePlus or list(ij.ImagePlus)
@@ -54,7 +54,7 @@ def apply_model(imps, model, merge=True):
def correct_and_project(filename, path, model, proj, fmt):
"""Apply a shading correction to an image and create a projection.
-
+
Parameters
----------
filename : str
--
GitLab