Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
platy-browser-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christian Tischer
platy-browser-data
Commits
9c0ba396
Commit
9c0ba396
authored
5 years ago
by
Constantin Pape
Browse files
Options
Downloads
Patches
Plain Diff
Fix issues with morphology workflow
parent
33f04394
No related branches found
Branches containing commit
No related tags found
1 merge request
!11
New storage layout
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
environment.yaml
+1
-0
1 addition, 0 deletions
environment.yaml
mmpb/extension/attributes/morphology.py
+4
-4
4 additions, 4 deletions
mmpb/extension/attributes/morphology.py
mmpb/extension/attributes/workflow.py
+5
-5
5 additions, 5 deletions
mmpb/extension/attributes/workflow.py
with
10 additions
and
9 deletions
environment.yaml
+
1
−
0
View file @
9c0ba396
...
...
@@ -16,3 +16,4 @@ dependencies:
-
scikit-learn
-
vigra
-
z5py
-
mahotas
This diff is collapsed.
Click to expand it.
mmpb/extension/attributes/morphology.py
+
4
−
4
View file @
9c0ba396
...
...
@@ -36,11 +36,11 @@ class MorphologyBase(luigi.Task):
# if the raw path is None, we don't compute intensity features
raw_path
=
luigi
.
Parameter
(
default
=
None
)
# we always need the nucleus segmentation
nucleus_segmentation_path
=
luigi
.
Paramter
()
nucleus_segmentation_path
=
luigi
.
Param
e
ter
()
# we only need the cell segmentation if we compute cell morphology features
cell_segmentation_path
=
luigi
.
Parameter
(
default
=
None
)
# we only need the chromatin segmentation if we compute nucleus features
chromatin_segmentation_path
=
luigi
.
Paramter
(
default
=
None
)
chromatin_segmentation_path
=
luigi
.
Param
e
ter
(
default
=
None
)
# the scale used for computation, relative to the raw scale
scale
=
luigi
.
IntParameter
(
default
=
3
)
...
...
@@ -49,8 +49,8 @@ class MorphologyBase(luigi.Task):
# nucleus mapping table and the region mapping table
in_table_path
=
luigi
.
Parameter
()
# only need the mapping paths for the nucleus features
nucleus_mapping_path
=
luigi
.
Paramter
(
default
=
None
)
region_mapping_path
=
luigi
.
Paramter
(
default
=
None
)
nucleus_mapping_path
=
luigi
.
Param
e
ter
(
default
=
None
)
region_mapping_path
=
luigi
.
Param
e
ter
(
default
=
None
)
# prefix for the output tables
output_prefix
=
luigi
.
Parameter
()
...
...
This diff is collapsed.
Click to expand it.
mmpb/extension/attributes/workflow.py
+
5
−
5
View file @
9c0ba396
...
...
@@ -43,11 +43,11 @@ class MorphologyWorkflow(WorkflowBase):
# if the raw path is None, we don't compute intensity features
raw_path
=
luigi
.
Parameter
(
default
=
None
)
# we always need the nucleus segmentation
nucleus_segmentation_path
=
luigi
.
Paramter
()
nucleus_segmentation_path
=
luigi
.
Param
e
ter
()
# we only need the cell segmentation if we compute cell morphology features
cell_segmentation_path
=
luigi
.
Parameter
(
default
=
None
)
# we only need the chromatin segmentation if we compute nucleus features
chromatin_segmentation_path
=
luigi
.
Paramter
(
default
=
None
)
chromatin_segmentation_path
=
luigi
.
Param
e
ter
(
default
=
None
)
# the scale used for computation, relative to the raw scale
scale
=
luigi
.
IntParameter
(
default
=
3
)
...
...
@@ -56,15 +56,15 @@ class MorphologyWorkflow(WorkflowBase):
# nucleus mapping table and the region mapping table
in_table_path
=
luigi
.
Parameter
()
# only need the mapping paths for the nucleus features
nucleus_mapping_path
=
luigi
.
Paramter
(
default
=
None
)
region_mapping_path
=
luigi
.
Paramter
(
default
=
None
)
nucleus_mapping_path
=
luigi
.
Param
e
ter
(
default
=
None
)
region_mapping_path
=
luigi
.
Param
e
ter
(
default
=
None
)
# minimum and maximum sizes for objects / bounding box
min_size
=
luigi
.
IntParameter
()
max_size
=
luigi
.
IntParameter
(
default
=
None
)
max_bb
=
luigi
.
IntParameter
()
output_path
=
luigi
.
Paramter
()
output_path
=
luigi
.
Param
e
ter
()
def
requires
(
self
):
out_prefix
=
os
.
path
.
join
(
self
.
tmp_folder
,
'
sub_table_%s
'
%
self
.
prefix
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment