Commit a86ba252 authored by Peter Onyisi's avatar Peter Onyisi Committed by Graeme Stewart
Browse files

ATLASDQ-396: update LAr defect LB masking (AthenaMonitoring-02-03-08)

	* Configure bad LAr LB filter tool to ignore recoverable defects
	* Update LAr defect list
	* Tag AthenaMonitoring-02-03-08

2016-11-15  scott snyder  <snyder@bnl.gov>

	* Tagging AthenaMonitoring-02-03-07.
	* Make IDQFilterTool::accept() const, to work with stricter tool
	handle constness rules.  Add some override keywords.


Former-commit-id: 484a89dbe1738d1471daf7f82f4d65a914f8a6c6
parent 19d37e9c
......@@ -16,13 +16,13 @@ class DQAtlasReadyFilterTool : public AthAlgTool, virtual public IDQFilterTool
public:
DQAtlasReadyFilterTool(const std::string&,const std::string&,const IInterface*);
virtual ~DQAtlasReadyFilterTool ();
virtual ~DQAtlasReadyFilterTool () override;
virtual StatusCode initialize();
virtual StatusCode initialize() override;
virtual bool accept() ;
virtual bool accept() const override;
virtual StatusCode updateCache() ;
virtual StatusCode updateCache();
StatusCode callback( IOVSVC_CALLBACK_ARGS );
......
......@@ -19,13 +19,13 @@ class DQBadLBFilterTool : public AthAlgTool, virtual public IDQFilterTool {
public:
DQBadLBFilterTool(const std::string&,const std::string&,const IInterface*);
virtual ~DQBadLBFilterTool ();
virtual ~DQBadLBFilterTool () override;
virtual StatusCode initialize();
virtual StatusCode initialize() override;
virtual bool accept() ;
virtual bool accept() const override;
virtual StatusCode updateCache() ;
virtual StatusCode updateCache();
StatusCode callback( IOVSVC_CALLBACK_ARGS );
......
......@@ -16,9 +16,9 @@ class DQDummyFilterTool : public AthAlgTool, virtual public IDQFilterTool {
public:
DQDummyFilterTool(const std::string&,const std::string&,const IInterface*);
virtual ~DQDummyFilterTool ();
virtual ~DQDummyFilterTool () override;
virtual bool accept() ;
virtual bool accept() const override;
};
......
......@@ -18,11 +18,11 @@ class DQFilledBunchFilterTool : public AthAlgTool, virtual public IDQFilterTool
public:
DQFilledBunchFilterTool(const std::string&,const std::string&,const IInterface*);
virtual ~DQFilledBunchFilterTool ();
virtual ~DQFilledBunchFilterTool () override;
virtual StatusCode initialize();
virtual StatusCode initialize() override;
virtual bool accept() ;
virtual bool accept() const override;
private:
bool m_alwaysReturnTrue;
......
......@@ -19,7 +19,7 @@ class IDQFilterTool : virtual public IAlgTool {
static const InterfaceID& interfaceID();
/**Pure virtual*/
virtual bool accept() = 0;
virtual bool accept() const = 0;
};
inline const InterfaceID& IDQFilterTool::interfaceID()
......
......@@ -122,11 +122,11 @@ def GetLArBadLBFilterTool(origDbTag=None):
defectlist = []
lar_defects = reduce(operator.or_, [set(ddb.virtual_defect_logics[z].clauses) for z in \
('EMBA', 'EMBC', 'EMECA', 'EMECC', 'HECA', 'HECC', 'FCALA', \
'FCALC')])-set(['LAR_UNCHECKED','LAR_GENERAL','DISABLED','NONGREEN'])
'FCALC', 'LAR_GENERAL')])-set(['LAR_UNCHECKED','LAR_GENERAL'])
lar_defects = set(defect for defect in lar_defects
if ('LAR' in defect and
(('HVTRIP' in defect) or ('SEV' in defect) or
('CORRUPT' in defect))))
return GetBadLBFilterTool('LArBadLBFilterTool', tuple(lar_defects),
origDbTag=origDbTag)
ignoreRecoverable=True, origDbTag=origDbTag)
......@@ -54,7 +54,7 @@ StatusCode DQAtlasReadyFilterTool::updateCache() {
return StatusCode::SUCCESS;
}
bool DQAtlasReadyFilterTool::accept() {
bool DQAtlasReadyFilterTool::accept() const {
if (m_alwaysReturnTrue) {
return true;
} else {
......
......@@ -95,7 +95,7 @@ StatusCode DQBadLBFilterTool::updateCache() {
return StatusCode::SUCCESS;
}
bool DQBadLBFilterTool::accept() {
bool DQBadLBFilterTool::accept() const {
if (m_alwaysReturnTrue) {
return true;
} else {
......
......@@ -12,7 +12,7 @@ DQDummyFilterTool::DQDummyFilterTool(const std::string& type,const std::string&
DQDummyFilterTool::~DQDummyFilterTool () {}
bool DQDummyFilterTool::accept() {
bool DQDummyFilterTool::accept() const {
return true;
}
......@@ -31,7 +31,7 @@ StatusCode DQFilledBunchFilterTool::initialize()
return StatusCode::SUCCESS;
}
bool DQFilledBunchFilterTool::accept() {
bool DQFilledBunchFilterTool::accept() const {
if (m_alwaysReturnTrue) {
return true;
} else {
......
Markdown is supported
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