Commit 49268cab authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'master' into col_row

parents 97bdfb59 4a6478cf
Pipeline #842659 passed with stages
in 10 minutes and 45 seconds
...@@ -13,7 +13,7 @@ namespace caribou { ...@@ -13,7 +13,7 @@ namespace caribou {
// a 14bit register. // a 14bit register.
// //
// The individual values are set via the member functions of a specialized classes // 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: public:
// direct latch access // direct latch access
void setLatches(uint16_t latches) { m_latches = latches; } void setLatches(uint16_t latches) { m_latches = latches; }
...@@ -57,7 +57,7 @@ namespace caribou { ...@@ -57,7 +57,7 @@ namespace caribou {
* a 14bit register. The individual values are set via the member functions * a 14bit register. The individual values are set via the member functions
* and can be retrieved bitwise for convenience. * and can be retrieved bitwise for convenience.
*/ */
class pixelConfig : public virtual clicpix2_pixel { class pixelConfig : public clicpix2_pixel {
public: public:
/* Default constructor /* Default constructor
* *
...@@ -133,7 +133,7 @@ namespace caribou { ...@@ -133,7 +133,7 @@ namespace caribou {
// CLICpix2 pixel readout class // CLICpix2 pixel readout class
// The individual values are set via the member functions // The individual values are set via the member functions
class pixelReadout : public virtual clicpix2_pixel { class pixelReadout : public clicpix2_pixel {
public: public:
// Default constructor // Default constructor
// Disables the pixel // Disables the pixel
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment