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
7303f964
Commit
7303f964
authored
Nov 02, 2017
by
Simon Spannagel
Committed by
Daniel Hynds
Nov 03, 2017
Browse files
Alignment: clean up track alignment loop
parent
36978bf2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Alignment.cpp
View file @
7303f964
...
...
@@ -275,33 +275,36 @@ void Alignment::finalise() {
// Fit this plane (minimising global track chi2)
residualFitter
->
ExecuteCommand
(
"MIGRAD"
,
arglist
,
2
);
// Retrieve fit results:
auto
displacementX
=
residualFitter
->
GetParameter
(
det
*
6
+
0
);
auto
displacementY
=
residualFitter
->
GetParameter
(
det
*
6
+
1
);
auto
displacementZ
=
residualFitter
->
GetParameter
(
det
*
6
+
2
);
auto
rotationX
=
residualFitter
->
GetParameter
(
det
*
6
+
3
);
auto
rotationY
=
residualFitter
->
GetParameter
(
det
*
6
+
4
);
auto
rotationZ
=
residualFitter
->
GetParameter
(
det
*
6
+
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
)
<<
")"
;
// Now that this device is fitted, set parameter errors to 0 so that they
// are not fitted again
residualFitter
->
SetParameter
(
det
*
6
+
0
,
(
detectorID
+
"_displacementX"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
0
),
0
,
-
50
,
50
);
residualFitter
->
SetParameter
(
det
*
6
+
1
,
(
detectorID
+
"_displacementY"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
1
),
0
,
-
50
,
50
);
residualFitter
->
SetParameter
(
det
*
6
+
2
,
(
detectorID
+
"_displacementZ"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
2
),
0
,
-
10
,
500
);
residualFitter
->
SetParameter
(
det
*
6
+
3
,
(
detectorID
+
"_rotationX"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
3
),
0
,
-
6.30
,
6.30
);
residualFitter
->
SetParameter
(
det
*
6
+
4
,
(
detectorID
+
"_rotationY"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
4
),
0
,
-
6.30
,
6.30
);
residualFitter
->
SetParameter
(
det
*
6
+
5
,
(
detectorID
+
"_rotationZ"
).
c_str
(),
residualFitter
->
GetParameter
(
det
*
6
+
5
),
0
,
-
6.30
,
6.30
);
residualFitter
->
SetParameter
(
det
*
6
+
0
,
(
detectorID
+
"_displacementX"
).
c_str
(),
displacementX
,
0
,
-
50
,
50
);
residualFitter
->
SetParameter
(
det
*
6
+
1
,
(
detectorID
+
"_displacementY"
).
c_str
(),
displacementY
,
0
,
-
50
,
50
);
residualFitter
->
SetParameter
(
det
*
6
+
2
,
(
detectorID
+
"_displacementZ"
).
c_str
(),
displacementZ
,
0
,
-
10
,
500
);
residualFitter
->
SetParameter
(
det
*
6
+
3
,
(
detectorID
+
"_rotationX"
).
c_str
(),
rotationX
,
0
,
-
6.30
,
6.30
);
residualFitter
->
SetParameter
(
det
*
6
+
4
,
(
detectorID
+
"_rotationY"
).
c_str
(),
rotationY
,
0
,
-
6.30
,
6.30
);
residualFitter
->
SetParameter
(
det
*
6
+
5
,
(
detectorID
+
"_rotationZ"
).
c_str
(),
rotationZ
,
0
,
-
6.30
,
6.30
);
// Set the alignment parameters of this plane to be the optimised values
// from the alignment
detector
->
displacementX
(
residualFitter
->
GetParameter
(
det
*
6
+
0
)
);
detector
->
displacementY
(
residualFitter
->
GetParameter
(
det
*
6
+
1
)
);
detector
->
displacementZ
(
residualFitter
->
GetParameter
(
det
*
6
+
2
)
);
detector
->
rotationX
(
r
esidualFitter
->
GetParameter
(
det
*
6
+
3
)
);
detector
->
rotationY
(
r
esidualFitter
->
GetParameter
(
det
*
6
+
4
)
);
detector
->
rotationZ
(
r
esidualFitter
->
GetParameter
(
det
*
6
+
5
)
);
detector
->
displacementX
(
displacementX
);
detector
->
displacementY
(
displacementY
);
detector
->
displacementZ
(
displacementZ
);
detector
->
rotationX
(
r
otationX
);
detector
->
rotationY
(
r
otationY
);
detector
->
rotationZ
(
r
otationZ
);
detector
->
update
();
det
++
;
}
...
...
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