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
cb868cca
Commit
cb868cca
authored
Apr 09, 2021
by
Edward Andò
Browse files
finally dropping moveGrains
parent
4b68a5a3
Pipeline
#64384
passed with stages
in 13 minutes and 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
scripts/spam-pixelSearch
View file @
cb868cca
...
...
@@ -112,11 +112,14 @@ for node in range(nodePositions.shape[0]):
if
args
.
PHIFILE
is
not
None
:
PhiFromFile
=
spam
.
helpers
.
readCorrelationTSV
(
args
.
PHIFILE
.
name
,
fieldBinRatio
=
args
.
PHIFILE_BIN_RATIO
)
if
PhiFromFile
is
None
:
print
(
f
"
\t
Failed to read your TSV file passed with -pf
{
args
.
PHIFILE
.
name
}
"
)
exit
()
# If the read Phi-file has only one line -- it's a single point registration!
if
PhiFromFile
[
'fieldCoords'
].
shape
[
0
]
==
1
:
PhiInit
=
PhiFromFile
[
'PhiField'
][
0
]
print
(
"
\t
I read a registration from a file in binning {
}"
.
format
(
args
.
PHIFILE_BIN_RATIO
)
)
PhiInit
=
PhiFromFile
[
'PhiField'
][
0
]
print
(
f
"
\t
I read a registration from a file in binning
{
args
.
PHIFILE_BIN_RATIO
}
"
)
decomposedPhiInit
=
spam
.
deformation
.
decomposePhi
(
PhiInit
)
print
(
"
\t
Translations (px)"
)
...
...
@@ -125,6 +128,7 @@ if args.PHIFILE is not None:
print
(
"
\t\t
"
,
decomposedPhiInit
[
'r'
])
print
(
"
\t
Zoom"
)
print
(
"
\t\t
"
,
decomposedPhiInit
[
'z'
])
del
decomposedPhiInit
# We have a registration to apply to all points.
# This is done in 2 steps:
...
...
setup.py
View file @
cb868cca
...
...
@@ -99,7 +99,7 @@ name = 'spam'
description
=
'Software for the Practical Analysis of Materials'
long_description
=
readReadMe
(
'README.rst'
)
long_description_content_type
=
'text/x-rst'
version
=
'0.
5.3.4
'
version
=
'0.
6.0.0
'
author
=
'SPAM authors'
author_email
=
'edward.ando@3sr-grenoble.fr'
copyright
=
'SPAM authors 2020'
...
...
@@ -110,7 +110,6 @@ classifiers = ["Development Status :: 4 - Beta",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
,
"Operating System :: POSIX :: Linux"
,
"Programming Language :: Python :: 3"
,
"Programming Language :: Python :: 3.5"
,
"Programming Language :: Python :: 3.6"
,
"Programming Language :: Python :: 3.7"
,
"Programming Language :: Python :: 3.8"
,
...
...
@@ -155,7 +154,6 @@ scripts = ['scripts/spam-mmr',
"scripts/spam-ereg-discrete"
,
"scripts/spam-deformImageFromField"
,
"scripts/spam-mmr-graphical"
,
"scripts/spam-moveGrains"
,
"scripts/spam-moveLabels"
,
"scripts/spam-discreteStrain"
,
"scripts/spam-regularStrain"
,
...
...
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