Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
ddb6659b
Commit
ddb6659b
authored
Oct 09, 2017
by
Simon Spannagel
Browse files
Expose alignmentMethod as parameter
parent
18d4035c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Alignment.C
View file @
ddb6659b
...
...
@@ -157,13 +157,16 @@ void Alignment::finalise() {
// If not enough tracks were produced, do nothing
// if(m_alignmenttracks.size() < m_numberOfTracksForAlignment) return;
// Get alignment method:
int
alignmentMethod
=
m_config
.
get
<
int
>
(
"alignmentMethod"
);
// Make the fitting object
TVirtualFitter
*
residualFitter
=
TVirtualFitter
::
Fitter
(
0
,
50
);
// Tell it what to minimise
if
(
parameters
->
alignmentMethod
==
0
)
if
(
alignmentMethod
==
0
)
residualFitter
->
SetFCN
(
MinimiseTrackChi2
);
if
(
parameters
->
alignmentMethod
==
1
)
if
(
alignmentMethod
==
1
)
residualFitter
->
SetFCN
(
MinimiseResiduals
);
// Set the global parameters
...
...
@@ -182,7 +185,7 @@ void Alignment::finalise() {
// This has been inserted in a temporary way. If the alignment method is 1
// then it will align the single detector and then
// return. This should be made into separate functions.
if
(
parameters
->
alignmentMethod
==
1
)
{
if
(
alignmentMethod
==
1
)
{
// Get the name of the detector to align
string
detectorID
=
parameters
->
detectorToAlign
;
...
...
src/core/Parameters.h
View file @
ddb6659b
...
...
@@ -68,7 +68,6 @@ namespace corryvreckan {
std
::
map
<
std
::
string
,
bool
>
excludedFromTracking
;
std
::
map
<
std
::
string
,
bool
>
masked
;
std
::
string
detectorToAlign
;
int
alignmentMethod
;
// Parameters for each detector (stored by detector ID)
std
::
map
<
std
::
string
,
DetectorParameters
*>
detector
;
...
...
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