Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ttk
spam
Commits
5764bd18
Commit
5764bd18
authored
Sep 17, 2020
by
Edward Andò
Browse files
option to not mask other labels in spam-ddic
parent
38777ebf
Pipeline
#49329
passed with stages
in 13 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
scripts/spam-ddic
View file @
5764bd18
...
...
@@ -165,7 +165,7 @@ if mpiRank == boss or not mpi:
im2Reg
=
spam
.
DIC
.
binning
(
im2
,
args
.
REG_BIN
)
regReturns
=
spam
.
DIC
.
correlate
.
register
(
im1Reg
,
im2Reg
,
margin
=
int
(
args
.
REG_MARGIN
*
min
(
im1Reg
.
shape
)),
margin
=
int
(
args
.
REG_MARGIN
*
min
(
im1Reg
.
shape
)),
interpolationOrder
=
1
,
maxIterations
=
500
,
deltaPhiMin
=
0.0001
,
...
...
@@ -350,7 +350,7 @@ if mpiRank == boss or not mpi:
margin
=
labelDilateCurrent
+
args
.
LABEL_CORRELATE_MARGIN
,
maskOtherLabels
=
args
.
MASK
,
labelDilate
=
labelDilateCurrent
,
labelDilateMaskOtherLabels
=
True
)
labelDilateMaskOtherLabels
=
args
.
LABEL_CORRELATE_MASK_OTHERS
)
# In case the label is missing or the Phi is duff
if
getLabel
is
None
or
not
numpy
.
all
(
numpy
.
isfinite
(
PhiField
[
label
])):
...
...
tools/helpers/optionsParser.py
View file @
5764bd18
...
...
@@ -598,7 +598,13 @@ def ddicParser(parser):
'--label-correlate-update-gradient'
,
action
=
"store_true"
,
dest
=
'LABEL_CORRELATE_UPDATE_GRADIENT'
,
help
=
'Update gradient in label registration? More computation time but more robust and possibly fewer iterations. Default = False'
)
help
=
'Update gradient in label registration? More computation time but more robust and possibly fewer iterations.'
)
parser
.
add_argument
(
'-lcmo'
,
'--label-correlate-mask-others'
,
action
=
"store_false"
,
dest
=
'LABEL_CORRELATE_MASK_OTHERS'
,
help
=
'Prevent masking other labels when dilating?'
)
parser
.
add_argument
(
'-od'
,
'--out-dir'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment