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
6909a9bf
Commit
6909a9bf
authored
Oct 12, 2017
by
Simon Spannagel
Browse files
Remove parameters->masked, now handled by detectors list passed to modules
parent
acdd3712
Pipeline
#213182
passed with stage
in 3 minutes and 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Timepix3EventLoader.cpp
View file @
6909a9bf
...
...
@@ -69,12 +69,6 @@ void Timepix3EventLoader::initialise(Parameters* par) {
Detector
*
detector
=
*
it
;
// Check if this device is to be masked
if
(
parameters
->
masked
.
count
(
detectorID
)
!=
0
)
{
LOG
(
DEBUG
)
<<
"Device with detector ID "
<<
entry
->
d_name
<<
" is masked."
;
continue
;
}
if
(
detector
->
type
()
!=
"Timepix3"
)
{
LOG
(
WARNING
)
<<
"Device with detector ID "
<<
entry
->
d_name
<<
" is not of type Timepix3."
;
continue
;
...
...
@@ -148,8 +142,6 @@ StatusCode Timepix3EventLoader::run(Clipboard* clipboard) {
string
detectorID
=
detector
->
name
();
if
(
detector
->
type
()
!=
"Timepix3"
)
continue
;
if
(
parameters
->
masked
.
count
(
detectorID
))
continue
;
// Make a new container for the data
Pixels
*
deviceData
=
new
Pixels
();
...
...
src/core/Analysis.cpp
View file @
6909a9bf
...
...
@@ -186,11 +186,6 @@ void Analysis::load_detectors() {
m_parameters
->
excludedFromTracking
[
ex
]
=
true
;
}
}
std
::
vector
<
std
::
string
>
masking
=
global_config
.
getArray
<
std
::
string
>
(
"masked"
);
for
(
auto
&
m
:
masking
)
{
m_parameters
->
masked
[
m
]
=
true
;
}
}
void
Analysis
::
load_algorithms
()
{
...
...
src/core/Parameters.h
View file @
6909a9bf
...
...
@@ -53,7 +53,6 @@ namespace corryvreckan {
int
nDetectors
{
0
};
double
currentTime
;
std
::
map
<
std
::
string
,
bool
>
excludedFromTracking
;
std
::
map
<
std
::
string
,
bool
>
masked
;
std
::
string
detectorToAlign
;
// Parameters for each detector (stored by detector ID)
...
...
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