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
5cce003c
Commit
5cce003c
authored
Nov 02, 2017
by
Simon Spannagel
Browse files
Alignment: add correction info for alignmentMethod=1
parent
5b0f1a4f
Pipeline
#228665
passed with stage
in 1 minute and 27 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Alignment.cpp
View file @
5cce003c
...
...
@@ -218,14 +218,27 @@ void Alignment::finalise() {
// Fit this plane (minimising global track chi2)
residualFitter
->
ExecuteCommand
(
"MIGRAD"
,
arglist
,
2
);
// Retrieve fit results:
auto
displacementX
=
residualFitter
->
GetParameter
(
0
);
auto
displacementY
=
residualFitter
->
GetParameter
(
1
);
auto
displacementZ
=
residualFitter
->
GetParameter
(
2
);
auto
rotationX
=
residualFitter
->
GetParameter
(
3
);
auto
rotationY
=
residualFitter
->
GetParameter
(
4
);
auto
rotationZ
=
residualFitter
->
GetParameter
(
5
);
LOG
(
INFO
)
<<
detector
->
name
()
<<
"/"
<<
iteration
<<
" dT("
<<
(
detector
->
displacementX
()
-
displacementX
)
<<
","
<<
(
detector
->
displacementY
()
-
displacementY
)
<<
","
<<
(
detector
->
displacementZ
()
-
displacementZ
)
<<
") dR("
<<
(
detector
->
rotationX
()
-
rotationX
)
<<
","
<<
(
detector
->
rotationY
()
-
rotationY
)
<<
","
<<
(
detector
->
rotationZ
()
-
rotationZ
)
<<
")"
;
// Set the alignment parameters of this plane to be the optimised values
// from the alignment
detector
->
displacementX
(
residualFitter
->
GetParameter
(
0
)
);
detector
->
displacementY
(
residualFitter
->
GetParameter
(
1
)
);
detector
->
displacementZ
(
residualFitter
->
GetParameter
(
2
)
);
detector
->
rotationX
(
r
esidualFitter
->
GetParameter
(
3
)
);
detector
->
rotationY
(
r
esidualFitter
->
GetParameter
(
4
)
);
detector
->
rotationZ
(
r
esidualFitter
->
GetParameter
(
5
)
);
detector
->
displacementX
(
displacementX
);
detector
->
displacementY
(
displacementY
);
detector
->
displacementZ
(
displacementZ
);
detector
->
rotationX
(
r
otationX
);
detector
->
rotationY
(
r
otationY
);
detector
->
rotationZ
(
r
otationZ
);
}
LOG
(
INFO
)
<<
detectorToAlign
<<
" new alignment: T("
<<
detector
->
displacementX
()
<<
","
<<
detector
->
displacementY
()
...
...
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