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
fbad6269
Commit
fbad6269
authored
Nov 22, 2020
by
Edward Andò
Browse files
Connecting up PhiInit in spam-reg
parent
65710e44
Pipeline
#53504
passed with stages
in 26 minutes and 16 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
scripts/spam-reg
View file @
fbad6269
...
...
@@ -70,10 +70,14 @@ if args.PHIFILE is not None:
#print("\tI read a registration from a file in binning {} at centre {} at this scale".format(args.PHIFILE_BIN_RATIO, regCentre) )
print
(
"
\t
I read a registration from a file in binning {}"
.
format
(
args
.
PHIFILE_BIN_RATIO
))
decomposedPhiInit
=
spam
.
deformation
.
decomposePhi
(
PhiInit
)
print
(
"
\t
Translations (px)"
)
print
(
"
\t\t
"
,
spam
.
deformation
.
decompose
Phi
(
PhiInit
)
[
't'
])
print
(
"
\t\t
"
,
decompose
d
PhiInit
[
't'
])
print
(
"
\t
Rotations (deg)"
)
print
(
"
\t\t
"
,
spam
.
deformation
.
decomposePhi
(
PhiInit
)[
'r'
])
print
(
"
\t\t
"
,
decomposedPhiInit
[
'r'
])
print
(
"
\t
Zoom"
)
print
(
"
\t\t
"
,
decomposedPhiInit
[
'z'
])
# If the read F-file contains multiple lines it's an F field!
else
:
...
...
@@ -92,6 +96,7 @@ regReturns = spam.DIC.correlate.registerMultiscale(im1,
im2
,
args
.
BIN_BEGIN
,
binStop
=
args
.
BIN_END
,
margin
=
args
.
MARGIN
,
PhiInit
=
PhiInit
,
PhiRigid
=
args
.
RIGID
,
im1mask
=
im1mask
,
interpolationOrder
=
args
.
INTERPOLATION_ORDER
,
...
...
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