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
fe0010a4
Commit
fe0010a4
authored
Nov 13, 2018
by
Simon Spannagel
Browse files
CLICpix2: fix array initialization
parent
d9f48d74
Pipeline
#585443
passed with stages
in 5 minutes and 18 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/modules/EventLoaderCLICpix2/CLICpix2/clicpix2_frameDecoder.cpp
View file @
fe0010a4
...
...
@@ -81,31 +81,29 @@ void clicpix2_frameDecoder::extractColumns(std::vector<clicpix2_frameDecoder::WO
std
::
array
<
std
::
array
<
pixelReadout
,
8
>
,
CLICPIX2_ROW
*
2
>
pixels_dc
;
// stores results of the processed doube columns (up to 8 if compression is enabled)
std
::
array
<
size_t
,
8
>
row_index
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
// 8 independent (in case of compression) counters navigating through the <pixels_dc>
std
::
array
<
int
,
8
>
row_slice
=
{
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
};
// 8 independent
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
}};
// 8 independent (in case of compression) counters navigating through the <pixels_dc>
std
::
array
<
int
,
8
>
row_slice
=
{{
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
,
CLICPIX2_PIXEL_SIZE
-
1
}};
// 8 independent
//(in case of compression) counters navigating through the <pixels_dc>
#define DC_COUNTER_INIT (2 * (CLICPIX2_ROW * CLICPIX2_PIXEL_SIZE + CLICPIX2_ROW / CLICPIX2_SUPERPIXEL_SIZE) + 1)
std
::
array
<
unsigned
int
,
8
>
dc_counter
=
{
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
};
// 8 independent (in case of compression)
std
::
array
<
unsigned
int
,
8
>
dc_counter
=
{
{
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
,
DC_COUNTER_INIT
}
}
;
// 8 independent (in case of compression)
// counters indicating number of bits processed for the given double-column
// value 3601 indicates beginning of the double-column
std
::
array
<
unsigned
int
,
8
>
sp_counter
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
// number of pixels in the processed super-pixel for the given column
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
}
}
;
// number of pixels in the processed super-pixel for the given column
do
{
WORD_TYPE
word
=
*
data
++
;
...
...
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