Skip to content

Commit 266bde5

Browse files
committed
fix redeclaring the includeErrors_ member in derived classes
- change inheritance to protected in ErrorChecker*
1 parent c616c19 commit 266bde5

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class ErrorChecker : public ErrorCheckerBase {
2020
Word32& errorWord,
2121
SiPixelFormatterErrors& errors) const override;
2222

23-
private:
24-
bool includeErrors_;
25-
23+
protected:
2624
cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, int errorType, const Word32& word) const override;
2725
};
2826

EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ErrorCheckerBase {
3939
Word32& errorWord,
4040
SiPixelFormatterErrors& errors) const = 0;
4141

42-
private:
42+
protected:
4343
bool includeErrors_;
4444
int getConversionErrorTypeAndIssueLogMessage(int status, int fedId) const;
4545
void addErrorToCollectionDummy(int errorType, int fedId, Word64 word, SiPixelFormatterErrors& errors) const;

EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class ErrorCheckerPhase0 : public ErrorCheckerBase {
2020
Word32& errorWord,
2121
SiPixelFormatterErrors& errors) const override;
2222

23-
private:
24-
bool includeErrors_;
25-
23+
protected:
2624
cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, int errorType, const Word32& word) const override;
2725
};
2826

0 commit comments

Comments
 (0)