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
4a6478cf
Commit
4a6478cf
authored
May 02, 2019
by
Simon Spannagel
Browse files
ELCLICpix2: remove virtual inheritance
parent
f7261b60
Pipeline
#841704
passed with stages
in 17 minutes and 32 seconds
Changes
1
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
src/modules/EventLoaderCLICpix2/CLICpix2/clicpix2_pixels.hpp
View file @
4a6478cf
...
...
@@ -13,7 +13,7 @@ namespace caribou {
// a 14bit register.
//
// The individual values are set via the member functions of a specialized classes
class
clicpix2_pixel
:
public
virtual
pixel
{
class
clicpix2_pixel
:
public
pixel
{
public:
// direct latch access
void
setLatches
(
uint16_t
latches
)
{
m_latches
=
latches
;
}
...
...
@@ -57,7 +57,7 @@ namespace caribou {
* a 14bit register. The individual values are set via the member functions
* and can be retrieved bitwise for convenience.
*/
class
pixelConfig
:
public
virtual
clicpix2_pixel
{
class
pixelConfig
:
public
clicpix2_pixel
{
public:
/* Default constructor
*
...
...
@@ -133,7 +133,7 @@ namespace caribou {
// CLICpix2 pixel readout class
// The individual values are set via the member functions
class
pixelReadout
:
public
virtual
clicpix2_pixel
{
class
pixelReadout
:
public
clicpix2_pixel
{
public:
// Default constructor
// Disables the pixel
...
...
Jens Kroeger
@jekroege
mentioned in merge request
!96 (merged)
·
May 06, 2019
mentioned in merge request
!96 (merged)
mentioned in merge request !96
Toggle commit list
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