Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
cda83f76
Commit
cda83f76
authored
Nov 02, 2017
by
Simon Spannagel
Browse files
Alignment: simplify printing of parameters
parent
b9813d2d
Pipeline
#228532
passed with stage
in 2 minutes and 59 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Alignment.cpp
View file @
cda83f76
...
...
@@ -306,31 +306,19 @@ void Alignment::finalise() {
det
++
;
}
}
det
=
0
;
LOG_PROGRESS
(
STATUS
,
"alignment_track"
)
<<
"Alignment finished, "
<<
nIterations
<<
" iteration."
;
// Now list the new alignment parameters
for
(
auto
&
detector
:
get_detectors
())
{
string
detectorID
=
detector
->
name
();
// Do not align the reference plane
if
(
detectorID
==
m_config
.
get
<
std
::
string
>
(
"reference"
)
||
detectorID
==
m_config
.
get
<
std
::
string
>
(
"DUT"
))
{
if
(
detector
->
name
()
==
m_config
.
get
<
std
::
string
>
(
"reference"
)
||
detector
->
name
()
==
m_config
.
get
<
std
::
string
>
(
"DUT"
))
{
continue
;
}
// Get the alignment parameters
double
displacementX
=
residualFitter
->
GetParameter
(
det
*
6
+
0
);
double
displacementY
=
residualFitter
->
GetParameter
(
det
*
6
+
1
);
double
displacementZ
=
residualFitter
->
GetParameter
(
det
*
6
+
2
);
double
rotationX
=
residualFitter
->
GetParameter
(
det
*
6
+
3
);
double
rotationY
=
residualFitter
->
GetParameter
(
det
*
6
+
4
);
double
rotationZ
=
residualFitter
->
GetParameter
(
det
*
6
+
5
);
LOG
(
INFO
)
<<
detectorID
<<
" new alignment: T("
<<
displacementX
<<
","
<<
displacementY
<<
","
<<
displacementZ
<<
") R("
<<
rotationX
<<
","
<<
rotationY
<<
","
<<
rotationZ
<<
")"
;
det
++
;
LOG
(
INFO
)
<<
detector
->
name
()
<<
" new alignment: T("
<<
detector
->
displacementX
()
<<
","
<<
detector
->
displacementY
()
<<
","
<<
detector
->
displacementZ
()
<<
") R("
<<
detector
->
rotationX
()
<<
","
<<
detector
->
rotationY
()
<<
","
<<
detector
->
rotationZ
()
<<
")"
;
}
// Write the output alignment file
// FIXME parameters->writeConditions();
}
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment