Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ttk
spam
Commits
201a8ecf
Commit
201a8ecf
authored
Oct 13, 2020
by
Olga Stamati
Browse files
[skip-ci] force all input images to have the same size in spam-ldic and spam-ddic
parent
c9815a60
Pipeline
#50764
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
scripts/spam-ddic
View file @
201a8ecf
...
...
@@ -109,11 +109,9 @@ if mpiRank == boss or not mpi:
if
len
(
lab1
.
shape
)
==
2
:
lab1
=
lab1
[
numpy
.
newaxis
,
...]
if
len
(
im2
.
shape
)
==
2
:
im2
=
im2
[
numpy
.
newaxis
,
...]
if
(
im1
.
shape
!=
lab1
.
shape
):
print
(
"#############################################################"
)
print
(
"# im1 and lab1 have different shapes!!! #"
)
print
(
"#############################################################"
)
assert
(
im1
.
shape
==
im2
.
shape
),
"
\n
im1 and im2 must have the same size! Exiting."
assert
(
im1
.
shape
==
lab1
.
shape
),
"
\n
im1 and lab1 must have the same size! Exiting."
###############################################################
# Analyse labelled volume in state 01 in order to get bounding
# boxes and centres of mass for correlation
...
...
scripts/spam-ldic
View file @
201a8ecf
...
...
@@ -139,6 +139,10 @@ if mpiRank == boss or not mpi:
if
len
(
im2
.
shape
)
==
2
:
im2
=
im2
[
numpy
.
newaxis
,
...]
assert
(
im1
.
shape
==
im2
.
shape
),
"
\n
im1 and im2 must have the same size! Exiting."
if
args
.
MASK1
:
assert
(
im1
.
shape
==
im1mask
.
shape
),
"
\n
im1 and im1mask must have the same size! Exiting."
nodePositions
,
nodesDim
=
spam
.
DIC
.
grid
.
makeGrid
(
im1
.
shape
,
args
.
NS
)
# Initialise field of Fs with the identity matrix
...
...
Write
Preview
Supports
Markdown
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