Skip to content
Snippets Groups Projects
Commit 784cd7a2 authored by Carlo Varni's avatar Carlo Varni Committed by Frank Winklmeier
Browse files

Remove redundant tool

Remove redundant tool
parent d4d23ee6
No related branches found
No related tags found
No related merge requests found
......@@ -40,10 +40,6 @@ def ActsStripClusteringToolCfg(flags,
**kwargs) -> ComponentAccumulator:
acc = ComponentAccumulator()
if 'StripConditionsTool' not in kwargs:
from SCT_ConditionsTools.ITkStripConditionsToolsConfig import ITkStripConditionsSummaryToolCfg
kwargs.setdefault("StripConditionsTool", acc.popToolsAndMerge(ITkStripConditionsSummaryToolCfg(flags)))
if 'LorentzAngleTool' not in kwargs:
from SiLorentzAngleTool.ITkStripLorentzAngleConfig import ITkStripLorentzAngleToolCfg
kwargs.setdefault("LorentzAngleTool", acc.popToolsAndMerge(ITkStripLorentzAngleToolCfg(flags)))
......
......@@ -52,12 +52,9 @@ StatusCode StripClusteringTool::initialize()
ATH_CHECK(m_conditionsTool.retrieve());
ATH_CHECK(m_lorentzAngleTool.retrieve());
ATH_CHECK(decodeTimeBins());
ATH_CHECK(decodeTimeBins());
bool disableSmry =
!m_stripDetElStatus.empty() && !VALIDATE_STATUS_ARRAY_ACTIVATED;
ATH_CHECK(m_summaryTool.retrieve(DisableTool{disableSmry}));
ATH_CHECK(m_stripDetElStatus.initialize(!m_stripDetElStatus.empty()));
ATH_CHECK(m_stripDetElStatus.initialize(not m_stripDetElStatus.empty()));
ATH_CHECK(m_stripDetEleCollKey.initialize());
return StatusCode::SUCCESS;
......@@ -104,12 +101,12 @@ StripClusteringTool::clusterize(const RawDataCollection& RDOs,
if (!m_stripDetElStatus.empty()) {
goodModule = status->isGood(idHash);
} else {
goodModule = m_summaryTool->isGood(idHash, ctx);
goodModule = m_conditionsTool->isGood(idHash, ctx);
}
}
VALIDATE_STATUS_ARRAY(
m_checkBadModules.value() && !m_stripDetElStatus.empty(),
status->isGood(idHash), m_summaryTool->isGood(idHash));
status->isGood(idHash), m_conditionsTool->isGood(idHash));
if (!goodModule) {
ATH_MSG_DEBUG("Strip module failed status check");
......
......@@ -84,55 +84,25 @@ private:
StringProperty m_timeBinStr{this, "timeBins", ""};
ToolHandle<IInDetConditionsTool> m_conditionsTool{
this,
"StripConditionsTool",
"",
"Tool to retrieve Strip Conditions summary"
};
ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool{
this,
"LorentzAngleTool",
"",
"Tool to retreive Lorentz angle of Si detector module"
ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool {this, "LorentzAngleTool", "",
"Tool to retreive Lorentz angle of Si detector module"
};
// TODO this one should be removed?
SG::ReadHandleKey<InDet::SiDetectorElementStatus> m_stripDetElStatus {
this,
"StripDetElStatus",
"",
"SiDetectorElementStatus for strip"
};
SG::ReadHandleKey<InDet::SiDetectorElementStatus> m_stripDetElStatus {this, "StripDetElStatus", "",
"SiDetectorElementStatus for strip"};
ToolHandle<IInDetConditionsTool> m_summaryTool{
this,
"conditionsTool",
"",
"Conditions summary tool"
};
ToolHandle<IInDetConditionsTool> m_conditionsTool {this, "conditionsTool", "",
"Conditions summary tool"};
Gaudi::Property<bool> m_checkBadModules {
this,
"checkBadModules",
true,
"Check bad modules using the conditions summary tool"
};
Gaudi::Property<bool> m_checkBadModules {this, "checkBadModules", true,
"Check bad modules using the conditions summary tool"};
Gaudi::Property<unsigned int> m_maxFiredStrips {
this,
"maxFiredStrips",
384u,
"Threshold of number of fired strips per wafer. 0 disables the per-wafer cut."
};
Gaudi::Property<unsigned int> m_maxFiredStrips {this, "maxFiredStrips", 384u,
"Threshold of number of fired strips per wafer. 0 disables the per-wafer cut."};
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_stripDetEleCollKey {
this,
"StripDetEleCollKey",
"ITkStripDetectorElementCollection",
"SiDetectorElementCollection key for strip"
};
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_stripDetEleCollKey {this, "StripDetEleCollKey", "ITkStripDetectorElementCollection",
"SiDetectorElementCollection key for strip"};
int m_timeBinBits[3]{-1, -1, -1};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment