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
8910f18b
Commit
8910f18b
authored
Nov 01, 2017
by
Simon Spannagel
Browse files
Merge branch 'master' into 'master'
Correction to prealignment displacements in x and y. See merge request
!6
parents
1469b4f9
5af4e592
Pipeline
#227323
passed with stage
in 1 minute and 13 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Prealignment.cpp
View file @
8910f18b
...
...
@@ -7,7 +7,7 @@ Prealignment::Prealignment(Configuration config, std::vector<Detector*> detector
:
Algorithm
(
std
::
move
(
config
),
std
::
move
(
detectors
))
{
LOG
(
INFO
)
<<
"Starting prealignment of detectors"
;
max_correlation_rms
=
m_config
.
get
<
double
>
(
"max_correlation_rms"
,
6.0
);
damping_factor
=
m_config
.
get
<
double
>
(
"damping_factor"
,
0.8
);
damping_factor
=
m_config
.
get
<
double
>
(
"damping_factor"
,
1.0
);
LOG
(
DEBUG
)
<<
"Setting max_correlation_rms to : "
<<
max_correlation_rms
;
LOG
(
DEBUG
)
<<
"Setting damping_factor to : "
<<
damping_factor
;
}
...
...
@@ -107,8 +107,10 @@ void Prealignment::finalise() {
double
mean_Y
=
correlationY
[
detector
->
name
()]
->
GetMean
();
LOG
(
INFO
)
<<
"Detector "
<<
detector
->
name
()
<<
": x = "
<<
mean_X
<<
" , y = "
<<
mean_Y
;
LOG
(
INFO
)
<<
"Move in x by = "
<<
mean_X
*
damping_factor
<<
" , and in y by = "
<<
mean_Y
*
damping_factor
;
detector
->
displacementX
(
damping_factor
*
mean_X
);
detector
->
displacementY
(
damping_factor
*
mean_Y
);
double
x
=
detector
->
displacementX
();
double
y
=
detector
->
displacementY
();
detector
->
displacementX
(
x
+
damping_factor
*
mean_X
);
detector
->
displacementY
(
y
+
damping_factor
*
mean_Y
);
}
}
}
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